From 9056153e76ca0c8e9a7a21771dc600c6232fe69f Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 6 Dec 2018 17:33:04 -0300 Subject: [PATCH 001/606] Create feature model --- backend/models/__init__.py | 3 ++- backend/models/feature.py | 34 ++++++++++++++++++++++++++++++++++ frontend/sw.js | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 backend/models/feature.py diff --git a/backend/models/__init__.py b/backend/models/__init__.py index aed79fcab..7cbe1f8b0 100644 --- a/backend/models/__init__.py +++ b/backend/models/__init__.py @@ -18,6 +18,7 @@ from .post import * from .survey_post import * from .factory_post import * +from .feature import * models = [ @@ -25,7 +26,7 @@ invite_institution_children, invite_institution_parent, invite_user, request, request_user, request_institution_parent, request_institution_children, invite_user_adm, request_institution, factory_invites, post, - survey_post, factory_post + survey_post, factory_post, feature ] __all__ = [prop for model in models for prop in model.__all__] diff --git a/backend/models/feature.py b/backend/models/feature.py new file mode 100644 index 000000000..153427a69 --- /dev/null +++ b/backend/models/feature.py @@ -0,0 +1,34 @@ +"""Feature model.""" +from google.appengine.ext import ndb + +__all__ = ['Feature'] + +class Feature(ndb.Model): + name = ndb.StringProperty() + enabled = ndb.BooleanProperty() + + @staticmethod + def create(name, enable): + feature = Feature(id=name, name=name, enabled=enable) + feature.put() + return feature + + @staticmethod + def enable(feature_name, enabled): + feature = Feature.get_by_id(feature_name) + + if feature: + feature.enabled = enabled + feature.put() + return feature + else: + raise Exception("Feature not found!") + + @staticmethod + def isEnabled(feature_name): + feature = Feature.get_by_id(feature_name) + + if feature: + return feature.enabled + else: + raise Exception("Feature not found!") \ No newline at end of file diff --git a/frontend/sw.js b/frontend/sw.js index 4bca0fe8a..3d30b829c 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'master'; + const CACHE_SUFIX = 'create-feature-toggles'; let messaging; From 1ea3a86fbb38a0cff9fa8d60201151a2e7f34a9c Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 7 Dec 2018 16:43:04 -0300 Subject: [PATCH 002/606] Create feature toggle handler --- backend/handlers/__init__.py | 3 +- backend/handlers/feature_toggle_handler.py | 35 ++++++++++++++++++++++ backend/main.py | 2 ++ backend/models/feature.py | 22 +++++++------- 4 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 backend/handlers/feature_toggle_handler.py diff --git a/backend/handlers/__init__.py b/backend/handlers/__init__.py index 184916a15..236a06b38 100644 --- a/backend/handlers/__init__.py +++ b/backend/handlers/__init__.py @@ -42,6 +42,7 @@ from .invite_user_handler import * from .institution_parent_handler import * from .institution_children_handler import * +from .feature_toggle_handler import * handlers = [ base_handler, erro_handler, event_collection_handler, event_handler, @@ -61,7 +62,7 @@ user_request_collection_handler, user_timeline_handler, vote_handler, invite_hierarchy_collection_handler, invite_user_collection_handler, invite_institution_handler, invite_user_handler, institution_parent_handler, - institution_children_handler + institution_children_handler, feature_toggle_handler ] __all__ = [prop for handler in handlers for prop in handler.__all__] diff --git a/backend/handlers/feature_toggle_handler.py b/backend/handlers/feature_toggle_handler.py new file mode 100644 index 000000000..9130b58cb --- /dev/null +++ b/backend/handlers/feature_toggle_handler.py @@ -0,0 +1,35 @@ +"""Feature Toogle handler.""" + +import json +from . import BaseHandler +from utils import json_response +from util import login_required +from models import Feature + + +__all__ = ['FeatureToggleHander'] + +def to_json(feature_list): + features = { + feature.name: { + "enabled": feature.enabled, + "group": feature.group + } for feature in feature_list + } + + return features + +class FeatureToggleHander(BaseHandler): + + @login_required + @json_response + def get(self, user): + features = Feature.query().fetch() + self.response.write(json.dumps(to_json(features))) + + @login_required + @json_response + def put(self, user): + features_body = json.loads(self.request.body) + features = Feature.enable_all(features_body) + self.response.write(json.dumps(to_json(features))) \ No newline at end of file diff --git a/backend/main.py b/backend/main.py index 4bbdb7f86..3d6afff84 100644 --- a/backend/main.py +++ b/backend/main.py @@ -45,6 +45,7 @@ from handlers import InviteHandler from handlers import InstitutionParentHandler from handlers import InstitutionChildrenHandler +from handlers import FeatureToggleHander methods = set(webapp2.WSGIApplication.allowed_methods) methods.add('PATCH') @@ -96,6 +97,7 @@ ("/api/user/institutions/(.*)", UserHandler), ("/api/user/timeline.*", UserTimelineHandler), ("/api/search/institution", SearchHandler), + ("/api/feature-toggle", FeatureToggleHander), ("/login", LoginHandler), ("/logout", LogoutHandler), ("/api/.*", ErroHandler) diff --git a/backend/models/feature.py b/backend/models/feature.py index 153427a69..b3b21107c 100644 --- a/backend/models/feature.py +++ b/backend/models/feature.py @@ -6,23 +6,25 @@ class Feature(ndb.Model): name = ndb.StringProperty() enabled = ndb.BooleanProperty() + group = ndb.StringProperty( + choices=set(["ADMIN", "COMMOM", "ALL"])) @staticmethod - def create(name, enable): - feature = Feature(id=name, name=name, enabled=enable) + def create(name, enable, group="ALL"): + feature = Feature(id=name, name=name, enabled=enable, group=group) feature.put() return feature @staticmethod - def enable(feature_name, enabled): - feature = Feature.get_by_id(feature_name) + def enable_all(features_dict): + features = Feature.query(Feature.name.IN(features_dict.keys())).fetch() - if feature: - feature.enabled = enabled - feature.put() - return feature - else: - raise Exception("Feature not found!") + for feature in features: + feature.enabled = features_dict[feature.name]['enabled'] + feature.group = features_dict[feature.name]['group'] + + ndb.put_multi(features) + return features @staticmethod def isEnabled(feature_name): From c04ee9d6bebee76ce2bc2dac95e1ab62aa5311ca Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 7 Dec 2018 17:30:52 -0300 Subject: [PATCH 003/606] Create feature toggle service --- backend/handlers/feature_toggle_handler.py | 2 +- backend/models/feature.py | 2 +- frontend/utils/featureToggleService.js | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 frontend/utils/featureToggleService.js diff --git a/backend/handlers/feature_toggle_handler.py b/backend/handlers/feature_toggle_handler.py index 9130b58cb..310e1bec9 100644 --- a/backend/handlers/feature_toggle_handler.py +++ b/backend/handlers/feature_toggle_handler.py @@ -32,4 +32,4 @@ def get(self, user): def put(self, user): features_body = json.loads(self.request.body) features = Feature.enable_all(features_body) - self.response.write(json.dumps(to_json(features))) \ No newline at end of file + self.response.write(json.dumps(to_json(features))) diff --git a/backend/models/feature.py b/backend/models/feature.py index b3b21107c..78969351e 100644 --- a/backend/models/feature.py +++ b/backend/models/feature.py @@ -33,4 +33,4 @@ def isEnabled(feature_name): if feature: return feature.enabled else: - raise Exception("Feature not found!") \ No newline at end of file + raise Exception("Feature not found!") diff --git a/frontend/utils/featureToggleService.js b/frontend/utils/featureToggleService.js new file mode 100644 index 000000000..c66bf1894 --- /dev/null +++ b/frontend/utils/featureToggleService.js @@ -0,0 +1,13 @@ +(function() { + 'use strict'; + + const app = angular.module('app'); + + app.service('FeatureToggleSercvice', function(HttpService) { + const service = this; + + service.getFeatures = function getFeatures() { + + }; + }); +})(); \ No newline at end of file From 4eb6a7cc2b28cb76dcb22809e74abbe868f51dcd Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 10 Dec 2018 11:07:30 -0300 Subject: [PATCH 004/606] Create method to get feature toggles --- frontend/index.html | 1 + frontend/user/userService.js | 2 +- frontend/utils/featureToggleService.js | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index 8fafa97a3..6f361b737 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -138,6 +138,7 @@ + diff --git a/frontend/user/userService.js b/frontend/user/userService.js index 46a251547..5b87e9f91 100644 --- a/frontend/user/userService.js +++ b/frontend/user/userService.js @@ -3,7 +3,7 @@ (function() { var app = angular.module("app"); - app.service("UserService", function UserService(HttpService, $q) { + app.service("UserService", function UserService(HttpService, $q, FeatureToggleService) { var service = this; var USER_URI = "/api/user"; diff --git a/frontend/utils/featureToggleService.js b/frontend/utils/featureToggleService.js index c66bf1894..2787fb0d1 100644 --- a/frontend/utils/featureToggleService.js +++ b/frontend/utils/featureToggleService.js @@ -3,11 +3,16 @@ const app = angular.module('app'); - app.service('FeatureToggleSercvice', function(HttpService) { + app.service('FeatureToggleService', function FeatureToggleService(HttpService) { const service = this; + const uri = '/api/feature-toggle'; service.getFeatures = function getFeatures() { - + HttpService.get(uri).then(function(response) { + console.log(response); + }); }; + + service.getFeatures(); }); })(); \ No newline at end of file From 81a88d676f3347132f7ab5b6dde1095e625e63f3 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 11 Dec 2018 08:51:50 -0300 Subject: [PATCH 005/606] Change feature model on backend --- backend/handlers/feature_toggle_handler.py | 21 ++++++++++---------- backend/main.py | 2 +- backend/models/feature.py | 23 ++++++++++++++++++++-- frontend/utils/featureToggleService.js | 16 +++++++++++---- 4 files changed, 44 insertions(+), 18 deletions(-) diff --git a/backend/handlers/feature_toggle_handler.py b/backend/handlers/feature_toggle_handler.py index 310e1bec9..47335b2e4 100644 --- a/backend/handlers/feature_toggle_handler.py +++ b/backend/handlers/feature_toggle_handler.py @@ -10,22 +10,21 @@ __all__ = ['FeatureToggleHander'] def to_json(feature_list): - features = { - feature.name: { - "enabled": feature.enabled, - "group": feature.group - } for feature in feature_list - } - + features = [feature.make() for feature in feature_list] return features class FeatureToggleHander(BaseHandler): - @login_required @json_response - def get(self, user): - features = Feature.query().fetch() - self.response.write(json.dumps(to_json(features))) + def get(self): + feature_name = self.request.get('name') + + if feature_name: + features = Feature.get_feature(feature_name).make() + else: + features = to_json(Feature.get_all_features()) + + self.response.write(json.dumps(features)) @login_required @json_response diff --git a/backend/main.py b/backend/main.py index 3d6afff84..d1b26ce51 100644 --- a/backend/main.py +++ b/backend/main.py @@ -97,7 +97,7 @@ ("/api/user/institutions/(.*)", UserHandler), ("/api/user/timeline.*", UserTimelineHandler), ("/api/search/institution", SearchHandler), - ("/api/feature-toggle", FeatureToggleHander), + ("/api/feature-toggle.*", FeatureToggleHander), ("/login", LoginHandler), ("/logout", LogoutHandler), ("/api/.*", ErroHandler) diff --git a/backend/models/feature.py b/backend/models/feature.py index 78969351e..56b8abe3a 100644 --- a/backend/models/feature.py +++ b/backend/models/feature.py @@ -27,10 +27,29 @@ def enable_all(features_dict): return features @staticmethod - def isEnabled(feature_name): + def get_all_features(): + features = Feature.query().fetch() + return features + + @staticmethod + def get_feature(feature_name): feature = Feature.get_by_id(feature_name) if feature: - return feature.enabled + return feature else: raise Exception("Feature not found!") + + @staticmethod + def isEnabled(feature_name): + feature = Feature.get_feature(feature_name) + return feature.enabled + + def make(self): + make_obj = { + 'name': self.name, + 'enabled': self.enabled, + 'group': self.group + } + + return make_obj \ No newline at end of file diff --git a/frontend/utils/featureToggleService.js b/frontend/utils/featureToggleService.js index 2787fb0d1..1a7808881 100644 --- a/frontend/utils/featureToggleService.js +++ b/frontend/utils/featureToggleService.js @@ -7,12 +7,20 @@ const service = this; const uri = '/api/feature-toggle'; - service.getFeatures = function getFeatures() { - HttpService.get(uri).then(function(response) { - console.log(response); + service.getFeatures = function getFeatures(feature_name) { + const query = (feature_name) ? `?name=${feature_name}` : ''; + return HttpService.get(`${uri}${query}`); + }; + + + service.isEnabled = function isEnabled(feature_name) { + return service.getFeatures(feature_name).then(function(response) { + return response[feature_name].enabled; }); }; - service.getFeatures(); + service.isEnabled('other').then(function(response) { + console.log(response); + }); }); })(); \ No newline at end of file From 1208eb56a8af8c22e55896f96d349dec05180987 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 11 Dec 2018 14:57:47 -0300 Subject: [PATCH 006/606] Fix get feature by name --- backend/handlers/feature_toggle_handler.py | 2 +- backend/models/feature.py | 11 +++++++++-- frontend/user/userService.js | 2 +- frontend/utils/featureToggleService.js | 6 +----- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/backend/handlers/feature_toggle_handler.py b/backend/handlers/feature_toggle_handler.py index 47335b2e4..52d5b130d 100644 --- a/backend/handlers/feature_toggle_handler.py +++ b/backend/handlers/feature_toggle_handler.py @@ -20,7 +20,7 @@ def get(self): feature_name = self.request.get('name') if feature_name: - features = Feature.get_feature(feature_name).make() + features = [Feature.get_feature(feature_name).make()] else: features = to_json(Feature.get_all_features()) diff --git a/backend/models/feature.py b/backend/models/feature.py index 56b8abe3a..3786a2c16 100644 --- a/backend/models/feature.py +++ b/backend/models/feature.py @@ -16,7 +16,14 @@ def create(name, enable, group="ALL"): return feature @staticmethod - def enable_all(features_dict): + def enable_all(features_list): + features_dict = { + feature['name']: { + 'enabled': feature['enabled'], + 'group': feature['group'] + } for feature in features_list + } + features = Feature.query(Feature.name.IN(features_dict.keys())).fetch() for feature in features: @@ -52,4 +59,4 @@ def make(self): 'group': self.group } - return make_obj \ No newline at end of file + return make_obj diff --git a/frontend/user/userService.js b/frontend/user/userService.js index 5b87e9f91..46a251547 100644 --- a/frontend/user/userService.js +++ b/frontend/user/userService.js @@ -3,7 +3,7 @@ (function() { var app = angular.module("app"); - app.service("UserService", function UserService(HttpService, $q, FeatureToggleService) { + app.service("UserService", function UserService(HttpService, $q) { var service = this; var USER_URI = "/api/user"; diff --git a/frontend/utils/featureToggleService.js b/frontend/utils/featureToggleService.js index 1a7808881..ddf7640d9 100644 --- a/frontend/utils/featureToggleService.js +++ b/frontend/utils/featureToggleService.js @@ -15,12 +15,8 @@ service.isEnabled = function isEnabled(feature_name) { return service.getFeatures(feature_name).then(function(response) { - return response[feature_name].enabled; + return response[0].enabled; }); }; - - service.isEnabled('other').then(function(response) { - console.log(response); - }); }); })(); \ No newline at end of file From 4ce85aa3964c9e39f442001864dbcb27c6515bf4 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 11 Dec 2018 17:44:38 -0300 Subject: [PATCH 007/606] Create state to feature constant --- frontend/app.js | 31 ++++++++++++++++++++++++++ frontend/index.html | 1 + frontend/utils/featureByState.js | 9 ++++++++ frontend/utils/featureToggleService.js | 1 - 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 frontend/utils/featureByState.js diff --git a/frontend/app.js b/frontend/app.js index 9a375894d..55646c238 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -505,6 +505,37 @@ }); }); + app.run(function featureToggleInterceptor(FeatureToggleService, STATE_TO_FEATURE, $transitions, $state, STATES) { + let verified = false; + + $transitions.onStart({ + to: function(state) { + const stateName = state.name; + if (!verified && (stateName in STATE_TO_FEATURE)) { + return true; + } else { + verified = false; + return false; + } + } + }, function (transition) { + transition.abort(); + const targetState = transition._targetState; + + FeatureToggleService.isEnabled(STATE_TO_FEATURE[targetState._identifier]).then(function(enabled) { + if (enabled) { + verified = true; + $state.go(targetState._identifier, targetState._params); + } else { + $state.go(STATES.ERROR, { + "msg": "Desculpa! Este recurso ainda não está disponível.", + "status": "401" + }); + } + }); + }); + }); + function initServiceWorker() { if ('serviceWorker' in navigator) { navigator.serviceWorker.register('/sw.js').then(function (registration) { diff --git a/frontend/index.html b/frontend/index.html index d5d066ccd..0f543df44 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -140,6 +140,7 @@ + diff --git a/frontend/utils/featureByState.js b/frontend/utils/featureByState.js new file mode 100644 index 000000000..edf779609 --- /dev/null +++ b/frontend/utils/featureByState.js @@ -0,0 +1,9 @@ +(function() { + 'use strict'; + + const app = angular.module('app'); + + app.constant("STATE_TO_FEATURE", { + "app.manage_institution.edit_info": "manage-institution" + }); +})(); \ No newline at end of file diff --git a/frontend/utils/featureToggleService.js b/frontend/utils/featureToggleService.js index ddf7640d9..e0d9415d7 100644 --- a/frontend/utils/featureToggleService.js +++ b/frontend/utils/featureToggleService.js @@ -12,7 +12,6 @@ return HttpService.get(`${uri}${query}`); }; - service.isEnabled = function isEnabled(feature_name) { return service.getFeatures(feature_name).then(function(response) { return response[0].enabled; From cdad9c268589a4dabac1f4ee6bb099e3c514d76e Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 12 Dec 2018 16:31:23 -0300 Subject: [PATCH 008/606] Create device check on feature toggle] --- backend/models/feature.py | 14 +++++++++----- frontend/utils/featureToggleService.js | 11 ++++++++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/backend/models/feature.py b/backend/models/feature.py index 3786a2c16..2f11c77c8 100644 --- a/backend/models/feature.py +++ b/backend/models/feature.py @@ -7,11 +7,12 @@ class Feature(ndb.Model): name = ndb.StringProperty() enabled = ndb.BooleanProperty() group = ndb.StringProperty( - choices=set(["ADMIN", "COMMOM", "ALL"])) + choices=set(["SUPER_USER", "ADMIN", "ALL"])) + device = ndb.StringProperty(choices=set(["MOBILE", "DESKTOP", "ALL"])) @staticmethod - def create(name, enable, group="ALL"): - feature = Feature(id=name, name=name, enabled=enable, group=group) + def create(name, enable, group="ALL", device="ALL"): + feature = Feature(id=name, name=name, enabled=enable, group=group, device=device) feature.put() return feature @@ -20,7 +21,8 @@ def enable_all(features_list): features_dict = { feature['name']: { 'enabled': feature['enabled'], - 'group': feature['group'] + 'group': feature['group'], + 'device': feature['device'] } for feature in features_list } @@ -29,6 +31,7 @@ def enable_all(features_list): for feature in features: feature.enabled = features_dict[feature.name]['enabled'] feature.group = features_dict[feature.name]['group'] + feature.device = features_dict[feature.name]['device'] ndb.put_multi(features) return features @@ -56,7 +59,8 @@ def make(self): make_obj = { 'name': self.name, 'enabled': self.enabled, - 'group': self.group + 'group': self.group, + 'device': self.device } return make_obj diff --git a/frontend/utils/featureToggleService.js b/frontend/utils/featureToggleService.js index e0d9415d7..0247dcef9 100644 --- a/frontend/utils/featureToggleService.js +++ b/frontend/utils/featureToggleService.js @@ -14,7 +14,16 @@ service.isEnabled = function isEnabled(feature_name) { return service.getFeatures(feature_name).then(function(response) { - return response[0].enabled; + const feature = response[0]; + + if (!feature.enabled) + return false; + + const enableMobile = feature.device === 'MOBILE' && Utils.isMobileScreen(); + const enableDesktop = feature.device === 'DESKTOP' && !Utils.isMobileScreen(); + const enableALL = feature.device === 'ALL'; + + return enableALL || enableMobile || enableDesktop; }); }; }); From a7c11e69fe763115bf1e51329e67fcf3000636a4 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 12 Dec 2018 17:18:57 -0300 Subject: [PATCH 009/606] Change properties of feature models --- backend/models/feature.py | 27 ++++++++++++-------------- frontend/utils/featureToggleService.js | 10 ++++------ 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/backend/models/feature.py b/backend/models/feature.py index 2f11c77c8..05aba93ce 100644 --- a/backend/models/feature.py +++ b/backend/models/feature.py @@ -5,14 +5,14 @@ class Feature(ndb.Model): name = ndb.StringProperty() - enabled = ndb.BooleanProperty() - group = ndb.StringProperty( - choices=set(["SUPER_USER", "ADMIN", "ALL"])) - device = ndb.StringProperty(choices=set(["MOBILE", "DESKTOP", "ALL"])) + enable_mobile = ndb.StringProperty( + choices=set(["SUPER_USER", "ADMIN", "ALL", "DISABLED"])) + enable_desktop = ndb.StringProperty( + choices=set(["SUPER_USER", "ADMIN", "ALL", "DISABLED"])) @staticmethod - def create(name, enable, group="ALL", device="ALL"): - feature = Feature(id=name, name=name, enabled=enable, group=group, device=device) + def create(name, enable_mobile="ALL", enable_desktop="ALL"): + feature = Feature(id=name, name=name, enable_desktop=enable_desktop, enable_mobile=enable_mobile) feature.put() return feature @@ -20,18 +20,16 @@ def create(name, enable, group="ALL", device="ALL"): def enable_all(features_list): features_dict = { feature['name']: { - 'enabled': feature['enabled'], - 'group': feature['group'], - 'device': feature['device'] + 'enable_mobile': feature['enable_mobile'], + 'enable_desktop': feature['enable_desktop'] } for feature in features_list } features = Feature.query(Feature.name.IN(features_dict.keys())).fetch() for feature in features: - feature.enabled = features_dict[feature.name]['enabled'] - feature.group = features_dict[feature.name]['group'] - feature.device = features_dict[feature.name]['device'] + feature.enable_desktop = features_dict[feature.name]['enable_desktop'] + feature.enable_mobile = features_dict[feature.name]['enable_mobile'] ndb.put_multi(features) return features @@ -58,9 +56,8 @@ def isEnabled(feature_name): def make(self): make_obj = { 'name': self.name, - 'enabled': self.enabled, - 'group': self.group, - 'device': self.device + 'enable_mobile': self.enable_mobile, + 'enable_desktop': self.enable_desktop } return make_obj diff --git a/frontend/utils/featureToggleService.js b/frontend/utils/featureToggleService.js index 0247dcef9..d2427ffa7 100644 --- a/frontend/utils/featureToggleService.js +++ b/frontend/utils/featureToggleService.js @@ -15,15 +15,13 @@ service.isEnabled = function isEnabled(feature_name) { return service.getFeatures(feature_name).then(function(response) { const feature = response[0]; + const disabledMobile = feature.enable_mobile === 'DISABLED'; + const disabeldDesktop = feature.enable_desktop === 'DISABLED'; - if (!feature.enabled) + if (disabledMobile && disabeldDesktop) return false; - const enableMobile = feature.device === 'MOBILE' && Utils.isMobileScreen(); - const enableDesktop = feature.device === 'DESKTOP' && !Utils.isMobileScreen(); - const enableALL = feature.device === 'ALL'; - - return enableALL || enableMobile || enableDesktop; + return !disabeldDesktop && !Utils.isMobileScreen() || !disabledMobile && Utils.isMobileScreen(); }); }; }); From 1a923d072a9bf4f5e674e9bce37d3d54af4c7b36 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 13 Dec 2018 14:05:17 -0300 Subject: [PATCH 010/606] Create mapStateToFeatureService --- frontend/app.js | 6 +++--- frontend/index.html | 2 +- frontend/utils/featureByState.js | 9 --------- frontend/utils/mapStateToFeatureService.js | 22 ++++++++++++++++++++++ 4 files changed, 26 insertions(+), 13 deletions(-) delete mode 100644 frontend/utils/featureByState.js create mode 100644 frontend/utils/mapStateToFeatureService.js diff --git a/frontend/app.js b/frontend/app.js index 55646c238..5ef32eaa6 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -505,13 +505,13 @@ }); }); - app.run(function featureToggleInterceptor(FeatureToggleService, STATE_TO_FEATURE, $transitions, $state, STATES) { + app.run(function featureToggleInterceptor(FeatureToggleService, MapStateToFeatureService, $transitions, $state, STATES) { let verified = false; $transitions.onStart({ to: function(state) { const stateName = state.name; - if (!verified && (stateName in STATE_TO_FEATURE)) { + if (!verified && MapStateToFeatureService.containsFeature(stateName)) { return true; } else { verified = false; @@ -522,7 +522,7 @@ transition.abort(); const targetState = transition._targetState; - FeatureToggleService.isEnabled(STATE_TO_FEATURE[targetState._identifier]).then(function(enabled) { + FeatureToggleService.isEnabled(MapStateToFeatureService.getFeatureByState(targetState._identifier)).then(function(enabled) { if (enabled) { verified = true; $state.go(targetState._identifier, targetState._params); diff --git a/frontend/index.html b/frontend/index.html index 0f543df44..53399ee35 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -140,7 +140,7 @@ - + diff --git a/frontend/utils/featureByState.js b/frontend/utils/featureByState.js deleted file mode 100644 index edf779609..000000000 --- a/frontend/utils/featureByState.js +++ /dev/null @@ -1,9 +0,0 @@ -(function() { - 'use strict'; - - const app = angular.module('app'); - - app.constant("STATE_TO_FEATURE", { - "app.manage_institution.edit_info": "manage-institution" - }); -})(); \ No newline at end of file diff --git a/frontend/utils/mapStateToFeatureService.js b/frontend/utils/mapStateToFeatureService.js new file mode 100644 index 000000000..096a0d4cb --- /dev/null +++ b/frontend/utils/mapStateToFeatureService.js @@ -0,0 +1,22 @@ +(function() { + 'use strict'; + + const app = angular.module('app'); + + + app.service('MapStateToFeatureService', function(STATES) { + const service = this; + + service._statesToFeature = { + [STATES.MANAGE_INST_EDIT]: 'manage-inst-edit' + }; + + service.getFeatureByState = function getFeatureByState(stateName) { + return _.get(service._statesToFeature, stateName, null); + }; + + service.containsFeature = function containsFeature(stateName) { + return stateName in service._statesToFeature; + }; + }); +})(); \ No newline at end of file From a03e561a815d868775b5c2d5cebda1bc2aa98848 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 13 Dec 2018 15:16:29 -0300 Subject: [PATCH 011/606] Add docstring of backend methods --- backend/handlers/feature_toggle_handler.py | 16 +++++++ backend/models/feature.py | 50 ++++++++++++++++++++-- frontend/sw.js | 2 +- frontend/utils/mapStateToFeatureService.js | 1 - 4 files changed, 63 insertions(+), 6 deletions(-) diff --git a/backend/handlers/feature_toggle_handler.py b/backend/handlers/feature_toggle_handler.py index 52d5b130d..d67661e80 100644 --- a/backend/handlers/feature_toggle_handler.py +++ b/backend/handlers/feature_toggle_handler.py @@ -10,13 +10,25 @@ __all__ = ['FeatureToggleHander'] def to_json(feature_list): + """ + Method to generate list of feature models in json format object. + + Params: + feature_list -- List of features objects + """ + features = [feature.make() for feature in feature_list] return features class FeatureToggleHander(BaseHandler): + """Feature toggle hanler.""" @json_response def get(self): + """ + Method to get all features or filter by name using query parameter. + """ + feature_name = self.request.get('name') if feature_name: @@ -29,6 +41,10 @@ def get(self): @login_required @json_response def put(self, user): + """ + Method for modifying the properties of one or more features. + """ + features_body = json.loads(self.request.body) features = Feature.enable_all(features_body) self.response.write(json.dumps(to_json(features))) diff --git a/backend/models/feature.py b/backend/models/feature.py index 05aba93ce..9836b4690 100644 --- a/backend/models/feature.py +++ b/backend/models/feature.py @@ -4,6 +4,10 @@ __all__ = ['Feature'] class Feature(ndb.Model): + """ + Model of Feature + """ + name = ndb.StringProperty() enable_mobile = ndb.StringProperty( choices=set(["SUPER_USER", "ADMIN", "ALL", "DISABLED"])) @@ -11,13 +15,31 @@ class Feature(ndb.Model): choices=set(["SUPER_USER", "ADMIN", "ALL", "DISABLED"])) @staticmethod + @ndb.transactional(xg=True) def create(name, enable_mobile="ALL", enable_desktop="ALL"): + """ + Method to create new feature. + + Params: + name -- Name of the new feature + enable_mobile -- (Optional) User group to which the feature is enabled in the mobile version. If not received will be enabled for everyone. + enable_desktop -- (Optional) User group to which the feature is enabled in the desktop version. If not received will be enabled for everyone. + """ + feature = Feature(id=name, name=name, enable_desktop=enable_desktop, enable_mobile=enable_mobile) feature.put() return feature @staticmethod + @ndb.transactional(xg=True) def enable_all(features_list): + """ + Method to enable or disable multiple features. + + Params: + features_list -- list of dictionaries containing the properties of the features model to be modified. + """ + features_dict = { feature['name']: { 'enable_mobile': feature['enable_mobile'], @@ -36,11 +58,22 @@ def enable_all(features_list): @staticmethod def get_all_features(): + """ + Method to get all stored features. + """ + features = Feature.query().fetch() return features @staticmethod def get_feature(feature_name): + """ + Method to get feature by name. + + Params: + feature_name -- name of the requested feature + """ + feature = Feature.get_by_id(feature_name) if feature: @@ -48,12 +81,21 @@ def get_feature(feature_name): else: raise Exception("Feature not found!") - @staticmethod - def isEnabled(feature_name): - feature = Feature.get_feature(feature_name) - return feature.enabled + def is_enabled(self): + """ + Method to verify if the feature is enabled. + """ + + disabled_mobile = self.enable_mobile == 'DISABLED' + disabled_desktop = self.enable_desktop == 'DISABLED' + + return not (disabled_desktop and disabled_mobile) def make(self): + """ + Method to make feature. + """ + make_obj = { 'name': self.name, 'enable_mobile': self.enable_mobile, diff --git a/frontend/sw.js b/frontend/sw.js index 3d30b829c..4bca0fe8a 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'create-feature-toggles'; + const CACHE_SUFIX = 'master'; let messaging; diff --git a/frontend/utils/mapStateToFeatureService.js b/frontend/utils/mapStateToFeatureService.js index 096a0d4cb..1894488a6 100644 --- a/frontend/utils/mapStateToFeatureService.js +++ b/frontend/utils/mapStateToFeatureService.js @@ -3,7 +3,6 @@ const app = angular.module('app'); - app.service('MapStateToFeatureService', function(STATES) { const service = this; From 2b88b61260922871b0788665c277d89a965c5e47 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 13 Dec 2018 16:21:48 -0300 Subject: [PATCH 012/606] Add documentation of frontend functions --- backend/models/feature.py | 5 ++--- frontend/app.js | 2 +- frontend/utils/featureToggleService.js | 23 ++++++++++++++++++---- frontend/utils/mapStateToFeatureService.js | 12 +++++++++++ 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/backend/models/feature.py b/backend/models/feature.py index 9836b4690..cf8968819 100644 --- a/backend/models/feature.py +++ b/backend/models/feature.py @@ -5,9 +5,9 @@ class Feature(ndb.Model): """ - Model of Feature + Model of Feature. """ - + name = ndb.StringProperty() enable_mobile = ndb.StringProperty( choices=set(["SUPER_USER", "ADMIN", "ALL", "DISABLED"])) @@ -31,7 +31,6 @@ def create(name, enable_mobile="ALL", enable_desktop="ALL"): return feature @staticmethod - @ndb.transactional(xg=True) def enable_all(features_list): """ Method to enable or disable multiple features. diff --git a/frontend/app.js b/frontend/app.js index 5ef32eaa6..2cfc80af0 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -529,7 +529,7 @@ } else { $state.go(STATES.ERROR, { "msg": "Desculpa! Este recurso ainda não está disponível.", - "status": "401" + "status": "500" }); } }); diff --git a/frontend/utils/featureToggleService.js b/frontend/utils/featureToggleService.js index d2427ffa7..25302e853 100644 --- a/frontend/utils/featureToggleService.js +++ b/frontend/utils/featureToggleService.js @@ -7,13 +7,28 @@ const service = this; const uri = '/api/feature-toggle'; - service.getFeatures = function getFeatures(feature_name) { - const query = (feature_name) ? `?name=${feature_name}` : ''; + + /** + * Function to get all features or filter by name + * + * @param {String} featureName - (Optional) Feature name to use in query parameter + * @return {Promise} Promise that when it is resolved it returns the searched feature. + */ + service.getFeatures = function getFeatures(featureName) { + const query = (featureName) ? `?name=${featureName}` : ''; return HttpService.get(`${uri}${query}`); }; - service.isEnabled = function isEnabled(feature_name) { - return service.getFeatures(feature_name).then(function(response) { + + /** + * This function checks whether the feature passed by parameter + * is enabled for the logged in user and the device that he uses. + * + * @param {String} featureName - Feature name to check if is enabled + * @return {Promise} Promise that when it is resolved it returns a boolean indicating whether or not it is enabled. + */ + service.isEnabled = function isEnabled(featureName) { + return service.getFeatures(featureName).then(function(response) { const feature = response[0]; const disabledMobile = feature.enable_mobile === 'DISABLED'; const disabeldDesktop = feature.enable_desktop === 'DISABLED'; diff --git a/frontend/utils/mapStateToFeatureService.js b/frontend/utils/mapStateToFeatureService.js index 1894488a6..09ddff7bb 100644 --- a/frontend/utils/mapStateToFeatureService.js +++ b/frontend/utils/mapStateToFeatureService.js @@ -10,10 +10,22 @@ [STATES.MANAGE_INST_EDIT]: 'manage-inst-edit' }; + /** + * Function to get feature by state name + * + * @param {String} stateName - name of state to get related feature + * @return {String} Feature name if the state is registered, otherwise returns null + */ service.getFeatureByState = function getFeatureByState(stateName) { return _.get(service._statesToFeature, stateName, null); }; + /** + * Function to check if exists feature for state passed by parameter + * + * @param {String} stateName - Name of state to be check + * @return {Boolean} True if exists, otherwise, false + */ service.containsFeature = function containsFeature(stateName) { return stateName in service._statesToFeature; }; From 16782f1366c985b1a28816995eaf3f2578bad550 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 13 Dec 2018 17:41:03 -0300 Subject: [PATCH 013/606] Refact state transition interceptor --- frontend/app.js | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 2cfc80af0..9f090eeb1 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -505,29 +505,21 @@ }); }); - app.run(function featureToggleInterceptor(FeatureToggleService, MapStateToFeatureService, $transitions, $state, STATES) { - let verified = false; + app.run(function featureToggleInterceptor(FeatureToggleService, MapStateToFeatureService, $transitions, STATES) { - $transitions.onStart({ + $transitions.onBefore({ to: function(state) { const stateName = state.name; - if (!verified && MapStateToFeatureService.containsFeature(stateName)) { - return true; - } else { - verified = false; - return false; - } + return MapStateToFeatureService.containsFeature(stateName); } }, function (transition) { - transition.abort(); - const targetState = transition._targetState; + const targetStateName = transition.to().name; - FeatureToggleService.isEnabled(MapStateToFeatureService.getFeatureByState(targetState._identifier)).then(function(enabled) { + return FeatureToggleService.isEnabled(MapStateToFeatureService.getFeatureByState(targetStateName)).then(function(enabled) { if (enabled) { - verified = true; - $state.go(targetState._identifier, targetState._params); + return transition; } else { - $state.go(STATES.ERROR, { + return transition.router.stateService.target(STATES.ERROR, { "msg": "Desculpa! Este recurso ainda não está disponível.", "status": "500" }); From 0b8aa755e5082a9ec0c571cd1331a00ac144f8b2 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 14 Dec 2018 15:12:54 -0300 Subject: [PATCH 014/606] Fix issues --- backend/handlers/feature_toggle_handler.py | 19 ++++++++++--------- backend/main.py | 4 ++-- frontend/utils/featureToggleService.js | 10 +++++----- frontend/utils/mapStateToFeatureService.js | 4 ++-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/backend/handlers/feature_toggle_handler.py b/backend/handlers/feature_toggle_handler.py index d67661e80..b0a59f476 100644 --- a/backend/handlers/feature_toggle_handler.py +++ b/backend/handlers/feature_toggle_handler.py @@ -1,4 +1,4 @@ -"""Feature Toogle handler.""" +"""Feature Toggle handler.""" import json from . import BaseHandler @@ -7,7 +7,7 @@ from models import Feature -__all__ = ['FeatureToggleHander'] +__all__ = ['FeatureToggleHandler'] def to_json(feature_list): """ @@ -18,13 +18,14 @@ def to_json(feature_list): """ features = [feature.make() for feature in feature_list] - return features + return json.dumps(features) -class FeatureToggleHander(BaseHandler): +class FeatureToggleHandler(BaseHandler): """Feature toggle hanler.""" @json_response - def get(self): + @login_required + def get(self, user): """ Method to get all features or filter by name using query parameter. """ @@ -32,11 +33,11 @@ def get(self): feature_name = self.request.get('name') if feature_name: - features = [Feature.get_feature(feature_name).make()] + features = [Feature.get_feature(feature_name)] else: - features = to_json(Feature.get_all_features()) + features = Feature.get_all_features() - self.response.write(json.dumps(features)) + self.response.write(to_json(features)) @login_required @json_response @@ -47,4 +48,4 @@ def put(self, user): features_body = json.loads(self.request.body) features = Feature.enable_all(features_body) - self.response.write(json.dumps(to_json(features))) + self.response.write(to_json(features)) diff --git a/backend/main.py b/backend/main.py index d1b26ce51..ea8577b1e 100644 --- a/backend/main.py +++ b/backend/main.py @@ -45,7 +45,7 @@ from handlers import InviteHandler from handlers import InstitutionParentHandler from handlers import InstitutionChildrenHandler -from handlers import FeatureToggleHander +from handlers import FeatureToggleHandler methods = set(webapp2.WSGIApplication.allowed_methods) methods.add('PATCH') @@ -97,7 +97,7 @@ ("/api/user/institutions/(.*)", UserHandler), ("/api/user/timeline.*", UserTimelineHandler), ("/api/search/institution", SearchHandler), - ("/api/feature-toggle.*", FeatureToggleHander), + ("/api/feature-toggle.*", FeatureToggleHandler), ("/login", LoginHandler), ("/logout", LogoutHandler), ("/api/.*", ErroHandler) diff --git a/frontend/utils/featureToggleService.js b/frontend/utils/featureToggleService.js index 25302e853..ebfb3fa5c 100644 --- a/frontend/utils/featureToggleService.js +++ b/frontend/utils/featureToggleService.js @@ -29,14 +29,14 @@ */ service.isEnabled = function isEnabled(featureName) { return service.getFeatures(featureName).then(function(response) { - const feature = response[0]; - const disabledMobile = feature.enable_mobile === 'DISABLED'; - const disabeldDesktop = feature.enable_desktop === 'DISABLED'; + const feature = _.first(response); + const disableMobile = _.get(feature, 'enable_mobile') === 'DISABLED'; + const disableDesktop = _.get(feature, 'enable_desktop') === 'DISABLED'; - if (disabledMobile && disabeldDesktop) + if (disableMobile && disableDesktop) return false; - return !disabeldDesktop && !Utils.isMobileScreen() || !disabledMobile && Utils.isMobileScreen(); + return !disableDesktop && !Utils.isMobileScreen() || !disableMobile && Utils.isMobileScreen(); }); }; }); diff --git a/frontend/utils/mapStateToFeatureService.js b/frontend/utils/mapStateToFeatureService.js index 09ddff7bb..9b8d6658f 100644 --- a/frontend/utils/mapStateToFeatureService.js +++ b/frontend/utils/mapStateToFeatureService.js @@ -14,10 +14,10 @@ * Function to get feature by state name * * @param {String} stateName - name of state to get related feature - * @return {String} Feature name if the state is registered, otherwise returns null + * @return {String} Feature name if the state is registered, otherwise returns undefined */ service.getFeatureByState = function getFeatureByState(stateName) { - return _.get(service._statesToFeature, stateName, null); + return _.get(service._statesToFeature, stateName); }; /** From 046bc0827ccc2b5f974b258b7cd7b25a8c7ff295 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 14 Dec 2018 17:07:13 -0300 Subject: [PATCH 015/606] Create Feature model test --- backend/test/model_test/feature_test.py | 34 +++++++++++++++++++++++++ frontend/app.js | 2 +- frontend/utils/featureToggleService.js | 12 +++++++-- 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 backend/test/model_test/feature_test.py diff --git a/backend/test/model_test/feature_test.py b/backend/test/model_test/feature_test.py new file mode 100644 index 000000000..259b7bd92 --- /dev/null +++ b/backend/test/model_test/feature_test.py @@ -0,0 +1,34 @@ +"""Feature Test.""" + +from .. import mocks +from ..test_base import TestBase +from models import Feature + + +class FeatureTest(TestBase): + + @classmethod + def setUp(cls): + """Provide the base for the tests.""" + cls.test = cls.testbed.Testbed() + cls.test.activate() + cls.policy = cls.datastore.PseudoRandomHRConsistencyPolicy( + probability=1) + cls.test.init_datastore_v3_stub(consistency_policy=cls.policy) + cls.test.init_memcache_stub() + + def test_create(self): + feature = Feature.create('feature-test') + self.assertEqual(feature.name, 'feature-test') + self.assertEqual(feature.enable_desktop, 'ALL') + self.assertEqual(feature.enable_mobile, 'ALL') + + feature = Feature.create('feature-test2', 'DISABLED') + self.assertEqual(feature.name, 'feature-test2') + self.assertEqual(feature.enable_desktop, 'ALL') + self.assertEqual(feature.enable_mobile, 'DISABLED') + + feature = Feature.create('feature-test3', 'DISABLED', 'DISABLED') + self.assertEqual(feature.name, 'feature-test3') + self.assertEqual(feature.enable_desktop, 'DISABLED') + self.assertEqual(feature.enable_mobile, 'DISABLED') diff --git a/frontend/app.js b/frontend/app.js index 9f090eeb1..46912c00a 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -521,7 +521,7 @@ } else { return transition.router.stateService.target(STATES.ERROR, { "msg": "Desculpa! Este recurso ainda não está disponível.", - "status": "500" + "status": "403" }); } }); diff --git a/frontend/utils/featureToggleService.js b/frontend/utils/featureToggleService.js index ebfb3fa5c..e8e976320 100644 --- a/frontend/utils/featureToggleService.js +++ b/frontend/utils/featureToggleService.js @@ -13,12 +13,20 @@ * * @param {String} featureName - (Optional) Feature name to use in query parameter * @return {Promise} Promise that when it is resolved it returns the searched feature. + * @private */ - service.getFeatures = function getFeatures(featureName) { + service._getFeatures = function getFeatures(featureName) { const query = (featureName) ? `?name=${featureName}` : ''; return HttpService.get(`${uri}${query}`); }; + service.getFeature = function getFeature(featureName) { + return service._getFeatures(featureName); + }; + + service.getAllFeatures = function getAllFeatures() { + return service._getFeatures(); + }; /** * This function checks whether the feature passed by parameter @@ -28,7 +36,7 @@ * @return {Promise} Promise that when it is resolved it returns a boolean indicating whether or not it is enabled. */ service.isEnabled = function isEnabled(featureName) { - return service.getFeatures(featureName).then(function(response) { + return service.getFeature(featureName).then(function(response) { const feature = _.first(response); const disableMobile = _.get(feature, 'enable_mobile') === 'DISABLED'; const disableDesktop = _.get(feature, 'enable_desktop') === 'DISABLED'; From b0c30afc1bb25a62d1231ca3f2ffe03079f2b41f Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 17 Dec 2018 14:02:55 -0300 Subject: [PATCH 016/606] Add more tests --- backend/test/model_test/feature_test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/test/model_test/feature_test.py b/backend/test/model_test/feature_test.py index 259b7bd92..d3c794e6f 100644 --- a/backend/test/model_test/feature_test.py +++ b/backend/test/model_test/feature_test.py @@ -32,3 +32,6 @@ def test_create(self): self.assertEqual(feature.name, 'feature-test3') self.assertEqual(feature.enable_desktop, 'DISABLED') self.assertEqual(feature.enable_mobile, 'DISABLED') + + with self.assertRaises(Exception) as raises_context: + Feature.create('feature-test', 'asjdkhd') From 0d0a9588e7a71794ecac6dc05c5670b95accdf63 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 17 Dec 2018 15:14:47 -0300 Subject: [PATCH 017/606] Add more tests --- backend/test/model_test/feature_test.py | 47 ++++++++++++++++++++++++- frontend/sw.js | 2 +- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/backend/test/model_test/feature_test.py b/backend/test/model_test/feature_test.py index d3c794e6f..60fe50141 100644 --- a/backend/test/model_test/feature_test.py +++ b/backend/test/model_test/feature_test.py @@ -1,6 +1,5 @@ """Feature Test.""" -from .. import mocks from ..test_base import TestBase from models import Feature @@ -35,3 +34,49 @@ def test_create(self): with self.assertRaises(Exception) as raises_context: Feature.create('feature-test', 'asjdkhd') + + exception_message = raises_context.exception + self.assertEquals( + str(exception_message), + "Value 'asjdkhd' for property enable_mobile is not an allowed choice" + ) + + def test_get_all_features(self): + feature = Feature.create('feature-test') + feature2 = Feature.create('feature-test2') + + features = Feature.get_all_features() + self.assertIn(feature, features) + self.assertIn(feature2, features) + + feature3 = Feature.create('feature-test3') + self.assertNotIn(feature3, features) + + features = Feature.get_all_features() + self.assertIn(feature3, features) + + def test_get_feature(self): + feature = Feature.create('feature-test') + feature2 = Feature.create('feature-test2') + + self.assertEqual(feature, Feature.get_feature('feature-test')) + self.assertEqual(feature2, Feature.get_feature('feature-test2')) + + with self.assertRaises(Exception) as raises_context: + Feature.get_feature('djsasadj') + + exception_message = raises_context.exception + self.assertEquals( + str(exception_message), + "Feature not found!" + ) + + def test_make(self): + feature = Feature.create('feature-test') + make = { + 'name': 'feature-test', + 'enable_mobile': 'ALL', + 'enable_desktop': 'ALL' + } + + self.assertEqual(make, feature.make()) diff --git a/frontend/sw.js b/frontend/sw.js index 4bca0fe8a..3d30b829c 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'master'; + const CACHE_SUFIX = 'create-feature-toggles'; let messaging; From 3e540d9fecc44f061d51d0b107617917aac9366c Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 17 Dec 2018 17:05:13 -0300 Subject: [PATCH 018/606] Change name of method from enable_all to set_visibility --- backend/handlers/feature_toggle_handler.py | 2 +- backend/models/feature.py | 2 +- backend/test/model_test/feature_test.py | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/backend/handlers/feature_toggle_handler.py b/backend/handlers/feature_toggle_handler.py index b0a59f476..1ee5a5c9a 100644 --- a/backend/handlers/feature_toggle_handler.py +++ b/backend/handlers/feature_toggle_handler.py @@ -47,5 +47,5 @@ def put(self, user): """ features_body = json.loads(self.request.body) - features = Feature.enable_all(features_body) + features = Feature.set_visibility(features_body) self.response.write(to_json(features)) diff --git a/backend/models/feature.py b/backend/models/feature.py index cf8968819..1cb30a3d0 100644 --- a/backend/models/feature.py +++ b/backend/models/feature.py @@ -31,7 +31,7 @@ def create(name, enable_mobile="ALL", enable_desktop="ALL"): return feature @staticmethod - def enable_all(features_list): + def set_visibility(features_list): """ Method to enable or disable multiple features. diff --git a/backend/test/model_test/feature_test.py b/backend/test/model_test/feature_test.py index 60fe50141..984696066 100644 --- a/backend/test/model_test/feature_test.py +++ b/backend/test/model_test/feature_test.py @@ -5,6 +5,7 @@ class FeatureTest(TestBase): + """Feature model test.""" @classmethod def setUp(cls): @@ -17,6 +18,7 @@ def setUp(cls): cls.test.init_memcache_stub() def test_create(self): + """Teste create a new feature.""" feature = Feature.create('feature-test') self.assertEqual(feature.name, 'feature-test') self.assertEqual(feature.enable_desktop, 'ALL') @@ -41,7 +43,25 @@ def test_create(self): "Value 'asjdkhd' for property enable_mobile is not an allowed choice" ) + def test_set_visibility(self): + """Test set visibility.""" + Feature.create('feature-test') + + feature_dict = { + 'name': 'feature-test', + 'enable_mobile': 'DISABLED', + 'enable_desktop': 'ADMIN' + } + + Feature.set_visibility([feature_dict]) + + feature = Feature.get_feature('feature-test') + + self.assertEqual(feature.enable_mobile, 'DISABLED') + self.assertEqual(feature.enable_desktop, 'ADMIN') + def test_get_all_features(self): + """Test get all features.""" feature = Feature.create('feature-test') feature2 = Feature.create('feature-test2') @@ -56,6 +76,7 @@ def test_get_all_features(self): self.assertIn(feature3, features) def test_get_feature(self): + """Test get feature.""" feature = Feature.create('feature-test') feature2 = Feature.create('feature-test2') @@ -72,6 +93,7 @@ def test_get_feature(self): ) def test_make(self): + """Test make feature.""" feature = Feature.create('feature-test') make = { 'name': 'feature-test', From a24378d9ed00e26de02b5acf7cb59270773fad60 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 18 Dec 2018 10:35:07 -0300 Subject: [PATCH 019/606] Add feature toggle handler test --- .../feature_toggle_handler_tests/__init__.py | 0 .../feature_toggle_handler_test.py | 53 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 backend/test/feature_toggle_handler_tests/__init__.py create mode 100644 backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py diff --git a/backend/test/feature_toggle_handler_tests/__init__.py b/backend/test/feature_toggle_handler_tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py b/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py new file mode 100644 index 000000000..39fa89819 --- /dev/null +++ b/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py @@ -0,0 +1,53 @@ +"""Feature toggle handler test""" + +from ..test_base_handler import TestBaseHandler +from handlers import FeatureToggleHandler +from models import Feature +from mock import patch + + +USER = {'email': 'user@email.com'} + +class FeatureToggleHandlerTest(TestBaseHandler): + + @classmethod + def setUp(cls): + """Provide the base for the tests.""" + super(FeatureToggleHandlerTest, cls).setUp() + app = cls.webapp2.WSGIApplication( + [("/api/feature-toggles.*", + FeatureToggleHandler) + ], debug=True) + cls.testapp = cls.webtest.TestApp(app) + + cls.feature = Feature.create('feature-test') + cls.other_feature = Feature.create('feature-test-other') + + + @patch('util.login_service.verify_token', return_value=USER) + def test_get_all(self, verify_token): + features = self.testapp.get('/api/feature-toggles').json + features_make = [self.feature.make(), self.other_feature.make()] + + self.assertEquals(len(features), 2) + self.assertItemsEqual(features, features_make) + + @patch('util.login_service.verify_token', return_value=USER) + def test_get_by_query(self, verify_token): + feature = self.testapp.get('/api/feature-toggles?name=feature-test').json + feature_make = [self.feature.make()] + + self.assertListEqual(feature, feature_make) + + + feature = self.testapp.get('/api/feature-toggles?name=feature-test-other').json + feature_make = [self.other_feature.make()] + + self.assertListEqual(feature, feature_make) + + with self.assertRaises(Exception) as raises_context: + self.testapp.get('/api/feature-toggles?name=sfjkldh') + + exception_message = self.get_message_exception(str(raises_context.exception)) + + self.assertEquals(exception_message, "Error! Feature not found!") \ No newline at end of file From 81369f79c8f9bb57d986829a6154dae847432d61 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 19 Dec 2018 13:05:08 -0300 Subject: [PATCH 020/606] Add tests off put method --- backend/handlers/feature_toggle_handler.py | 14 ++++++++++-- .../feature_toggle_handler_test.py | 22 ++++++++++++++++++- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/backend/handlers/feature_toggle_handler.py b/backend/handlers/feature_toggle_handler.py index 1ee5a5c9a..36aa9cdd8 100644 --- a/backend/handlers/feature_toggle_handler.py +++ b/backend/handlers/feature_toggle_handler.py @@ -1,10 +1,12 @@ +# -*- coding: utf-8 -*- """Feature Toggle handler.""" import json from . import BaseHandler -from utils import json_response +from utils import json_response, Utils from util import login_required -from models import Feature +from models import Feature, get_deciis +from custom_exceptions import NotAuthorizedException __all__ = ['FeatureToggleHandler'] @@ -46,6 +48,14 @@ def put(self, user): Method for modifying the properties of one or more features. """ + """ + The super user is the admin of + 'Departamento do Complexo Industrial e Inovação em Saúde". + """ + super_user = get_deciis().admin + + Utils._assert(not (super_user == user.key), "User not allowed to modify features!", NotAuthorizedException) + features_body = json.loads(self.request.body) features = Feature.set_visibility(features_body) self.response.write(to_json(features)) diff --git a/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py b/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py index 39fa89819..c0e726b76 100644 --- a/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py +++ b/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py @@ -1,9 +1,11 @@ """Feature toggle handler test""" +import json from ..test_base_handler import TestBaseHandler from handlers import FeatureToggleHandler from models import Feature from mock import patch +from .. import mocks USER = {'email': 'user@email.com'} @@ -50,4 +52,22 @@ def test_get_by_query(self, verify_token): exception_message = self.get_message_exception(str(raises_context.exception)) - self.assertEquals(exception_message, "Error! Feature not found!") \ No newline at end of file + self.assertEquals(exception_message, "Error! Feature not found!") + + @patch('util.login_service.verify_token', return_value=USER) + def test_put(self, verify_token): + user_admin = mocks.create_user('user@email.com') + deciis = mocks.create_institution('DECIIS') + deciis.trusted = True + deciis.add_member(user_admin) + deciis.set_admin(user_admin.key) + user_admin.add_institution(deciis.key) + user_admin.add_institution_admin(deciis.key) + + feature = self.feature.make() + other_feature = self.other_feature.make() + + feature['enable_mobile'] = 'DISABLED' + other_feature['enable_desktop'] = 'DISABLED' + + #self.testapp.put_json('/api/feature-toggle',) From 0a71acb214752d403074fcae619496faa0077433 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 19 Dec 2018 15:59:19 -0300 Subject: [PATCH 021/606] Finish feature toggle heandler test --- backend/models/feature.py | 10 ------- .../feature_toggle_handler_test.py | 29 ++++++++++++++++++- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/backend/models/feature.py b/backend/models/feature.py index 1cb30a3d0..127c396a8 100644 --- a/backend/models/feature.py +++ b/backend/models/feature.py @@ -80,16 +80,6 @@ def get_feature(feature_name): else: raise Exception("Feature not found!") - def is_enabled(self): - """ - Method to verify if the feature is enabled. - """ - - disabled_mobile = self.enable_mobile == 'DISABLED' - disabled_desktop = self.enable_desktop == 'DISABLED' - - return not (disabled_desktop and disabled_mobile) - def make(self): """ Method to make feature. diff --git a/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py b/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py index c0e726b76..0ead984fb 100644 --- a/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py +++ b/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py @@ -11,6 +11,9 @@ USER = {'email': 'user@email.com'} class FeatureToggleHandlerTest(TestBaseHandler): + """ + Feature Toggle Handler Test. + """ @classmethod def setUp(cls): @@ -28,6 +31,8 @@ def setUp(cls): @patch('util.login_service.verify_token', return_value=USER) def test_get_all(self, verify_token): + """Test get all features.""" + features = self.testapp.get('/api/feature-toggles').json features_make = [self.feature.make(), self.other_feature.make()] @@ -36,6 +41,8 @@ def test_get_all(self, verify_token): @patch('util.login_service.verify_token', return_value=USER) def test_get_by_query(self, verify_token): + """Test get feature with query parameter.""" + feature = self.testapp.get('/api/feature-toggles?name=feature-test').json feature_make = [self.feature.make()] @@ -56,7 +63,10 @@ def test_get_by_query(self, verify_token): @patch('util.login_service.verify_token', return_value=USER) def test_put(self, verify_token): + """Test put features.""" + user_admin = mocks.create_user('user@email.com') + user = mocks.create_user() deciis = mocks.create_institution('DECIIS') deciis.trusted = True deciis.add_member(user_admin) @@ -70,4 +80,21 @@ def test_put(self, verify_token): feature['enable_mobile'] = 'DISABLED' other_feature['enable_desktop'] = 'DISABLED' - #self.testapp.put_json('/api/feature-toggle',) + self.testapp.put_json('/api/feature-toggles', [feature, other_feature]).json + + self.feature = self.feature.key.get() + self.other_feature = self.other_feature.key.get() + + self.assertEquals(self.feature.enable_desktop, 'ALL') + self.assertEquals(self.feature.enable_mobile, 'DISABLED') + self.assertEquals(self.other_feature.enable_desktop, 'DISABLED') + self.assertEquals(self.other_feature.enable_mobile, 'ALL') + + verify_token._mock_return_value = {'email': user.email[0]} + + with self.assertRaises(Exception) as raises_context: + self.testapp.put_json('/api/feature-toggles', [feature, other_feature]).json + + exception_message = self.get_message_exception(str(raises_context.exception)) + + self.assertEquals(exception_message, 'Error! User not allowed to modify features!') From 06a287b3bfa4a98a738a5ba0e78108e451af1eb3 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 20 Dec 2018 16:29:43 -0300 Subject: [PATCH 022/606] Create tests for featureToggleService --- frontend/sw.js | 2 +- .../specs/utils/featureToggleServiceSpec.js | 129 ++++++++++++++++++ 2 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 frontend/test/specs/utils/featureToggleServiceSpec.js diff --git a/frontend/sw.js b/frontend/sw.js index 3d30b829c..4bca0fe8a 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'create-feature-toggles'; + const CACHE_SUFIX = 'master'; let messaging; diff --git a/frontend/test/specs/utils/featureToggleServiceSpec.js b/frontend/test/specs/utils/featureToggleServiceSpec.js new file mode 100644 index 000000000..41534ad54 --- /dev/null +++ b/frontend/test/specs/utils/featureToggleServiceSpec.js @@ -0,0 +1,129 @@ +'use strict'; + +describe('Test FeatureToggleService', function() { + beforeEach(module('app')); + + let featureToggleService, httpBackend; + + const feature = { + name: 'test-feature', + enable_mobile: 'ALL', + enable_desktop: 'DISABLED' + }; + + const otherFeature = { + name: 'test-other-feature', + enable_mobile: 'DISABLED', + enable_desktop: 'ALL' + }; + + beforeEach(inject(function($httpBackend, FeatureToggleService) { + featureToggleService = FeatureToggleService; + httpBackend = $httpBackend; + + $httpBackend.whenGET(`/api/feature-toggle?name=${feature.name}`).respond([feature]); + $httpBackend.whenGET(`/api/feature-toggle?name=${otherFeature.name}`).respond([otherFeature]); + $httpBackend.whenGET('/api/feature-toggle').respond([feature, otherFeature]); + })); + + afterEach(function() { + httpBackend.verifyNoOutstandingExpectation(); + httpBackend.verifyNoOutstandingRequest(); + }); + + describe('Test _getFeature', function() { + + it('Should be return all features', function(done) { + featureToggleService._getFeatures().then(function(response) { + expect(response).toEqual([feature, otherFeature]); + done(); + }); + httpBackend.flush(); + }); + + it('Should be return feature test-feature', function(done) { + featureToggleService._getFeatures(feature.name).then(function(response) { + expect(response).toEqual([feature]); + done(); + }); + httpBackend.flush(); + }); + + it('Should be return feature test-other-feature', function(done) { + featureToggleService._getFeatures(otherFeature.name).then(function(response) { + expect(response).toEqual([otherFeature]); + done(); + }); + httpBackend.flush(); + }); + }); + + describe('Test getAllFeatures', function() { + + it('Should be return all features', function(done) { + featureToggleService.getAllFeatures().then(function(response) { + expect(response).toEqual([feature, otherFeature]); + done(); + }); + httpBackend.flush(); + }); + }); + + describe('Test getFeature', function() { + it('Should be return feature test-feature', function(done) { + featureToggleService.getFeature(feature.name).then(function(response) { + expect(response).toEqual([feature]); + done(); + }); + httpBackend.flush(); + }); + + it('Should be return feature test-other-feature', function(done) { + featureToggleService.getFeature(otherFeature.name).then(function(response) { + expect(response).toEqual([otherFeature]); + done(); + }); + httpBackend.flush(); + }); + }); + + + describe('Test isEnabled', function() { + it('Should be return true with test-feature', function(done) { + window.screen = {width: 100}; + featureToggleService.isEnabled(feature.name).then(function(response) { + expect(response).toBeTruthy(); + done(); + }); + httpBackend.flush(); + }); + + it('Should be return true with test-other-feature', function(done) { + window.screen = {width: 1000}; + featureToggleService.isEnabled(otherFeature.name).then(function(response) { + expect(response).toBeTruthy(); + done(); + }); + httpBackend.flush(); + }); + + + it('Should be return false with test-feature', function(done) { + window.screen = {width: 1000}; + featureToggleService.isEnabled(feature.name).then(function(response) { + expect(response).toBeFalsy(); + done(); + }); + httpBackend.flush(); + }); + + it('Should be return false with test-other-feature', function(done) { + window.screen = {width: 100}; + featureToggleService.isEnabled(otherFeature.name).then(function(response) { + expect(response).toBeFalsy(); + done(); + }); + httpBackend.flush(); + }); + }); +}); \ No newline at end of file From 551f99142135ddfa44f9f04e809a040919cbf86b Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 21 Dec 2018 15:50:14 -0300 Subject: [PATCH 023/606] Create tests of mapStateToFeatureService --- .../utils/mapStateToFeatureServiceSpec.js | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 frontend/test/specs/utils/mapStateToFeatureServiceSpec.js diff --git a/frontend/test/specs/utils/mapStateToFeatureServiceSpec.js b/frontend/test/specs/utils/mapStateToFeatureServiceSpec.js new file mode 100644 index 000000000..79046fff4 --- /dev/null +++ b/frontend/test/specs/utils/mapStateToFeatureServiceSpec.js @@ -0,0 +1,38 @@ +'use strict'; + + +describe('MapStateToFeatureService Test', function() { + beforeEach(module('app')); + + let mapStateToFeatureService; + + beforeEach(inject(function(MapStateToFeatureService) { + mapStateToFeatureService = MapStateToFeatureService; + + mapStateToFeatureService._statesToFeature = { + 'app.manage-user': 'manage-user', + 'app.edit-inst': 'edit-inst' + }; + })); + + describe('Test getFeatureByState', function() { + + it('Should be return feature', function() { + let feature = mapStateToFeatureService.getFeatureByState('app.manage-user'); + expect(feature).toEqual('manage-user'); + + feature = mapStateToFeatureService.getFeatureByState('app.edit-inst'); + expect(feature).toEqual('edit-inst'); + }); + + it('Should be return undefined with unregistred state', function() { + let feature = mapStateToFeatureService.getFeatureByState('app.manage-inst'); + expect(feature).toBeUndefined(); + }); + }); + + describe('Test containsFeature', function() { + + + }); +}); \ No newline at end of file From 7174cc8d4584df93b990432d066fc803750bb729 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 21 Dec 2018 16:49:15 -0300 Subject: [PATCH 024/606] Finalize mapStateToFeature test --- .../test/specs/utils/featureToggleServiceSpec.js | 4 ++-- .../specs/utils/mapStateToFeatureServiceSpec.js | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/frontend/test/specs/utils/featureToggleServiceSpec.js b/frontend/test/specs/utils/featureToggleServiceSpec.js index 41534ad54..97b4cf97c 100644 --- a/frontend/test/specs/utils/featureToggleServiceSpec.js +++ b/frontend/test/specs/utils/featureToggleServiceSpec.js @@ -111,7 +111,7 @@ describe('Test FeatureToggleService', function() { it('Should be return false with test-feature', function(done) { window.screen = {width: 1000}; featureToggleService.isEnabled(feature.name).then(function(response) { - expect(response).toBeFalsy(); + expect(response).toEqual(false); done(); }); httpBackend.flush(); @@ -120,7 +120,7 @@ describe('Test FeatureToggleService', function() { it('Should be return false with test-other-feature', function(done) { window.screen = {width: 100}; featureToggleService.isEnabled(otherFeature.name).then(function(response) { - expect(response).toBeFalsy(); + expect(response).toEqual(false); done(); }); httpBackend.flush(); diff --git a/frontend/test/specs/utils/mapStateToFeatureServiceSpec.js b/frontend/test/specs/utils/mapStateToFeatureServiceSpec.js index 79046fff4..39a4c711e 100644 --- a/frontend/test/specs/utils/mapStateToFeatureServiceSpec.js +++ b/frontend/test/specs/utils/mapStateToFeatureServiceSpec.js @@ -33,6 +33,18 @@ describe('MapStateToFeatureService Test', function() { describe('Test containsFeature', function() { - + it('Should be return true', function() { + let contain = mapStateToFeatureService.containsFeature('app.edit-inst'); + expect(contain).toBeTruthy(); + + contain = mapStateToFeatureService.containsFeature('app.manage-user'); + expect(contain).toBeTruthy(); + }); + + + it('Should be return false', function() { + let contain = mapStateToFeatureService.containsFeature('app.manage-inst'); + expect(contain).toEqual(false); + }); }); }); \ No newline at end of file From 937b786f442542ec1a179fe9be039dd495d4324e Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 7 Jan 2019 15:02:23 -0300 Subject: [PATCH 025/606] send exception if param featureName is undefined --- frontend/test/specs/utils/featureToggleServiceSpec.js | 4 ++++ frontend/utils/featureToggleService.js | 3 +++ 2 files changed, 7 insertions(+) diff --git a/frontend/test/specs/utils/featureToggleServiceSpec.js b/frontend/test/specs/utils/featureToggleServiceSpec.js index 97b4cf97c..368bb38aa 100644 --- a/frontend/test/specs/utils/featureToggleServiceSpec.js +++ b/frontend/test/specs/utils/featureToggleServiceSpec.js @@ -125,5 +125,9 @@ describe('Test FeatureToggleService', function() { }); httpBackend.flush(); }); + + it('Should be generated exception', function() { + expect(() => featureToggleService.isEnabled()).toThrow(new Error("Required param featureName")); + }); }); }); \ No newline at end of file diff --git a/frontend/utils/featureToggleService.js b/frontend/utils/featureToggleService.js index e8e976320..ed7eafcbb 100644 --- a/frontend/utils/featureToggleService.js +++ b/frontend/utils/featureToggleService.js @@ -36,6 +36,9 @@ * @return {Promise} Promise that when it is resolved it returns a boolean indicating whether or not it is enabled. */ service.isEnabled = function isEnabled(featureName) { + if (!featureName) + throw new Error("Required param featureName"); + return service.getFeature(featureName).then(function(response) { const feature = _.first(response); const disableMobile = _.get(feature, 'enable_mobile') === 'DISABLED'; From 2adea08f67fe776bcdfc083465945722714a2104 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 7 Jan 2019 15:18:38 -0300 Subject: [PATCH 026/606] return rejected promise if param featureName is undefined --- frontend/app.js | 8 +++++++- frontend/test/specs/utils/featureToggleServiceSpec.js | 7 +++++-- frontend/utils/featureToggleService.js | 4 +++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 46912c00a..d44cef127 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -505,7 +505,7 @@ }); }); - app.run(function featureToggleInterceptor(FeatureToggleService, MapStateToFeatureService, $transitions, STATES) { + app.run(function featureToggleInterceptor(FeatureToggleService, MapStateToFeatureService, $transitions, STATES, MessageService) { $transitions.onBefore({ to: function(state) { @@ -524,6 +524,12 @@ "status": "403" }); } + }).catch(function(message) { + MessageService.showToast(message); + return transition.router.stateService.target(STATES.ERROR, { + "msg": "Desculpa! Este recurso ainda não está disponível.", + "status": "403" + }); }); }); }); diff --git a/frontend/test/specs/utils/featureToggleServiceSpec.js b/frontend/test/specs/utils/featureToggleServiceSpec.js index 368bb38aa..3f88638ab 100644 --- a/frontend/test/specs/utils/featureToggleServiceSpec.js +++ b/frontend/test/specs/utils/featureToggleServiceSpec.js @@ -126,8 +126,11 @@ describe('Test FeatureToggleService', function() { httpBackend.flush(); }); - it('Should be generated exception', function() { - expect(() => featureToggleService.isEnabled()).toThrow(new Error("Required param featureName")); + it('Should be generated exception', function(done) { + featureToggleService.isEnabled().catch(function(message) { + expect(message).toEqual("Required param featureName"); + done(); + }); }); }); }); \ No newline at end of file diff --git a/frontend/utils/featureToggleService.js b/frontend/utils/featureToggleService.js index ed7eafcbb..18f89d39f 100644 --- a/frontend/utils/featureToggleService.js +++ b/frontend/utils/featureToggleService.js @@ -37,7 +37,9 @@ */ service.isEnabled = function isEnabled(featureName) { if (!featureName) - throw new Error("Required param featureName"); + return new Promise((resolve, reject) => { + reject("Required param featureName"); + }); return service.getFeature(featureName).then(function(response) { const feature = _.first(response); From 922aad98c8e4adf6fac34e9fa479c0792a8e2ec2 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 7 Jan 2019 17:08:51 -0300 Subject: [PATCH 027/606] Create ResetFeatureHandler in admin.py --- backend/admin.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/backend/admin.py b/backend/admin.py index d96e5a8d1..ca32d57ee 100644 --- a/backend/admin.py +++ b/backend/admin.py @@ -17,6 +17,7 @@ from models import Comment from models import Invite from models import Event +from models import Feature from utils import NotAuthorizedException from google.appengine.ext import ndb from google.appengine.api import search @@ -37,6 +38,21 @@ delectus, ut aut reiciendis voluptatibus maiores alias consequatur \ aut perferendis doloribus asperiores repellat.' +features = [ + { + "name": 'manage-inst-edit', + "enable_mobile": "DISABLED", + "enable_desktop": "ALL" + } +] + +def reset_features(): + features_query = Feature.query().fetch(keys_only=True) + ndb.delete_multi(features_query) + + for feature in features: + Feature.create(**feature) + def add_comments_to_post(user, user_reply, post, institution, comments_qnt=3): """Add comments to post.""" @@ -520,11 +536,20 @@ def get(self): splab.posts = [] splab.put() + reset_features() + jsonList.append({"msg": "database initialized with a few posts"}) self.response.write(json.dumps(jsonList)) + +class ResetFeaturesHandler(BaseHandler): + def get(self): + reset_features() + self.response.write({"msg": "database initialized with a few features"}) + app = webapp2.WSGIApplication([ ('/admin/reset', ResetHandler), + ('/admin/reset-features', ResetFeaturesHandler) ], debug=True) From aeaca9415c8c97b10eabe8756b4ded4e9a80278d Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 8 Jan 2019 12:10:40 -0300 Subject: [PATCH 028/606] create initial layout of feature toggles service --- ecis | 36 +- feature-toggles/app.js | 44 + feature-toggles/config.js | 10 + feature-toggles/favicon.ico | Bin 0 -> 32038 bytes feature-toggles/feature.yaml | 17 + feature-toggles/index.html | 46 + feature-toggles/libs/angular-ui-router.js | 10075 +++++++++++++++++++ feature-toggles/main/main.html | 3 + feature-toggles/main/mainControler.js | 10 + feature-toggles/manage/manage-toggles.html | 1 + feature-toggles/manage/manageToggles.js | 9 + 11 files changed, 10244 insertions(+), 7 deletions(-) create mode 100644 feature-toggles/app.js create mode 100644 feature-toggles/config.js create mode 100644 feature-toggles/favicon.ico create mode 100644 feature-toggles/feature.yaml create mode 100644 feature-toggles/index.html create mode 100644 feature-toggles/libs/angular-ui-router.js create mode 100644 feature-toggles/main/main.html create mode 100644 feature-toggles/main/mainControler.js create mode 100644 feature-toggles/manage/manage-toggles.html create mode 100644 feature-toggles/manage/manageToggles.js diff --git a/ecis b/ecis index 093ef874e..fe869d50f 100755 --- a/ecis +++ b/ecis @@ -14,18 +14,22 @@ FRONTEND_YAML=frontend/frontend.yaml BACKEND_YAML=backend/backend.yaml WORKER_YAML=backend/worker.yaml SUPPORT_YAML=support/support.yaml +FEATURE_YAML=feature-toggles/feature.yaml LANDINGPAGE_LOCAL="localhost:8080" FRONTEND_LOCAL="localhost:8081" BACKEND_LOCAL="localhost:8082" SUPPORT_LOCAL="localhost:8083" +FEATURE_LOCAL="localhost:8084" + FRONTEND_CONFIG_FILE="frontend/config.js" SUPPORT_CONFIG_FILE="support/config.js" LANDINGPAGE_CONFIG_FILE="landing/config.js" +FEATURE_CONFIG_FILE="feature-toggles/config.js" SW_FILE="frontend/sw.js" -git update-index --skip-worktree $FRONTEND_CONFIG_FILE $SUPPORT_CONFIG_FILE $LANDINGPAGE_CONFIG_FILE +git update-index --skip-worktree $FRONTEND_CONFIG_FILE $SUPPORT_CONFIG_FILE $LANDINGPAGE_CONFIG_FILE $FEATURE_CONFIG_FILE PY_ENV=backend/py_env @@ -77,6 +81,7 @@ function set_config_file { sed -i "$line s|.*| $service: '$url',|" $FRONTEND_CONFIG_FILE sed -i "$line s|.*| $service: '$url',|" $SUPPORT_CONFIG_FILE sed -i "$line s|.*| $service: '$url',|" $LANDINGPAGE_CONFIG_FILE + sed -i "$line s|.*| $service: '$url',|" $FEATURE_CONFIG_FILE catch_error $? "Frontend will use ${bold}$url${_bold} as $service_name." catch_error $? "Support will use ${bold}$url${_bold} as $service_name." @@ -114,13 +119,23 @@ function set_frontend_url { set_config_file $line $service $url $service_name; } +function set_feature_url { + url=$(set_service_url $1 $2); + service="FEATURE_URL"; + line=7; + service_name="feature"; + set_config_file $line $service $url $service_name; +} + function set_app_version_config { - sed -i "8s|.*| APP_VERSION: '$1'|" $FRONTEND_CONFIG_FILE + sed -i "9s|.*| APP_VERSION: '$1'|" $FRONTEND_CONFIG_FILE catch_error $? "APP VERSION on Frontend $1" - sed -i "8s|.*| APP_VERSION: '$1'|" $SUPPORT_CONFIG_FILE + sed -i "9s|.*| APP_VERSION: '$1'|" $SUPPORT_CONFIG_FILE catch_error $? "APP VERSION on Support $1" - sed -i "8s|.*| APP_VERSION: '$1'|" $LANDINGPAGE_CONFIG_FILE + sed -i "9s|.*| APP_VERSION: '$1'|" $LANDINGPAGE_CONFIG_FILE catch_error $? "APP VERSION on LandingPage $1" + sed -i "9s|.*| APP_VERSION: '$1'|" $FEATURE_CONFIG_FILE + catch_error $? "APP VERSION on Feature $1" } function set_cache_suffix_sw { @@ -212,6 +227,7 @@ case "$1" in set_landingpage_url local $LANDINGPAGE_LOCAL set_support_url local $SUPPORT_LOCAL set_frontend_url local $FRONTEND_LOCAL + set_feature_url local $FRONTEND_LOCAL if [[ -n $2 ]] && [ $2 = "--enable_datastore_emulator" ] ; then gcloud beta emulators datastore start --host-port=0.0.0.0:8586 & @@ -223,7 +239,7 @@ case "$1" in fi $(gcloud beta emulators datastore env-init) - dev_appserver.py $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $WORKER_YAML -A development-cis --support_datastore_emulator=$emulator $other_parameter + dev_appserver.py $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $FEATURE_YAML $WORKER_YAML -A development-cis --support_datastore_emulator=$emulator $other_parameter $(gcloud beta emulators datastore env-unset) ;; @@ -295,12 +311,14 @@ case "$1" in APP_NAME="development-cis" SUPPORT_DOMAIN="support-dot-$APP_NAME.appspot.com" FRONTEND_DOMAIN="frontend-dot-$APP_NAME.appspot.com" + FEATURE_DOMAIN="frontend-dot-$APP_NAME.appspot.com" break ;; "eciis-splab") APP_NAME="eciis-splab" SUPPORT_DOMAIN="support.plataformacis.org" FRONTEND_DOMAIN="frontend.plataformacis.org" + FEATURE_DOMAIN="frontend.plataformacis.org" break ;; "Other") @@ -354,17 +372,21 @@ case "$1" in url=$version"."$FRONTEND_DOMAIN set_frontend_url deploy $url + url=$version"."$FEATURE_DOMAIN + set_frontend_url deploy $url + if [ ! -z $3 ]; then # Especified one or more yaml configuration files gcloud app deploy --version $version --no-promote $3 else - gcloud app deploy --version $version --no-promote $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $WORKER_YAML queue.yaml + gcloud app deploy --version $version --no-promote $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $FEATURE_YAML $WORKER_YAML queue.yaml fi else set_backend_url deploy $BACKEND_DOMAIN set_landingpage_url deploy $DOMAIN set_support_url deploy $SUPPORT_DOMAIN set_frontend_url deploy $FRONTEND_DOMAIN - gcloud app deploy $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $WORKER_YAML + set_frontend_url deploy $FEATURE_DOMAIN + gcloud app deploy $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $FEATURE_YAML $WORKER_YAML fi exit 0 diff --git a/feature-toggles/app.js b/feature-toggles/app.js new file mode 100644 index 000000000..4d6b3020b --- /dev/null +++ b/feature-toggles/app.js @@ -0,0 +1,44 @@ +(function() { + 'use strict'; + + const app = angular.module('app', [ + 'ngMaterial', + 'ui.router', + 'ngAnimate', + 'ngMessages', + ]); + + + app.config(function($mdIconProvider, $mdThemingProvider, $urlMatcherFactoryProvider, $urlRouterProvider, $locationProvider, $stateProvider) { + $mdIconProvider.fontSet('md', 'material-icons'); + $mdThemingProvider.theme('docs-dark'); + $mdThemingProvider.theme('input') + .primaryPalette('green'); + $mdThemingProvider.theme('dialogTheme') + .primaryPalette('teal'); + + $urlMatcherFactoryProvider.caseInsensitive(true); + + $stateProvider + .state("main", { + abstract: true, + views: { + main: { + templateUrl: "app/main/main.html", + controller: "MainController as mainCtrl" + } + } + }).state("manage-features", { + url: "/", + views: { + content: { + templateUrl: "app/manage/manage-toggles.html" + } + } + }); + + $urlRouterProvider.otherwise("/"); + + $locationProvider.html5Mode(true); + }); +})(); \ No newline at end of file diff --git a/feature-toggles/config.js b/feature-toggles/config.js new file mode 100644 index 000000000..336ccee67 --- /dev/null +++ b/feature-toggles/config.js @@ -0,0 +1,10 @@ +"use strict"; + +var Config = { + BACKEND_URL: 'http://localhost:8082', + LANDINGPAGE_URL: 'http://localhost:8080', + SUPPORT_URL: 'http://localhost:8083', + FEATURE_URL: 'http://localhost:8081', + FEATURE_URL: 'http://localhost:8083', + APP_VERSION: 'create-feature-toggles-service' +}; diff --git a/feature-toggles/favicon.ico b/feature-toggles/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1d395073d639a42d5ed78f8ce87e6ca95d6386fe GIT binary patch literal 32038 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 M1Ni3te-{V-ABs94^8f$< literal 0 HcmV?d00001 diff --git a/feature-toggles/feature.yaml b/feature-toggles/feature.yaml new file mode 100644 index 000000000..813fcd904 --- /dev/null +++ b/feature-toggles/feature.yaml @@ -0,0 +1,17 @@ +runtime: python27 +api_version: 1 +threadsafe: yes +service: feature + +default_expiration: "1s" + +handlers: +- url: /app/(.*) + secure: always + static_files: \1 + upload: (.*) + +- url: /(.*) + secure: always + static_files: index.html + upload: index.html \ No newline at end of file diff --git a/feature-toggles/index.html b/feature-toggles/index.html new file mode 100644 index 000000000..bebb9401d --- /dev/null +++ b/feature-toggles/index.html @@ -0,0 +1,46 @@ + + + + + + + + Plataforma CIS + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/feature-toggles/libs/angular-ui-router.js b/feature-toggles/libs/angular-ui-router.js new file mode 100644 index 000000000..4e69b5e20 --- /dev/null +++ b/feature-toggles/libs/angular-ui-router.js @@ -0,0 +1,10075 @@ +/** + * State-based routing for AngularJS 1.x + * NOTICE: This monolithic bundle also bundles the @uirouter/core code. + * This causes it to be incompatible with plugins that depend on @uirouter/core. + * We recommend switching to the ui-router-core.js and ui-router-angularjs.js bundles instead. + * For more information, see https://ui-router.github.io/blog/uirouter-for-angularjs-umd-bundles + * @version v1.0.10 + * @link https://ui-router.github.io + * @license MIT License, http://www.opensource.org/licenses/MIT + */ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('angular')) : + typeof define === 'function' && define.amd ? define(['exports', 'angular'], factory) : + (factory((global['@uirouter/angularjs'] = {}),global.angular)); +}(this, (function (exports,ng_from_import) { 'use strict'; + +var ng_from_global = angular; +var ng = (ng_from_import && ng_from_import.module) ? ng_from_import : ng_from_global; + +/** + * Higher order functions + * + * These utility functions are exported, but are subject to change without notice. + * + * @module common_hof + */ /** */ +/** + * Returns a new function for [Partial Application](https://en.wikipedia.org/wiki/Partial_application) of the original function. + * + * Given a function with N parameters, returns a new function that supports partial application. + * The new function accepts anywhere from 1 to N parameters. When that function is called with M parameters, + * where M is less than N, it returns a new function that accepts the remaining parameters. It continues to + * accept more parameters until all N parameters have been supplied. + * + * + * This contrived example uses a partially applied function as an predicate, which returns true + * if an object is found in both arrays. + * @example + * ``` + * // returns true if an object is in both of the two arrays + * function inBoth(array1, array2, object) { + * return array1.indexOf(object) !== -1 && + * array2.indexOf(object) !== 1; + * } + * let obj1, obj2, obj3, obj4, obj5, obj6, obj7 + * let foos = [obj1, obj3] + * let bars = [obj3, obj4, obj5] + * + * // A curried "copy" of inBoth + * let curriedInBoth = curry(inBoth); + * // Partially apply both the array1 and array2 + * let inFoosAndBars = curriedInBoth(foos, bars); + * + * // Supply the final argument; since all arguments are + * // supplied, the original inBoth function is then called. + * let obj1InBoth = inFoosAndBars(obj1); // false + * + * // Use the inFoosAndBars as a predicate. + * // Filter, on each iteration, supplies the final argument + * let allObjs = [ obj1, obj2, obj3, obj4, obj5, obj6, obj7 ]; + * let foundInBoth = allObjs.filter(inFoosAndBars); // [ obj3 ] + * + * ``` + * + * Stolen from: http://stackoverflow.com/questions/4394747/javascript-curry-function + * + * @param fn + * @returns {*|function(): (*|any)} + */ +function curry(fn) { + var initial_args = [].slice.apply(arguments, [1]); + var func_args_length = fn.length; + function curried(args) { + if (args.length >= func_args_length) + return fn.apply(null, args); + return function () { + return curried(args.concat([].slice.apply(arguments))); + }; + } + return curried(initial_args); +} +/** + * Given a varargs list of functions, returns a function that composes the argument functions, right-to-left + * given: f(x), g(x), h(x) + * let composed = compose(f,g,h) + * then, composed is: f(g(h(x))) + */ +function compose() { + var args = arguments; + var start = args.length - 1; + return function () { + var i = start, result = args[start].apply(this, arguments); + while (i--) + result = args[i].call(this, result); + return result; + }; +} +/** + * Given a varargs list of functions, returns a function that is composes the argument functions, left-to-right + * given: f(x), g(x), h(x) + * let piped = pipe(f,g,h); + * then, piped is: h(g(f(x))) + */ +function pipe() { + var funcs = []; + for (var _i = 0; _i < arguments.length; _i++) { + funcs[_i] = arguments[_i]; + } + return compose.apply(null, [].slice.call(arguments).reverse()); +} +/** + * Given a property name, returns a function that returns that property from an object + * let obj = { foo: 1, name: "blarg" }; + * let getName = prop("name"); + * getName(obj) === "blarg" + */ +var prop = function (name) { + return function (obj) { return obj && obj[name]; }; +}; +/** + * Given a property name and a value, returns a function that returns a boolean based on whether + * the passed object has a property that matches the value + * let obj = { foo: 1, name: "blarg" }; + * let getName = propEq("name", "blarg"); + * getName(obj) === true + */ +var propEq = curry(function (name, val, obj) { return obj && obj[name] === val; }); +/** + * Given a dotted property name, returns a function that returns a nested property from an object, or undefined + * let obj = { id: 1, nestedObj: { foo: 1, name: "blarg" }, }; + * let getName = prop("nestedObj.name"); + * getName(obj) === "blarg" + * let propNotFound = prop("this.property.doesnt.exist"); + * propNotFound(obj) === undefined + */ +var parse = function (name) { + return pipe.apply(null, name.split(".").map(prop)); +}; +/** + * Given a function that returns a truthy or falsey value, returns a + * function that returns the opposite (falsey or truthy) value given the same inputs + */ +var not = function (fn) { + return function () { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + return !fn.apply(null, args); + }; +}; +/** + * Given two functions that return truthy or falsey values, returns a function that returns truthy + * if both functions return truthy for the given arguments + */ +function and(fn1, fn2) { + return function () { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + return fn1.apply(null, args) && fn2.apply(null, args); + }; +} +/** + * Given two functions that return truthy or falsey values, returns a function that returns truthy + * if at least one of the functions returns truthy for the given arguments + */ +function or(fn1, fn2) { + return function () { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + return fn1.apply(null, args) || fn2.apply(null, args); + }; +} +/** + * Check if all the elements of an array match a predicate function + * + * @param fn1 a predicate function `fn1` + * @returns a function which takes an array and returns true if `fn1` is true for all elements of the array + */ +var all = function (fn1) { + return function (arr) { return arr.reduce(function (b, x) { return b && !!fn1(x); }, true); }; +}; +var any = function (fn1) { + return function (arr) { return arr.reduce(function (b, x) { return b || !!fn1(x); }, false); }; +}; +/** Given a class, returns a Predicate function that returns true if the object is of that class */ +var is = function (ctor) { + return function (obj) { + return (obj != null && obj.constructor === ctor || obj instanceof ctor); + }; +}; +/** Given a value, returns a Predicate function that returns true if another value is === equal to the original value */ +var eq = function (val) { return function (other) { + return val === other; +}; }; +/** Given a value, returns a function which returns the value */ +var val = function (v) { return function () { return v; }; }; +function invoke(fnName, args) { + return function (obj) { + return obj[fnName].apply(obj, args); + }; +} +/** + * Sorta like Pattern Matching (a functional programming conditional construct) + * + * See http://c2.com/cgi/wiki?PatternMatching + * + * This is a conditional construct which allows a series of predicates and output functions + * to be checked and then applied. Each predicate receives the input. If the predicate + * returns truthy, then its matching output function (mapping function) is provided with + * the input and, then the result is returned. + * + * Each combination (2-tuple) of predicate + output function should be placed in an array + * of size 2: [ predicate, mapFn ] + * + * These 2-tuples should be put in an outer array. + * + * @example + * ``` + * + * // Here's a 2-tuple where the first element is the isString predicate + * // and the second element is a function that returns a description of the input + * let firstTuple = [ angular.isString, (input) => `Heres your string ${input}` ]; + * + * // Second tuple: predicate "isNumber", mapfn returns a description + * let secondTuple = [ angular.isNumber, (input) => `(${input}) That's a number!` ]; + * + * let third = [ (input) => input === null, (input) => `Oh, null...` ]; + * + * let fourth = [ (input) => input === undefined, (input) => `notdefined` ]; + * + * let descriptionOf = pattern([ firstTuple, secondTuple, third, fourth ]); + * + * console.log(descriptionOf(undefined)); // 'notdefined' + * console.log(descriptionOf(55)); // '(55) That's a number!' + * console.log(descriptionOf("foo")); // 'Here's your string foo' + * ``` + * + * @param struct A 2D array. Each element of the array should be an array, a 2-tuple, + * with a Predicate and a mapping/output function + * @returns {function(any): *} + */ +function pattern(struct) { + return function (x) { + for (var i = 0; i < struct.length; i++) { + if (struct[i][0](x)) + return struct[i][1](x); + } + }; +} + +/** + * @coreapi + * @module core + */ +/** + * Matches state names using glob-like pattern strings. + * + * Globs can be used in specific APIs including: + * + * - [[StateService.is]] + * - [[StateService.includes]] + * - The first argument to Hook Registration functions like [[TransitionService.onStart]] + * - [[HookMatchCriteria]] and [[HookMatchCriterion]] + * + * A `Glob` string is a pattern which matches state names. + * Nested state names are split into segments (separated by a dot) when processing. + * The state named `foo.bar.baz` is split into three segments ['foo', 'bar', 'baz'] + * + * Globs work according to the following rules: + * + * ### Exact match: + * + * The glob `'A.B'` matches the state named exactly `'A.B'`. + * + * | Glob |Matches states named|Does not match state named| + * |:------------|:--------------------|:---------------------| + * | `'A'` | `'A'` | `'B'` , `'A.C'` | + * | `'A.B'` | `'A.B'` | `'A'` , `'A.B.C'` | + * | `'foo'` | `'foo'` | `'FOO'` , `'foo.bar'`| + * + * ### Single star (`*`) + * + * A single star (`*`) is a wildcard that matches exactly one segment. + * + * | Glob |Matches states named |Does not match state named | + * |:------------|:---------------------|:--------------------------| + * | `'*'` | `'A'` , `'Z'` | `'A.B'` , `'Z.Y.X'` | + * | `'A.*'` | `'A.B'` , `'A.C'` | `'A'` , `'A.B.C'` | + * | `'A.*.*'` | `'A.B.C'` , `'A.X.Y'`| `'A'`, `'A.B'` , `'Z.Y.X'`| + * + * ### Double star (`**`) + * + * A double star (`'**'`) is a wildcard that matches *zero or more segments* + * + * | Glob |Matches states named |Does not match state named | + * |:------------|:----------------------------------------------|:----------------------------------| + * | `'**'` | `'A'` , `'A.B'`, `'Z.Y.X'` | (matches all states) | + * | `'A.**'` | `'A'` , `'A.B'` , `'A.C.X'` | `'Z.Y.X'` | + * | `'**.X'` | `'X'` , `'A.X'` , `'Z.Y.X'` | `'A'` , `'A.login.Z'` | + * | `'A.**.X'` | `'A.X'` , `'A.B.X'` , `'A.B.C.X'` | `'A'` , `'A.B.C'` | + * + */ +var Glob = /** @class */ (function () { + function Glob(text) { + this.text = text; + this.glob = text.split('.'); + var regexpString = this.text.split('.') + .map(function (seg) { + if (seg === '**') + return '(?:|(?:\\.[^.]*)*)'; + if (seg === '*') + return '\\.[^.]*'; + return '\\.' + seg; + }).join(''); + this.regexp = new RegExp("^" + regexpString + "$"); + } + Glob.prototype.matches = function (name) { + return this.regexp.test('.' + name); + }; + /** Returns true if the string has glob-like characters in it */ + Glob.is = function (text) { + return !!/[!,*]+/.exec(text); + }; + /** Returns a glob from the string, or null if the string isn't Glob-like */ + Glob.fromString = function (text) { + return Glob.is(text) ? new Glob(text) : null; + }; + return Glob; +}()); + +/** + * Internal representation of a UI-Router state. + * + * Instances of this class are created when a [[StateDeclaration]] is registered with the [[StateRegistry]]. + * + * A registered [[StateDeclaration]] is augmented with a getter ([[StateDeclaration.$$state]]) which returns the corresponding [[StateObject]] object. + * + * This class prototypally inherits from the corresponding [[StateDeclaration]]. + * Each of its own properties (i.e., `hasOwnProperty`) are built using builders from the [[StateBuilder]]. + */ +var StateObject = /** @class */ (function () { + /** @deprecated use State.create() */ + function StateObject(config) { + return StateObject.create(config || {}); + } + /** + * Create a state object to put the private/internal implementation details onto. + * The object's prototype chain looks like: + * (Internal State Object) -> (Copy of State.prototype) -> (State Declaration object) -> (State Declaration's prototype...) + * + * @param stateDecl the user-supplied State Declaration + * @returns {StateObject} an internal State object + */ + StateObject.create = function (stateDecl) { + stateDecl = StateObject.isStateClass(stateDecl) ? new stateDecl() : stateDecl; + var state = inherit(inherit(stateDecl, StateObject.prototype)); + stateDecl.$$state = function () { return state; }; + state.self = stateDecl; + state.__stateObjectCache = { + nameGlob: Glob.fromString(state.name) // might return null + }; + return state; + }; + /** + * Returns true if the provided parameter is the same state. + * + * Compares the identity of the state against the passed value, which is either an object + * reference to the actual `State` instance, the original definition object passed to + * `$stateProvider.state()`, or the fully-qualified name. + * + * @param ref Can be one of (a) a `State` instance, (b) an object that was passed + * into `$stateProvider.state()`, (c) the fully-qualified name of a state as a string. + * @returns Returns `true` if `ref` matches the current `State` instance. + */ + StateObject.prototype.is = function (ref) { + return this === ref || this.self === ref || this.fqn() === ref; + }; + /** + * @deprecated this does not properly handle dot notation + * @returns Returns a dot-separated name of the state. + */ + StateObject.prototype.fqn = function () { + if (!this.parent || !(this.parent instanceof this.constructor)) + return this.name; + var name = this.parent.fqn(); + return name ? name + "." + this.name : this.name; + }; + /** + * Returns the root node of this state's tree. + * + * @returns The root of this state's tree. + */ + StateObject.prototype.root = function () { + return this.parent && this.parent.root() || this; + }; + /** + * Gets the state's `Param` objects + * + * Gets the list of [[Param]] objects owned by the state. + * If `opts.inherit` is true, it also includes the ancestor states' [[Param]] objects. + * If `opts.matchingKeys` exists, returns only `Param`s whose `id` is a key on the `matchingKeys` object + * + * @param opts options + */ + StateObject.prototype.parameters = function (opts) { + opts = defaults(opts, { inherit: true, matchingKeys: null }); + var inherited = opts.inherit && this.parent && this.parent.parameters() || []; + return inherited.concat(values(this.params)) + .filter(function (param) { return !opts.matchingKeys || opts.matchingKeys.hasOwnProperty(param.id); }); + }; + /** + * Returns a single [[Param]] that is owned by the state + * + * If `opts.inherit` is true, it also searches the ancestor states` [[Param]]s. + * @param id the name of the [[Param]] to return + * @param opts options + */ + StateObject.prototype.parameter = function (id, opts) { + if (opts === void 0) { opts = {}; } + return (this.url && this.url.parameter(id, opts) || + find(values(this.params), propEq('id', id)) || + opts.inherit && this.parent && this.parent.parameter(id)); + }; + StateObject.prototype.toString = function () { + return this.fqn(); + }; + /** Predicate which returns true if the object is an class with @State() decorator */ + StateObject.isStateClass = function (stateDecl) { + return isFunction(stateDecl) && stateDecl['__uiRouterState'] === true; + }; + /** Predicate which returns true if the object is an internal [[StateObject]] object */ + StateObject.isState = function (obj) { + return isObject(obj['__stateObjectCache']); + }; + return StateObject; +}()); + +/** Predicates + * + * These predicates return true/false based on the input. + * Although these functions are exported, they are subject to change without notice. + * + * @module common_predicates + */ +/** */ +var toStr = Object.prototype.toString; +var tis = function (t) { return function (x) { return typeof (x) === t; }; }; +var isUndefined = tis('undefined'); +var isDefined = not(isUndefined); +var isNull = function (o) { return o === null; }; +var isNullOrUndefined = or(isNull, isUndefined); +var isFunction = tis('function'); +var isNumber = tis('number'); +var isString = tis('string'); +var isObject = function (x) { return x !== null && typeof x === 'object'; }; +var isArray = Array.isArray; +var isDate = (function (x) { return toStr.call(x) === '[object Date]'; }); +var isRegExp = (function (x) { return toStr.call(x) === '[object RegExp]'; }); +var isState = StateObject.isState; +/** + * Predicate which checks if a value is injectable + * + * A value is "injectable" if it is a function, or if it is an ng1 array-notation-style array + * where all the elements in the array are Strings, except the last one, which is a Function + */ +function isInjectable(val$$1) { + if (isArray(val$$1) && val$$1.length) { + var head = val$$1.slice(0, -1), tail = val$$1.slice(-1); + return !(head.filter(not(isString)).length || tail.filter(not(isFunction)).length); + } + return isFunction(val$$1); +} +/** + * Predicate which checks if a value looks like a Promise + * + * It is probably a Promise if it's an object, and it has a `then` property which is a Function + */ +var isPromise = and(isObject, pipe(prop('then'), isFunction)); + +var notImplemented = function (fnname) { return function () { + throw new Error(fnname + "(): No coreservices implementation for UI-Router is loaded."); +}; }; +var services = { + $q: undefined, + $injector: undefined, +}; + +/** + * Random utility functions used in the UI-Router code + * + * These functions are exported, but are subject to change without notice. + * + * @preferred + * @module common + */ +/** for typedoc */ +var root = (typeof self === 'object' && self.self === self && self) || + (typeof global === 'object' && global.global === global && global) || undefined; +var angular$1 = root.angular || {}; +var fromJson = angular$1.fromJson || JSON.parse.bind(JSON); +var toJson = angular$1.toJson || JSON.stringify.bind(JSON); +var forEach = angular$1.forEach || _forEach; +var extend = Object.assign || _extend; +var equals = angular$1.equals || _equals; +function identity(x) { return x; } +function noop$1() { } +/** + * Builds proxy functions on the `to` object which pass through to the `from` object. + * + * For each key in `fnNames`, creates a proxy function on the `to` object. + * The proxy function calls the real function on the `from` object. + * + * + * #### Example: + * This example creates an new class instance whose functions are prebound to the new'd object. + * ```js + * class Foo { + * constructor(data) { + * // Binds all functions from Foo.prototype to 'this', + * // then copies them to 'this' + * bindFunctions(Foo.prototype, this, this); + * this.data = data; + * } + * + * log() { + * console.log(this.data); + * } + * } + * + * let myFoo = new Foo([1,2,3]); + * var logit = myFoo.log; + * logit(); // logs [1, 2, 3] from the myFoo 'this' instance + * ``` + * + * #### Example: + * This example creates a bound version of a service function, and copies it to another object + * ``` + * + * var SomeService = { + * this.data = [3, 4, 5]; + * this.log = function() { + * console.log(this.data); + * } + * } + * + * // Constructor fn + * function OtherThing() { + * // Binds all functions from SomeService to SomeService, + * // then copies them to 'this' + * bindFunctions(SomeService, this, SomeService); + * } + * + * let myOtherThing = new OtherThing(); + * myOtherThing.log(); // logs [3, 4, 5] from SomeService's 'this' + * ``` + * + * @param source A function that returns the source object which contains the original functions to be bound + * @param target A function that returns the target object which will receive the bound functions + * @param bind A function that returns the object which the functions will be bound to + * @param fnNames The function names which will be bound (Defaults to all the functions found on the 'from' object) + * @param latebind If true, the binding of the function is delayed until the first time it's invoked + */ +function createProxyFunctions(source, target, bind, fnNames, latebind) { + if (latebind === void 0) { latebind = false; } + var bindFunction = function (fnName) { + return source()[fnName].bind(bind()); + }; + var makeLateRebindFn = function (fnName) { return function lateRebindFunction() { + target[fnName] = bindFunction(fnName); + return target[fnName].apply(null, arguments); + }; }; + fnNames = fnNames || Object.keys(source()); + return fnNames.reduce(function (acc, name) { + acc[name] = latebind ? makeLateRebindFn(name) : bindFunction(name); + return acc; + }, target); +} +/** + * prototypal inheritance helper. + * Creates a new object which has `parent` object as its prototype, and then copies the properties from `extra` onto it + */ +var inherit = function (parent, extra) { + return extend(Object.create(parent), extra); +}; +/** Given an array, returns true if the object is found in the array, (using indexOf) */ +var inArray = curry(_inArray); +function _inArray(array, obj) { + return array.indexOf(obj) !== -1; +} +/** + * Given an array, and an item, if the item is found in the array, it removes it (in-place). + * The same array is returned + */ +var removeFrom = curry(_removeFrom); +function _removeFrom(array, obj) { + var idx = array.indexOf(obj); + if (idx >= 0) + array.splice(idx, 1); + return array; +} +/** pushes a values to an array and returns the value */ +var pushTo = curry(_pushTo); +function _pushTo(arr, val$$1) { + return (arr.push(val$$1), val$$1); +} +/** Given an array of (deregistration) functions, calls all functions and removes each one from the source array */ +var deregAll = function (functions) { + return functions.slice().forEach(function (fn) { + typeof fn === 'function' && fn(); + removeFrom(functions, fn); + }); +}; +/** + * Applies a set of defaults to an options object. The options object is filtered + * to only those properties of the objects in the defaultsList. + * Earlier objects in the defaultsList take precedence when applying defaults. + */ +function defaults(opts) { + var defaultsList = []; + for (var _i = 1; _i < arguments.length; _i++) { + defaultsList[_i - 1] = arguments[_i]; + } + var _defaultsList = defaultsList.concat({}).reverse(); + var defaultVals = extend.apply(null, _defaultsList); + return extend({}, defaultVals, pick(opts || {}, Object.keys(defaultVals))); +} +/** Reduce function that merges each element of the list into a single object, using extend */ +var mergeR = function (memo, item) { return extend(memo, item); }; +/** + * Finds the common ancestor path between two states. + * + * @param {Object} first The first state. + * @param {Object} second The second state. + * @return {Array} Returns an array of state names in descending order, not including the root. + */ +function ancestors(first, second) { + var path = []; + for (var n in first.path) { + if (first.path[n] !== second.path[n]) + break; + path.push(first.path[n]); + } + return path; +} +/** + * Return a copy of the object only containing the whitelisted properties. + * + * #### Example: + * ``` + * var foo = { a: 1, b: 2, c: 3 }; + * var ab = pick(foo, ['a', 'b']); // { a: 1, b: 2 } + * ``` + * @param obj the source object + * @param propNames an Array of strings, which are the whitelisted property names + */ +function pick(obj, propNames) { + var objCopy = {}; + for (var prop_1 in obj) { + if (propNames.indexOf(prop_1) !== -1) { + objCopy[prop_1] = obj[prop_1]; + } + } + return objCopy; +} +/** + * Return a copy of the object omitting the blacklisted properties. + * + * @example + * ``` + * + * var foo = { a: 1, b: 2, c: 3 }; + * var ab = omit(foo, ['a', 'b']); // { c: 3 } + * ``` + * @param obj the source object + * @param propNames an Array of strings, which are the blacklisted property names + */ +function omit(obj, propNames) { + return Object.keys(obj) + .filter(not(inArray(propNames))) + .reduce(function (acc, key) { return (acc[key] = obj[key], acc); }, {}); +} +/** + * Maps an array, or object to a property (by name) + */ +function pluck(collection, propName) { + return map(collection, prop(propName)); +} +/** Filters an Array or an Object's properties based on a predicate */ +function filter(collection, callback) { + var arr = isArray(collection), result = arr ? [] : {}; + var accept = arr ? function (x) { return result.push(x); } : function (x, key) { return result[key] = x; }; + forEach(collection, function (item, i) { + if (callback(item, i)) + accept(item, i); + }); + return result; +} +/** Finds an object from an array, or a property of an object, that matches a predicate */ +function find(collection, callback) { + var result; + forEach(collection, function (item, i) { + if (result) + return; + if (callback(item, i)) + result = item; + }); + return result; +} +/** Given an object, returns a new object, where each property is transformed by the callback function */ +var mapObj = map; +/** Maps an array or object properties using a callback function */ +function map(collection, callback) { + var result = isArray(collection) ? [] : {}; + forEach(collection, function (item, i) { return result[i] = callback(item, i); }); + return result; +} +/** + * Given an object, return its enumerable property values + * + * @example + * ``` + * + * let foo = { a: 1, b: 2, c: 3 } + * let vals = values(foo); // [ 1, 2, 3 ] + * ``` + */ +var values = function (obj) { + return Object.keys(obj).map(function (key) { return obj[key]; }); +}; +/** + * Reduce function that returns true if all of the values are truthy. + * + * @example + * ``` + * + * let vals = [ 1, true, {}, "hello world"]; + * vals.reduce(allTrueR, true); // true + * + * vals.push(0); + * vals.reduce(allTrueR, true); // false + * ``` + */ +var allTrueR = function (memo, elem) { return memo && elem; }; +/** + * Reduce function that returns true if any of the values are truthy. + * + * * @example + * ``` + * + * let vals = [ 0, null, undefined ]; + * vals.reduce(anyTrueR, true); // false + * + * vals.push("hello world"); + * vals.reduce(anyTrueR, true); // true + * ``` + */ +var anyTrueR = function (memo, elem) { return memo || elem; }; +/** + * Reduce function which un-nests a single level of arrays + * @example + * ``` + * + * let input = [ [ "a", "b" ], [ "c", "d" ], [ [ "double", "nested" ] ] ]; + * input.reduce(unnestR, []) // [ "a", "b", "c", "d", [ "double, "nested" ] ] + * ``` + */ +var unnestR = function (memo, elem) { return memo.concat(elem); }; +/** + * Reduce function which recursively un-nests all arrays + * + * @example + * ``` + * + * let input = [ [ "a", "b" ], [ "c", "d" ], [ [ "double", "nested" ] ] ]; + * input.reduce(unnestR, []) // [ "a", "b", "c", "d", "double, "nested" ] + * ``` + */ +var flattenR = function (memo, elem) { + return isArray(elem) ? memo.concat(elem.reduce(flattenR, [])) : pushR(memo, elem); +}; +/** + * Reduce function that pushes an object to an array, then returns the array. + * Mostly just for [[flattenR]] and [[uniqR]] + */ +function pushR(arr, obj) { + arr.push(obj); + return arr; +} +/** Reduce function that filters out duplicates */ +var uniqR = function (acc, token) { + return inArray(acc, token) ? acc : pushR(acc, token); +}; +/** + * Return a new array with a single level of arrays unnested. + * + * @example + * ``` + * + * let input = [ [ "a", "b" ], [ "c", "d" ], [ [ "double", "nested" ] ] ]; + * unnest(input) // [ "a", "b", "c", "d", [ "double, "nested" ] ] + * ``` + */ +var unnest = function (arr) { return arr.reduce(unnestR, []); }; +/** + * Return a completely flattened version of an array. + * + * @example + * ``` + * + * let input = [ [ "a", "b" ], [ "c", "d" ], [ [ "double", "nested" ] ] ]; + * flatten(input) // [ "a", "b", "c", "d", "double, "nested" ] + * ``` + */ +var flatten = function (arr) { return arr.reduce(flattenR, []); }; +/** + * Given a .filter Predicate, builds a .filter Predicate which throws an error if any elements do not pass. + * @example + * ``` + * + * let isNumber = (obj) => typeof(obj) === 'number'; + * let allNumbers = [ 1, 2, 3, 4, 5 ]; + * allNumbers.filter(assertPredicate(isNumber)); //OK + * + * let oneString = [ 1, 2, 3, 4, "5" ]; + * oneString.filter(assertPredicate(isNumber, "Not all numbers")); // throws Error(""Not all numbers""); + * ``` + */ +var assertPredicate = assertFn; +/** + * Given a .map function, builds a .map function which throws an error if any mapped elements do not pass a truthyness test. + * @example + * ``` + * + * var data = { foo: 1, bar: 2 }; + * + * let keys = [ 'foo', 'bar' ] + * let values = keys.map(assertMap(key => data[key], "Key not found")); + * // values is [1, 2] + * + * let keys = [ 'foo', 'bar', 'baz' ] + * let values = keys.map(assertMap(key => data[key], "Key not found")); + * // throws Error("Key not found") + * ``` + */ +var assertMap = assertFn; +function assertFn(predicateOrMap, errMsg) { + if (errMsg === void 0) { errMsg = "assert failure"; } + return function (obj) { + var result = predicateOrMap(obj); + if (!result) { + throw new Error(isFunction(errMsg) ? errMsg(obj) : errMsg); + } + return result; + }; +} +/** + * Like _.pairs: Given an object, returns an array of key/value pairs + * + * @example + * ``` + * + * pairs({ foo: "FOO", bar: "BAR }) // [ [ "foo", "FOO" ], [ "bar": "BAR" ] ] + * ``` + */ +var pairs = function (obj) { + return Object.keys(obj).map(function (key) { return [key, obj[key]]; }); +}; +/** + * Given two or more parallel arrays, returns an array of tuples where + * each tuple is composed of [ a[i], b[i], ... z[i] ] + * + * @example + * ``` + * + * let foo = [ 0, 2, 4, 6 ]; + * let bar = [ 1, 3, 5, 7 ]; + * let baz = [ 10, 30, 50, 70 ]; + * arrayTuples(foo, bar); // [ [0, 1], [2, 3], [4, 5], [6, 7] ] + * arrayTuples(foo, bar, baz); // [ [0, 1, 10], [2, 3, 30], [4, 5, 50], [6, 7, 70] ] + * ``` + */ +function arrayTuples() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + if (args.length === 0) + return []; + var maxArrayLen = args.reduce(function (min, arr) { return Math.min(arr.length, min); }, 9007199254740991); // aka 2^53 − 1 aka Number.MAX_SAFE_INTEGER + var i, result = []; + for (i = 0; i < maxArrayLen; i++) { + // This is a hot function + // Unroll when there are 1-4 arguments + switch (args.length) { + case 1: + result.push([args[0][i]]); + break; + case 2: + result.push([args[0][i], args[1][i]]); + break; + case 3: + result.push([args[0][i], args[1][i], args[2][i]]); + break; + case 4: + result.push([args[0][i], args[1][i], args[2][i], args[3][i]]); + break; + default: + result.push(args.map(function (array) { return array[i]; })); + break; + } + } + return result; +} +/** + * Reduce function which builds an object from an array of [key, value] pairs. + * + * Each iteration sets the key/val pair on the memo object, then returns the memo for the next iteration. + * + * Each keyValueTuple should be an array with values [ key: string, value: any ] + * + * @example + * ``` + * + * var pairs = [ ["fookey", "fooval"], ["barkey", "barval"] ] + * + * var pairsToObj = pairs.reduce((memo, pair) => applyPairs(memo, pair), {}) + * // pairsToObj == { fookey: "fooval", barkey: "barval" } + * + * // Or, more simply: + * var pairsToObj = pairs.reduce(applyPairs, {}) + * // pairsToObj == { fookey: "fooval", barkey: "barval" } + * ``` + */ +function applyPairs(memo, keyValTuple) { + var key, value; + if (isArray(keyValTuple)) + key = keyValTuple[0], value = keyValTuple[1]; + if (!isString(key)) + throw new Error("invalid parameters to applyPairs"); + memo[key] = value; + return memo; +} +/** Get the last element of an array */ +function tail(arr) { + return arr.length && arr[arr.length - 1] || undefined; +} +/** + * shallow copy from src to dest + */ +function copy(src, dest) { + if (dest) + Object.keys(dest).forEach(function (key) { return delete dest[key]; }); + if (!dest) + dest = {}; + return extend(dest, src); +} +/** Naive forEach implementation works with Objects or Arrays */ +function _forEach(obj, cb, _this) { + if (isArray(obj)) + return obj.forEach(cb, _this); + Object.keys(obj).forEach(function (key) { return cb(obj[key], key); }); +} +function _extend(toObj) { + for (var i = 1; i < arguments.length; i++) { + var obj = arguments[i]; + if (!obj) + continue; + var keys = Object.keys(obj); + for (var j = 0; j < keys.length; j++) { + toObj[keys[j]] = obj[keys[j]]; + } + } + return toObj; +} +function _equals(o1, o2) { + if (o1 === o2) + return true; + if (o1 === null || o2 === null) + return false; + if (o1 !== o1 && o2 !== o2) + return true; // NaN === NaN + var t1 = typeof o1, t2 = typeof o2; + if (t1 !== t2 || t1 !== 'object') + return false; + var tup = [o1, o2]; + if (all(isArray)(tup)) + return _arraysEq(o1, o2); + if (all(isDate)(tup)) + return o1.getTime() === o2.getTime(); + if (all(isRegExp)(tup)) + return o1.toString() === o2.toString(); + if (all(isFunction)(tup)) + return true; // meh + var predicates = [isFunction, isArray, isDate, isRegExp]; + if (predicates.map(any).reduce(function (b, fn) { return b || !!fn(tup); }, false)) + return false; + var key, keys = {}; + for (key in o1) { + if (!_equals(o1[key], o2[key])) + return false; + keys[key] = true; + } + for (key in o2) { + if (!keys[key]) + return false; + } + return true; +} +function _arraysEq(a1, a2) { + if (a1.length !== a2.length) + return false; + return arrayTuples(a1, a2).reduce(function (b, t) { return b && _equals(t[0], t[1]); }, true); +} +// issue #2676 +var silenceUncaughtInPromise = function (promise) { + return promise.catch(function (e) { return 0; }) && promise; +}; +var silentRejection = function (error) { + return silenceUncaughtInPromise(services.$q.reject(error)); +}; + +/** + * @module common + */ /** for typedoc */ +var Queue = /** @class */ (function () { + function Queue(_items, _limit) { + if (_items === void 0) { _items = []; } + if (_limit === void 0) { _limit = null; } + this._items = _items; + this._limit = _limit; + } + Queue.prototype.enqueue = function (item) { + var items = this._items; + items.push(item); + if (this._limit && items.length > this._limit) + items.shift(); + return item; + }; + Queue.prototype.dequeue = function () { + if (this.size()) + return this._items.splice(0, 1)[0]; + }; + Queue.prototype.clear = function () { + var current = this._items; + this._items = []; + return current; + }; + Queue.prototype.size = function () { + return this._items.length; + }; + Queue.prototype.remove = function (item) { + var idx = this._items.indexOf(item); + return idx > -1 && this._items.splice(idx, 1)[0]; + }; + Queue.prototype.peekTail = function () { + return this._items[this._items.length - 1]; + }; + Queue.prototype.peekHead = function () { + if (this.size()) + return this._items[0]; + }; + return Queue; +}()); + +/** + * @coreapi + * @module transition + */ /** for typedoc */ +"use strict"; + +(function (RejectType) { + RejectType[RejectType["SUPERSEDED"] = 2] = "SUPERSEDED"; + RejectType[RejectType["ABORTED"] = 3] = "ABORTED"; + RejectType[RejectType["INVALID"] = 4] = "INVALID"; + RejectType[RejectType["IGNORED"] = 5] = "IGNORED"; + RejectType[RejectType["ERROR"] = 6] = "ERROR"; +})(exports.RejectType || (exports.RejectType = {})); +/** @hidden */ var id = 0; +var Rejection = /** @class */ (function () { + function Rejection(type, message, detail) { + this.$id = id++; + this.type = type; + this.message = message; + this.detail = detail; + } + Rejection.prototype.toString = function () { + var detailString = function (d) { + return d && d.toString !== Object.prototype.toString ? d.toString() : stringify(d); + }; + var detail = detailString(this.detail); + var _a = this, $id = _a.$id, type = _a.type, message = _a.message; + return "Transition Rejection($id: " + $id + " type: " + type + ", message: " + message + ", detail: " + detail + ")"; + }; + Rejection.prototype.toPromise = function () { + return extend(silentRejection(this), { _transitionRejection: this }); + }; + /** Returns true if the obj is a rejected promise created from the `asPromise` factory */ + Rejection.isRejectionPromise = function (obj) { + return obj && (typeof obj.then === 'function') && is(Rejection)(obj._transitionRejection); + }; + /** Returns a Rejection due to transition superseded */ + Rejection.superseded = function (detail, options) { + var message = "The transition has been superseded by a different transition"; + var rejection = new Rejection(exports.RejectType.SUPERSEDED, message, detail); + if (options && options.redirected) { + rejection.redirected = true; + } + return rejection; + }; + /** Returns a Rejection due to redirected transition */ + Rejection.redirected = function (detail) { + return Rejection.superseded(detail, { redirected: true }); + }; + /** Returns a Rejection due to invalid transition */ + Rejection.invalid = function (detail) { + var message = "This transition is invalid"; + return new Rejection(exports.RejectType.INVALID, message, detail); + }; + /** Returns a Rejection due to ignored transition */ + Rejection.ignored = function (detail) { + var message = "The transition was ignored"; + return new Rejection(exports.RejectType.IGNORED, message, detail); + }; + /** Returns a Rejection due to aborted transition */ + Rejection.aborted = function (detail) { + var message = "The transition has been aborted"; + return new Rejection(exports.RejectType.ABORTED, message, detail); + }; + /** Returns a Rejection due to aborted transition */ + Rejection.errored = function (detail) { + var message = "The transition errored"; + return new Rejection(exports.RejectType.ERROR, message, detail); + }; + /** + * Returns a Rejection + * + * Normalizes a value as a Rejection. + * If the value is already a Rejection, returns it. + * Otherwise, wraps and returns the value as a Rejection (Rejection type: ERROR). + * + * @returns `detail` if it is already a `Rejection`, else returns an ERROR Rejection. + */ + Rejection.normalize = function (detail) { + return is(Rejection)(detail) ? detail : Rejection.errored(detail); + }; + return Rejection; +}()); + +/** + * # Transition tracing (debug) + * + * Enable transition tracing to print transition information to the console, + * in order to help debug your application. + * Tracing logs detailed information about each Transition to your console. + * + * To enable tracing, import the [[Trace]] singleton and enable one or more categories. + * + * ### ES6 + * ```js + * import {trace} from "ui-router-ng2"; // or "angular-ui-router" + * trace.enable(1, 5); // TRANSITION and VIEWCONFIG + * ``` + * + * ### CJS + * ```js + * let trace = require("angular-ui-router").trace; // or "ui-router-ng2" + * trace.enable("TRANSITION", "VIEWCONFIG"); + * ``` + * + * ### Globals + * ```js + * let trace = window["angular-ui-router"].trace; // or "ui-router-ng2" + * trace.enable(); // Trace everything (very verbose) + * ``` + * + * ### Angular 1: + * ```js + * app.run($trace => $trace.enable()); + * ``` + * + * @coreapi + * @module trace + */ /** for typedoc */ +/** @hidden */ +function uiViewString(uiview) { + if (!uiview) + return 'ui-view (defunct)'; + var state = uiview.creationContext ? uiview.creationContext.name || '(root)' : '(none)'; + return "[ui-view#" + uiview.id + " " + uiview.$type + ":" + uiview.fqn + " (" + uiview.name + "@" + state + ")]"; +} +/** @hidden */ +var viewConfigString = function (viewConfig) { + var view = viewConfig.viewDecl; + var state = view.$context.name || '(root)'; + return "[View#" + viewConfig.$id + " from '" + state + "' state]: target ui-view: '" + view.$uiViewName + "@" + view.$uiViewContextAnchor + "'"; +}; +/** @hidden */ +function normalizedCat(input) { + return isNumber(input) ? exports.Category[input] : exports.Category[exports.Category[input]]; +} +/** @hidden */ +var consoleLog = Function.prototype.bind.call(console.log, console); +/** @hidden */ +var consoletable = isFunction(console.table) ? console.table.bind(console) : consoleLog.bind(console); +/** + * Trace categories Enum + * + * Enable or disable a category using [[Trace.enable]] or [[Trace.disable]] + * + * `trace.enable(Category.TRANSITION)` + * + * These can also be provided using a matching string, or position ordinal + * + * `trace.enable("TRANSITION")` + * + * `trace.enable(1)` + */ + +(function (Category) { + Category[Category["RESOLVE"] = 0] = "RESOLVE"; + Category[Category["TRANSITION"] = 1] = "TRANSITION"; + Category[Category["HOOK"] = 2] = "HOOK"; + Category[Category["UIVIEW"] = 3] = "UIVIEW"; + Category[Category["VIEWCONFIG"] = 4] = "VIEWCONFIG"; +})(exports.Category || (exports.Category = {})); +/** @hidden */ var _tid = parse("$id"); +/** @hidden */ var _rid = parse("router.$id"); +/** @hidden */ var transLbl = function (trans) { return "Transition #" + _tid(trans) + "-" + _rid(trans); }; +/** + * Prints UI-Router Transition trace information to the console. + */ +var Trace = /** @class */ (function () { + /** @hidden */ + function Trace() { + /** @hidden */ + this._enabled = {}; + this.approximateDigests = 0; + } + /** @hidden */ + Trace.prototype._set = function (enabled, categories) { + var _this = this; + if (!categories.length) { + categories = Object.keys(exports.Category) + .map(function (k) { return parseInt(k, 10); }) + .filter(function (k) { return !isNaN(k); }) + .map(function (key) { return exports.Category[key]; }); + } + categories.map(normalizedCat).forEach(function (category) { return _this._enabled[category] = enabled; }); + }; + Trace.prototype.enable = function () { + var categories = []; + for (var _i = 0; _i < arguments.length; _i++) { + categories[_i] = arguments[_i]; + } + this._set(true, categories); + }; + Trace.prototype.disable = function () { + var categories = []; + for (var _i = 0; _i < arguments.length; _i++) { + categories[_i] = arguments[_i]; + } + this._set(false, categories); + }; + /** + * Retrieves the enabled stateus of a [[Category]] + * + * ```js + * trace.enabled("VIEWCONFIG"); // true or false + * ``` + * + * @returns boolean true if the category is enabled + */ + Trace.prototype.enabled = function (category) { + return !!this._enabled[normalizedCat(category)]; + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceTransitionStart = function (trans) { + if (!this.enabled(exports.Category.TRANSITION)) + return; + console.log(transLbl(trans) + ": Started -> " + stringify(trans)); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceTransitionIgnored = function (trans) { + if (!this.enabled(exports.Category.TRANSITION)) + return; + console.log(transLbl(trans) + ": Ignored <> " + stringify(trans)); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceHookInvocation = function (step, trans, options) { + if (!this.enabled(exports.Category.HOOK)) + return; + var event = parse("traceData.hookType")(options) || "internal", context = parse("traceData.context.state.name")(options) || parse("traceData.context")(options) || "unknown", name = functionToString(step.registeredHook.callback); + console.log(transLbl(trans) + ": Hook -> " + event + " context: " + context + ", " + maxLength(200, name)); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceHookResult = function (hookResult, trans, transitionOptions) { + if (!this.enabled(exports.Category.HOOK)) + return; + console.log(transLbl(trans) + ": <- Hook returned: " + maxLength(200, stringify(hookResult))); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceResolvePath = function (path, when, trans) { + if (!this.enabled(exports.Category.RESOLVE)) + return; + console.log(transLbl(trans) + ": Resolving " + path + " (" + when + ")"); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceResolvableResolved = function (resolvable, trans) { + if (!this.enabled(exports.Category.RESOLVE)) + return; + console.log(transLbl(trans) + ": <- Resolved " + resolvable + " to: " + maxLength(200, stringify(resolvable.data))); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceError = function (reason, trans) { + if (!this.enabled(exports.Category.TRANSITION)) + return; + console.log(transLbl(trans) + ": <- Rejected " + stringify(trans) + ", reason: " + reason); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceSuccess = function (finalState, trans) { + if (!this.enabled(exports.Category.TRANSITION)) + return; + console.log(transLbl(trans) + ": <- Success " + stringify(trans) + ", final state: " + finalState.name); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceUIViewEvent = function (event, viewData, extra) { + if (extra === void 0) { extra = ""; } + if (!this.enabled(exports.Category.UIVIEW)) + return; + console.log("ui-view: " + padString(30, event) + " " + uiViewString(viewData) + extra); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceUIViewConfigUpdated = function (viewData, context) { + if (!this.enabled(exports.Category.UIVIEW)) + return; + this.traceUIViewEvent("Updating", viewData, " with ViewConfig from context='" + context + "'"); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceUIViewFill = function (viewData, html) { + if (!this.enabled(exports.Category.UIVIEW)) + return; + this.traceUIViewEvent("Fill", viewData, " with: " + maxLength(200, html)); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceViewSync = function (pairs) { + if (!this.enabled(exports.Category.VIEWCONFIG)) + return; + var mapping = pairs.map(function (_a) { + var uiViewData = _a[0], config = _a[1]; + var uiView = uiViewData.$type + ":" + uiViewData.fqn; + var view = config && config.viewDecl.$context.name + ": " + config.viewDecl.$name + " (" + config.viewDecl.$type + ")"; + return { 'ui-view fqn': uiView, 'state: view name': view }; + }).sort(function (a, b) { return a['ui-view fqn'].localeCompare(b['ui-view fqn']); }); + consoletable(mapping); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceViewServiceEvent = function (event, viewConfig) { + if (!this.enabled(exports.Category.VIEWCONFIG)) + return; + console.log("VIEWCONFIG: " + event + " " + viewConfigString(viewConfig)); + }; + /** @internalapi called by ui-router code */ + Trace.prototype.traceViewServiceUIViewEvent = function (event, viewData) { + if (!this.enabled(exports.Category.VIEWCONFIG)) + return; + console.log("VIEWCONFIG: " + event + " " + uiViewString(viewData)); + }; + return Trace; +}()); +/** + * The [[Trace]] singleton + * + * #### Example: + * ```js + * import {trace} from "angular-ui-router"; + * trace.enable(1, 5); + * ``` + */ +var trace = new Trace(); + +(function (TransitionHookPhase) { + TransitionHookPhase[TransitionHookPhase["CREATE"] = 0] = "CREATE"; + TransitionHookPhase[TransitionHookPhase["BEFORE"] = 1] = "BEFORE"; + TransitionHookPhase[TransitionHookPhase["RUN"] = 2] = "RUN"; + TransitionHookPhase[TransitionHookPhase["SUCCESS"] = 3] = "SUCCESS"; + TransitionHookPhase[TransitionHookPhase["ERROR"] = 4] = "ERROR"; +})(exports.TransitionHookPhase || (exports.TransitionHookPhase = {})); + +(function (TransitionHookScope) { + TransitionHookScope[TransitionHookScope["TRANSITION"] = 0] = "TRANSITION"; + TransitionHookScope[TransitionHookScope["STATE"] = 1] = "STATE"; +})(exports.TransitionHookScope || (exports.TransitionHookScope = {})); + +/** + * @coreapi + * @module state + */ /** for typedoc */ +/** + * Encapsulate the target (destination) state/params/options of a [[Transition]]. + * + * This class is frequently used to redirect a transition to a new destination. + * + * See: + * + * - [[HookResult]] + * - [[TransitionHookFn]] + * - [[TransitionService.onStart]] + * + * To create a `TargetState`, use [[StateService.target]]. + * + * --- + * + * This class wraps: + * + * 1) an identifier for a state + * 2) a set of parameters + * 3) and transition options + * 4) the registered state object (the [[StateDeclaration]]) + * + * Many UI-Router APIs such as [[StateService.go]] take a [[StateOrName]] argument which can + * either be a *state object* (a [[StateDeclaration]] or [[StateObject]]) or a *state name* (a string). + * The `TargetState` class normalizes those options. + * + * A `TargetState` may be valid (the state being targeted exists in the registry) + * or invalid (the state being targeted is not registered). + */ +var TargetState = /** @class */ (function () { + /** + * The TargetState constructor + * + * Note: Do not construct a `TargetState` manually. + * To create a `TargetState`, use the [[StateService.target]] factory method. + * + * @param _stateRegistry The StateRegistry to use to look up the _definition + * @param _identifier An identifier for a state. + * Either a fully-qualified state name, or the object used to define the state. + * @param _params Parameters for the target state + * @param _options Transition options. + * + * @internalapi + */ + function TargetState(_stateRegistry, _identifier, _params, _options) { + this._stateRegistry = _stateRegistry; + this._identifier = _identifier; + this._identifier = _identifier; + this._params = extend({}, _params || {}); + this._options = extend({}, _options || {}); + this._definition = _stateRegistry.matcher.find(_identifier, this._options.relative); + } + /** The name of the state this object targets */ + TargetState.prototype.name = function () { + return this._definition && this._definition.name || this._identifier; + }; + /** The identifier used when creating this TargetState */ + TargetState.prototype.identifier = function () { + return this._identifier; + }; + /** The target parameter values */ + TargetState.prototype.params = function () { + return this._params; + }; + /** The internal state object (if it was found) */ + TargetState.prototype.$state = function () { + return this._definition; + }; + /** The internal state declaration (if it was found) */ + TargetState.prototype.state = function () { + return this._definition && this._definition.self; + }; + /** The target options */ + TargetState.prototype.options = function () { + return this._options; + }; + /** True if the target state was found */ + TargetState.prototype.exists = function () { + return !!(this._definition && this._definition.self); + }; + /** True if the object is valid */ + TargetState.prototype.valid = function () { + return !this.error(); + }; + /** If the object is invalid, returns the reason why */ + TargetState.prototype.error = function () { + var base = this.options().relative; + if (!this._definition && !!base) { + var stateName = base.name ? base.name : base; + return "Could not resolve '" + this.name() + "' from state '" + stateName + "'"; + } + if (!this._definition) + return "No such state '" + this.name() + "'"; + if (!this._definition.self) + return "State '" + this.name() + "' has an invalid definition"; + }; + TargetState.prototype.toString = function () { + return "'" + this.name() + "'" + stringify(this.params()); + }; + /** + * Returns a copy of this TargetState which targets a different state. + * The new TargetState has the same parameter values and transition options. + * + * @param state The new state that should be targeted + */ + TargetState.prototype.withState = function (state) { + return new TargetState(this._stateRegistry, state, this._params, this._options); + }; + /** + * Returns a copy of this TargetState, using the specified parameter values. + * + * @param params the new parameter values to use + * @param replace When false (default) the new parameter values will be merged with the current values. + * When true the parameter values will be used instead of the current values. + */ + TargetState.prototype.withParams = function (params, replace) { + if (replace === void 0) { replace = false; } + var newParams = replace ? params : extend({}, this._params, params); + return new TargetState(this._stateRegistry, this._identifier, newParams, this._options); + }; + /** + * Returns a copy of this TargetState, using the specified Transition Options. + * + * @param options the new options to use + * @param replace When false (default) the new options will be merged with the current options. + * When true the options will be used instead of the current options. + */ + TargetState.prototype.withOptions = function (options, replace) { + if (replace === void 0) { replace = false; } + var newOpts = replace ? options : extend({}, this._options, options); + return new TargetState(this._stateRegistry, this._identifier, this._params, newOpts); + }; + /** Returns true if the object has a state property that might be a state or state name */ + TargetState.isDef = function (obj) { + return obj && obj.state && (isString(obj.state) || isString(obj.state.name)); + }; + return TargetState; +}()); + +/** + * @coreapi + * @module transition + */ +/** for typedoc */ +var defaultOptions = { + current: noop$1, + transition: null, + traceData: {}, + bind: null, +}; +/** @hidden */ +var TransitionHook = /** @class */ (function () { + function TransitionHook(transition, stateContext, registeredHook, options) { + var _this = this; + this.transition = transition; + this.stateContext = stateContext; + this.registeredHook = registeredHook; + this.options = options; + this.isSuperseded = function () { + return _this.type.hookPhase === exports.TransitionHookPhase.RUN && !_this.options.transition.isActive(); + }; + this.options = defaults(options, defaultOptions); + this.type = registeredHook.eventType; + } + TransitionHook.prototype.logError = function (err) { + this.transition.router.stateService.defaultErrorHandler()(err); + }; + TransitionHook.prototype.invokeHook = function () { + var _this = this; + var hook = this.registeredHook; + if (hook._deregistered) + return; + var notCurrent = this.getNotCurrentRejection(); + if (notCurrent) + return notCurrent; + var options = this.options; + trace.traceHookInvocation(this, this.transition, options); + var invokeCallback = function () { + return hook.callback.call(options.bind, _this.transition, _this.stateContext); + }; + var normalizeErr = function (err) { + return Rejection.normalize(err).toPromise(); + }; + var handleError = function (err) { + return hook.eventType.getErrorHandler(_this)(err); + }; + var handleResult = function (result) { + return hook.eventType.getResultHandler(_this)(result); + }; + try { + var result = invokeCallback(); + if (!this.type.synchronous && isPromise(result)) { + return result.catch(normalizeErr) + .then(handleResult, handleError); + } + else { + return handleResult(result); + } + } + catch (err) { + // If callback throws (synchronously) + return handleError(Rejection.normalize(err)); + } + finally { + if (hook.invokeLimit && ++hook.invokeCount >= hook.invokeLimit) { + hook.deregister(); + } + } + }; + /** + * This method handles the return value of a Transition Hook. + * + * A hook can return false (cancel), a TargetState (redirect), + * or a promise (which may later resolve to false or a redirect) + * + * This also handles "transition superseded" -- when a new transition + * was started while the hook was still running + */ + TransitionHook.prototype.handleHookResult = function (result) { + var _this = this; + var notCurrent = this.getNotCurrentRejection(); + if (notCurrent) + return notCurrent; + // Hook returned a promise + if (isPromise(result)) { + // Wait for the promise, then reprocess with the resulting value + return result.then(function (val$$1) { return _this.handleHookResult(val$$1); }); + } + trace.traceHookResult(result, this.transition, this.options); + // Hook returned false + if (result === false) { + // Abort this Transition + return Rejection.aborted("Hook aborted transition").toPromise(); + } + var isTargetState = is(TargetState); + // hook returned a TargetState + if (isTargetState(result)) { + // Halt the current Transition and redirect (a new Transition) to the TargetState. + return Rejection.redirected(result).toPromise(); + } + }; + /** + * Return a Rejection promise if the transition is no longer current due + * to a stopped router (disposed), or a new transition has started and superseded this one. + */ + TransitionHook.prototype.getNotCurrentRejection = function () { + var router = this.transition.router; + // The router is stopped + if (router._disposed) { + return Rejection.aborted("UIRouter instance #" + router.$id + " has been stopped (disposed)").toPromise(); + } + if (this.transition._aborted) { + return Rejection.aborted().toPromise(); + } + // This transition is no longer current. + // Another transition started while this hook was still running. + if (this.isSuperseded()) { + // Abort this transition + return Rejection.superseded(this.options.current()).toPromise(); + } + }; + TransitionHook.prototype.toString = function () { + var _a = this, options = _a.options, registeredHook = _a.registeredHook; + var event = parse("traceData.hookType")(options) || "internal", context = parse("traceData.context.state.name")(options) || parse("traceData.context")(options) || "unknown", name = fnToString(registeredHook.callback); + return event + " context: " + context + ", " + maxLength(200, name); + }; + /** + * Chains together an array of TransitionHooks. + * + * Given a list of [[TransitionHook]] objects, chains them together. + * Each hook is invoked after the previous one completes. + * + * #### Example: + * ```js + * var hooks: TransitionHook[] = getHooks(); + * let promise: Promise = TransitionHook.chain(hooks); + * + * promise.then(handleSuccess, handleError); + * ``` + * + * @param hooks the list of hooks to chain together + * @param waitFor if provided, the chain is `.then()`'ed off this promise + * @returns a `Promise` for sequentially invoking the hooks (in order) + */ + TransitionHook.chain = function (hooks, waitFor) { + // Chain the next hook off the previous + var createHookChainR = function (prev, nextHook) { + return prev.then(function () { return nextHook.invokeHook(); }); + }; + return hooks.reduce(createHookChainR, waitFor || services.$q.when()); + }; + /** + * Invokes all the provided TransitionHooks, in order. + * Each hook's return value is checked. + * If any hook returns a promise, then the rest of the hooks are chained off that promise, and the promise is returned. + * If no hook returns a promise, then all hooks are processed synchronously. + * + * @param hooks the list of TransitionHooks to invoke + * @param doneCallback a callback that is invoked after all the hooks have successfully completed + * + * @returns a promise for the async result, or the result of the callback + */ + TransitionHook.invokeHooks = function (hooks, doneCallback) { + for (var idx = 0; idx < hooks.length; idx++) { + var hookResult = hooks[idx].invokeHook(); + if (isPromise(hookResult)) { + var remainingHooks = hooks.slice(idx + 1); + return TransitionHook.chain(remainingHooks, hookResult) + .then(doneCallback); + } + } + return doneCallback(); + }; + /** + * Run all TransitionHooks, ignoring their return value. + */ + TransitionHook.runAllHooks = function (hooks) { + hooks.forEach(function (hook) { return hook.invokeHook(); }); + }; + /** + * These GetResultHandler(s) are used by [[invokeHook]] below + * Each HookType chooses a GetResultHandler (See: [[TransitionService._defineCoreEvents]]) + */ + TransitionHook.HANDLE_RESULT = function (hook) { return function (result) { + return hook.handleHookResult(result); + }; }; + /** + * If the result is a promise rejection, log it. + * Otherwise, ignore the result. + */ + TransitionHook.LOG_REJECTED_RESULT = function (hook) { return function (result) { + isPromise(result) && result.catch(function (err) { + return hook.logError(Rejection.normalize(err)); + }); + return undefined; + }; }; + /** + * These GetErrorHandler(s) are used by [[invokeHook]] below + * Each HookType chooses a GetErrorHandler (See: [[TransitionService._defineCoreEvents]]) + */ + TransitionHook.LOG_ERROR = function (hook) { return function (error) { + return hook.logError(error); + }; }; + TransitionHook.REJECT_ERROR = function (hook) { return function (error) { + return silentRejection(error); + }; }; + TransitionHook.THROW_ERROR = function (hook) { return function (error) { + throw error; + }; }; + return TransitionHook; +}()); + +/** + * @coreapi + * @module transition + */ /** for typedoc */ +/** + * Determines if the given state matches the matchCriteria + * + * @hidden + * + * @param state a State Object to test against + * @param criterion + * - If a string, matchState uses the string as a glob-matcher against the state name + * - If an array (of strings), matchState uses each string in the array as a glob-matchers against the state name + * and returns a positive match if any of the globs match. + * - If a function, matchState calls the function with the state and returns true if the function's result is truthy. + * @returns {boolean} + */ +function matchState(state, criterion) { + var toMatch = isString(criterion) ? [criterion] : criterion; + function matchGlobs(_state) { + var globStrings = toMatch; + for (var i = 0; i < globStrings.length; i++) { + var glob = new Glob(globStrings[i]); + if ((glob && glob.matches(_state.name)) || (!glob && globStrings[i] === _state.name)) { + return true; + } + } + return false; + } + var matchFn = (isFunction(toMatch) ? toMatch : matchGlobs); + return !!matchFn(state); +} +/** + * @internalapi + * The registration data for a registered transition hook + */ +var RegisteredHook = /** @class */ (function () { + function RegisteredHook(tranSvc, eventType, callback, matchCriteria, removeHookFromRegistry, options) { + if (options === void 0) { options = {}; } + this.tranSvc = tranSvc; + this.eventType = eventType; + this.callback = callback; + this.matchCriteria = matchCriteria; + this.removeHookFromRegistry = removeHookFromRegistry; + this.invokeCount = 0; + this._deregistered = false; + this.priority = options.priority || 0; + this.bind = options.bind || null; + this.invokeLimit = options.invokeLimit; + } + /** + * Gets the matching [[PathNode]]s + * + * Given an array of [[PathNode]]s, and a [[HookMatchCriterion]], returns an array containing + * the [[PathNode]]s that the criteria matches, or `null` if there were no matching nodes. + * + * Returning `null` is significant to distinguish between the default + * "match-all criterion value" of `true` compared to a `() => true` function, + * when the nodes is an empty array. + * + * This is useful to allow a transition match criteria of `entering: true` + * to still match a transition, even when `entering === []`. Contrast that + * with `entering: (state) => true` which only matches when a state is actually + * being entered. + */ + RegisteredHook.prototype._matchingNodes = function (nodes, criterion) { + if (criterion === true) + return nodes; + var matching = nodes.filter(function (node) { return matchState(node.state, criterion); }); + return matching.length ? matching : null; + }; + /** + * Gets the default match criteria (all `true`) + * + * Returns an object which has all the criteria match paths as keys and `true` as values, i.e.: + * + * ```js + * { + * to: true, + * from: true, + * entering: true, + * exiting: true, + * retained: true, + * } + */ + RegisteredHook.prototype._getDefaultMatchCriteria = function () { + return map(this.tranSvc._pluginapi._getPathTypes(), function () { return true; }); + }; + /** + * Gets matching nodes as [[IMatchingNodes]] + * + * Create a IMatchingNodes object from the TransitionHookTypes that is roughly equivalent to: + * + * ```js + * let matches: IMatchingNodes = { + * to: _matchingNodes([tail(treeChanges.to)], mc.to), + * from: _matchingNodes([tail(treeChanges.from)], mc.from), + * exiting: _matchingNodes(treeChanges.exiting, mc.exiting), + * retained: _matchingNodes(treeChanges.retained, mc.retained), + * entering: _matchingNodes(treeChanges.entering, mc.entering), + * }; + * ``` + */ + RegisteredHook.prototype._getMatchingNodes = function (treeChanges) { + var _this = this; + var criteria = extend(this._getDefaultMatchCriteria(), this.matchCriteria); + var paths = values(this.tranSvc._pluginapi._getPathTypes()); + return paths.reduce(function (mn, pathtype) { + // STATE scope criteria matches against every node in the path. + // TRANSITION scope criteria matches against only the last node in the path + var isStateHook = pathtype.scope === exports.TransitionHookScope.STATE; + var path = treeChanges[pathtype.name] || []; + var nodes = isStateHook ? path : [tail(path)]; + mn[pathtype.name] = _this._matchingNodes(nodes, criteria[pathtype.name]); + return mn; + }, {}); + }; + /** + * Determines if this hook's [[matchCriteria]] match the given [[TreeChanges]] + * + * @returns an IMatchingNodes object, or null. If an IMatchingNodes object is returned, its values + * are the matching [[PathNode]]s for each [[HookMatchCriterion]] (to, from, exiting, retained, entering) + */ + RegisteredHook.prototype.matches = function (treeChanges) { + var matches = this._getMatchingNodes(treeChanges); + // Check if all the criteria matched the TreeChanges object + var allMatched = values(matches).every(identity); + return allMatched ? matches : null; + }; + RegisteredHook.prototype.deregister = function () { + this.removeHookFromRegistry(this); + this._deregistered = true; + }; + return RegisteredHook; +}()); +/** @hidden Return a registration function of the requested type. */ +function makeEvent(registry, transitionService, eventType) { + // Create the object which holds the registered transition hooks. + var _registeredHooks = registry._registeredHooks = (registry._registeredHooks || {}); + var hooks = _registeredHooks[eventType.name] = []; + var removeHookFn = removeFrom(hooks); + // Create hook registration function on the IHookRegistry for the event + registry[eventType.name] = hookRegistrationFn; + function hookRegistrationFn(matchObject, callback, options) { + if (options === void 0) { options = {}; } + var registeredHook = new RegisteredHook(transitionService, eventType, callback, matchObject, removeHookFn, options); + hooks.push(registeredHook); + return registeredHook.deregister.bind(registeredHook); + } + return hookRegistrationFn; +} + +/** + * @coreapi + * @module transition + */ /** for typedoc */ +/** + * This class returns applicable TransitionHooks for a specific Transition instance. + * + * Hooks ([[RegisteredHook]]) may be registered globally, e.g., $transitions.onEnter(...), or locally, e.g. + * myTransition.onEnter(...). The HookBuilder finds matching RegisteredHooks (where the match criteria is + * determined by the type of hook) + * + * The HookBuilder also converts RegisteredHooks objects to TransitionHook objects, which are used to run a Transition. + * + * The HookBuilder constructor is given the $transitions service and a Transition instance. Thus, a HookBuilder + * instance may only be used for one specific Transition object. (side note: the _treeChanges accessor is private + * in the Transition class, so we must also provide the Transition's _treeChanges) + * + */ +var HookBuilder = /** @class */ (function () { + function HookBuilder(transition) { + this.transition = transition; + } + HookBuilder.prototype.buildHooksForPhase = function (phase) { + var _this = this; + var $transitions = this.transition.router.transitionService; + return $transitions._pluginapi._getEvents(phase) + .map(function (type) { return _this.buildHooks(type); }) + .reduce(unnestR, []) + .filter(identity); + }; + /** + * Returns an array of newly built TransitionHook objects. + * + * - Finds all RegisteredHooks registered for the given `hookType` which matched the transition's [[TreeChanges]]. + * - Finds [[PathNode]] (or `PathNode[]`) to use as the TransitionHook context(s) + * - For each of the [[PathNode]]s, creates a TransitionHook + * + * @param hookType the type of the hook registration function, e.g., 'onEnter', 'onFinish'. + */ + HookBuilder.prototype.buildHooks = function (hookType) { + var transition = this.transition; + var treeChanges = transition.treeChanges(); + // Find all the matching registered hooks for a given hook type + var matchingHooks = this.getMatchingHooks(hookType, treeChanges); + if (!matchingHooks) + return []; + var baseHookOptions = { + transition: transition, + current: transition.options().current + }; + var makeTransitionHooks = function (hook) { + // Fetch the Nodes that caused this hook to match. + var matches = hook.matches(treeChanges); + // Select the PathNode[] that will be used as TransitionHook context objects + var matchingNodes = matches[hookType.criteriaMatchPath.name]; + // Return an array of HookTuples + return matchingNodes.map(function (node) { + var _options = extend({ + bind: hook.bind, + traceData: { hookType: hookType.name, context: node } + }, baseHookOptions); + var state = hookType.criteriaMatchPath.scope === exports.TransitionHookScope.STATE ? node.state.self : null; + var transitionHook = new TransitionHook(transition, state, hook, _options); + return { hook: hook, node: node, transitionHook: transitionHook }; + }); + }; + return matchingHooks.map(makeTransitionHooks) + .reduce(unnestR, []) + .sort(tupleSort(hookType.reverseSort)) + .map(function (tuple) { return tuple.transitionHook; }); + }; + /** + * Finds all RegisteredHooks from: + * - The Transition object instance hook registry + * - The TransitionService ($transitions) global hook registry + * + * which matched: + * - the eventType + * - the matchCriteria (to, from, exiting, retained, entering) + * + * @returns an array of matched [[RegisteredHook]]s + */ + HookBuilder.prototype.getMatchingHooks = function (hookType, treeChanges) { + var isCreate = hookType.hookPhase === exports.TransitionHookPhase.CREATE; + // Instance and Global hook registries + var $transitions = this.transition.router.transitionService; + var registries = isCreate ? [$transitions] : [this.transition, $transitions]; + return registries.map(function (reg) { return reg.getHooks(hookType.name); }) // Get named hooks from registries + .filter(assertPredicate(isArray, "broken event named: " + hookType.name)) // Sanity check + .reduce(unnestR, []) // Un-nest RegisteredHook[][] to RegisteredHook[] array + .filter(function (hook) { return hook.matches(treeChanges); }); // Only those satisfying matchCriteria + }; + return HookBuilder; +}()); +/** + * A factory for a sort function for HookTuples. + * + * The sort function first compares the PathNode depth (how deep in the state tree a node is), then compares + * the EventHook priority. + * + * @param reverseDepthSort a boolean, when true, reverses the sort order for the node depth + * @returns a tuple sort function + */ +function tupleSort(reverseDepthSort) { + if (reverseDepthSort === void 0) { reverseDepthSort = false; } + return function nodeDepthThenPriority(l, r) { + var factor = reverseDepthSort ? -1 : 1; + var depthDelta = (l.node.state.path.length - r.node.state.path.length) * factor; + return depthDelta !== 0 ? depthDelta : r.hook.priority - l.hook.priority; + }; +} + +/** + * @coreapi + * @module params + */ +/** */ +/** + * An internal class which implements [[ParamTypeDefinition]]. + * + * A [[ParamTypeDefinition]] is a plain javascript object used to register custom parameter types. + * When a param type definition is registered, an instance of this class is created internally. + * + * This class has naive implementations for all the [[ParamTypeDefinition]] methods. + * + * Used by [[UrlMatcher]] when matching or formatting URLs, or comparing and validating parameter values. + * + * #### Example: + * ```js + * var paramTypeDef = { + * decode: function(val) { return parseInt(val, 10); }, + * encode: function(val) { return val && val.toString(); }, + * equals: function(a, b) { return this.is(a) && a === b; }, + * is: function(val) { return angular.isNumber(val) && isFinite(val) && val % 1 === 0; }, + * pattern: /\d+/ + * } + * + * var paramType = new ParamType(paramTypeDef); + * ``` + * @internalapi + */ +var ParamType = /** @class */ (function () { + /** + * @param def A configuration object which contains the custom type definition. The object's + * properties will override the default methods and/or pattern in `ParamType`'s public interface. + * @returns a new ParamType object + */ + function ParamType(def) { + /** @inheritdoc */ + this.pattern = /.*/; + /** @inheritdoc */ + this.inherit = true; + extend(this, def); + } + // consider these four methods to be "abstract methods" that should be overridden + /** @inheritdoc */ + ParamType.prototype.is = function (val, key) { return true; }; + /** @inheritdoc */ + ParamType.prototype.encode = function (val, key) { return val; }; + /** @inheritdoc */ + ParamType.prototype.decode = function (val, key) { return val; }; + /** @inheritdoc */ + ParamType.prototype.equals = function (a, b) { return a == b; }; + ParamType.prototype.$subPattern = function () { + var sub = this.pattern.toString(); + return sub.substr(1, sub.length - 2); + }; + ParamType.prototype.toString = function () { + return "{ParamType:" + this.name + "}"; + }; + /** Given an encoded string, or a decoded object, returns a decoded object */ + ParamType.prototype.$normalize = function (val) { + return this.is(val) ? val : this.decode(val); + }; + /** + * Wraps an existing custom ParamType as an array of ParamType, depending on 'mode'. + * e.g.: + * - urlmatcher pattern "/path?{queryParam[]:int}" + * - url: "/path?queryParam=1&queryParam=2 + * - $stateParams.queryParam will be [1, 2] + * if `mode` is "auto", then + * - url: "/path?queryParam=1 will create $stateParams.queryParam: 1 + * - url: "/path?queryParam=1&queryParam=2 will create $stateParams.queryParam: [1, 2] + */ + ParamType.prototype.$asArray = function (mode, isSearch) { + if (!mode) + return this; + if (mode === "auto" && !isSearch) + throw new Error("'auto' array mode is for query parameters only"); + return new ArrayType(this, mode); + }; + return ParamType; +}()); +/** + * Wraps up a `ParamType` object to handle array values. + * @internalapi + */ +function ArrayType(type, mode) { + var _this = this; + // Wrap non-array value as array + function arrayWrap(val) { + return isArray(val) ? val : (isDefined(val) ? [val] : []); + } + // Unwrap array value for "auto" mode. Return undefined for empty array. + function arrayUnwrap(val) { + switch (val.length) { + case 0: return undefined; + case 1: return mode === "auto" ? val[0] : val; + default: return val; + } + } + // Wraps type (.is/.encode/.decode) functions to operate on each value of an array + function arrayHandler(callback, allTruthyMode) { + return function handleArray(val) { + if (isArray(val) && val.length === 0) + return val; + var arr = arrayWrap(val); + var result = map(arr, callback); + return (allTruthyMode === true) ? filter(result, function (x) { return !x; }).length === 0 : arrayUnwrap(result); + }; + } + // Wraps type (.equals) functions to operate on each value of an array + function arrayEqualsHandler(callback) { + return function handleArray(val1, val2) { + var left = arrayWrap(val1), right = arrayWrap(val2); + if (left.length !== right.length) + return false; + for (var i = 0; i < left.length; i++) { + if (!callback(left[i], right[i])) + return false; + } + return true; + }; + } + ['encode', 'decode', 'equals', '$normalize'].forEach(function (name) { + var paramTypeFn = type[name].bind(type); + var wrapperFn = name === 'equals' ? arrayEqualsHandler : arrayHandler; + _this[name] = wrapperFn(paramTypeFn); + }); + extend(this, { + dynamic: type.dynamic, + name: type.name, + pattern: type.pattern, + inherit: type.inherit, + is: arrayHandler(type.is.bind(type), true), + $arrayMode: mode + }); +} + +/** + * @coreapi + * @module params + */ /** for typedoc */ +/** @hidden */ var hasOwn = Object.prototype.hasOwnProperty; +/** @hidden */ var isShorthand = function (cfg) { + return ["value", "type", "squash", "array", "dynamic"].filter(hasOwn.bind(cfg || {})).length === 0; +}; +/** @internalapi */ + +(function (DefType) { + DefType[DefType["PATH"] = 0] = "PATH"; + DefType[DefType["SEARCH"] = 1] = "SEARCH"; + DefType[DefType["CONFIG"] = 2] = "CONFIG"; +})(exports.DefType || (exports.DefType = {})); +/** @hidden */ +function unwrapShorthand(cfg) { + cfg = isShorthand(cfg) && { value: cfg } || cfg; + getStaticDefaultValue['__cacheable'] = true; + function getStaticDefaultValue() { + return cfg.value; + } + return extend(cfg, { + $$fn: isInjectable(cfg.value) ? cfg.value : getStaticDefaultValue, + }); +} +/** @hidden */ +function getType(cfg, urlType, location, id, paramTypes) { + if (cfg.type && urlType && urlType.name !== 'string') + throw new Error("Param '" + id + "' has two type configurations."); + if (cfg.type && urlType && urlType.name === 'string' && paramTypes.type(cfg.type)) + return paramTypes.type(cfg.type); + if (urlType) + return urlType; + if (!cfg.type) { + var type = location === exports.DefType.CONFIG ? "any" : + location === exports.DefType.PATH ? "path" : + location === exports.DefType.SEARCH ? "query" : "string"; + return paramTypes.type(type); + } + return cfg.type instanceof ParamType ? cfg.type : paramTypes.type(cfg.type); +} +/** + * @internalapi + * returns false, true, or the squash value to indicate the "default parameter url squash policy". + */ +function getSquashPolicy(config, isOptional, defaultPolicy) { + var squash = config.squash; + if (!isOptional || squash === false) + return false; + if (!isDefined(squash) || squash == null) + return defaultPolicy; + if (squash === true || isString(squash)) + return squash; + throw new Error("Invalid squash policy: '" + squash + "'. Valid policies: false, true, or arbitrary string"); +} +/** @internalapi */ +function getReplace(config, arrayMode, isOptional, squash) { + var replace, configuredKeys, defaultPolicy = [ + { from: "", to: (isOptional || arrayMode ? undefined : "") }, + { from: null, to: (isOptional || arrayMode ? undefined : "") }, + ]; + replace = isArray(config.replace) ? config.replace : []; + if (isString(squash)) + replace.push({ from: squash, to: undefined }); + configuredKeys = map(replace, prop("from")); + return filter(defaultPolicy, function (item) { return configuredKeys.indexOf(item.from) === -1; }).concat(replace); +} +/** @internalapi */ +var Param = /** @class */ (function () { + function Param(id, type, config, location, urlMatcherFactory) { + config = unwrapShorthand(config); + type = getType(config, type, location, id, urlMatcherFactory.paramTypes); + var arrayMode = getArrayMode(); + type = arrayMode ? type.$asArray(arrayMode, location === exports.DefType.SEARCH) : type; + var isOptional = config.value !== undefined || location === exports.DefType.SEARCH; + var dynamic = isDefined(config.dynamic) ? !!config.dynamic : !!type.dynamic; + var raw = isDefined(config.raw) ? !!config.raw : !!type.raw; + var squash = getSquashPolicy(config, isOptional, urlMatcherFactory.defaultSquashPolicy()); + var replace = getReplace(config, arrayMode, isOptional, squash); + var inherit$$1 = isDefined(config.inherit) ? !!config.inherit : !!type.inherit; + // array config: param name (param[]) overrides default settings. explicit config overrides param name. + function getArrayMode() { + var arrayDefaults = { array: (location === exports.DefType.SEARCH ? "auto" : false) }; + var arrayParamNomenclature = id.match(/\[\]$/) ? { array: true } : {}; + return extend(arrayDefaults, arrayParamNomenclature, config).array; + } + extend(this, { id: id, type: type, location: location, isOptional: isOptional, dynamic: dynamic, raw: raw, squash: squash, replace: replace, inherit: inherit$$1, array: arrayMode, config: config }); + } + Param.prototype.isDefaultValue = function (value) { + return this.isOptional && this.type.equals(this.value(), value); + }; + /** + * [Internal] Gets the decoded representation of a value if the value is defined, otherwise, returns the + * default value, which may be the result of an injectable function. + */ + Param.prototype.value = function (value) { + var _this = this; + /** + * [Internal] Get the default value of a parameter, which may be an injectable function. + */ + var getDefaultValue = function () { + if (_this._defaultValueCache) + return _this._defaultValueCache.defaultValue; + if (!services.$injector) + throw new Error("Injectable functions cannot be called at configuration time"); + var defaultValue = services.$injector.invoke(_this.config.$$fn); + if (defaultValue !== null && defaultValue !== undefined && !_this.type.is(defaultValue)) + throw new Error("Default value (" + defaultValue + ") for parameter '" + _this.id + "' is not an instance of ParamType (" + _this.type.name + ")"); + if (_this.config.$$fn['__cacheable']) { + _this._defaultValueCache = { defaultValue: defaultValue }; + } + return defaultValue; + }; + var replaceSpecialValues = function (val$$1) { + for (var _i = 0, _a = _this.replace; _i < _a.length; _i++) { + var tuple = _a[_i]; + if (tuple.from === val$$1) + return tuple.to; + } + return val$$1; + }; + value = replaceSpecialValues(value); + return isUndefined(value) ? getDefaultValue() : this.type.$normalize(value); + }; + Param.prototype.isSearch = function () { + return this.location === exports.DefType.SEARCH; + }; + Param.prototype.validates = function (value) { + // There was no parameter value, but the param is optional + if ((isUndefined(value) || value === null) && this.isOptional) + return true; + // The value was not of the correct ParamType, and could not be decoded to the correct ParamType + var normalized = this.type.$normalize(value); + if (!this.type.is(normalized)) + return false; + // The value was of the correct type, but when encoded, did not match the ParamType's regexp + var encoded = this.type.encode(normalized); + return !(isString(encoded) && !this.type.pattern.exec(encoded)); + }; + Param.prototype.toString = function () { + return "{Param:" + this.id + " " + this.type + " squash: '" + this.squash + "' optional: " + this.isOptional + "}"; + }; + Param.values = function (params, values$$1) { + if (values$$1 === void 0) { values$$1 = {}; } + var paramValues = {}; + for (var _i = 0, params_1 = params; _i < params_1.length; _i++) { + var param = params_1[_i]; + paramValues[param.id] = param.value(values$$1[param.id]); + } + return paramValues; + }; + /** + * Finds [[Param]] objects which have different param values + * + * Filters a list of [[Param]] objects to only those whose parameter values differ in two param value objects + * + * @param params: The list of Param objects to filter + * @param values1: The first set of parameter values + * @param values2: the second set of parameter values + * + * @returns any Param objects whose values were different between values1 and values2 + */ + Param.changed = function (params, values1, values2) { + if (values1 === void 0) { values1 = {}; } + if (values2 === void 0) { values2 = {}; } + return params.filter(function (param) { return !param.type.equals(values1[param.id], values2[param.id]); }); + }; + /** + * Checks if two param value objects are equal (for a set of [[Param]] objects) + * + * @param params The list of [[Param]] objects to check + * @param values1 The first set of param values + * @param values2 The second set of param values + * + * @returns true if the param values in values1 and values2 are equal + */ + Param.equals = function (params, values1, values2) { + if (values1 === void 0) { values1 = {}; } + if (values2 === void 0) { values2 = {}; } + return Param.changed(params, values1, values2).length === 0; + }; + /** Returns true if a the parameter values are valid, according to the Param definitions */ + Param.validates = function (params, values$$1) { + if (values$$1 === void 0) { values$$1 = {}; } + return params.map(function (param) { return param.validates(values$$1[param.id]); }).reduce(allTrueR, true); + }; + return Param; +}()); + +/** @module path */ /** for typedoc */ +/** + * @internalapi + * + * A node in a [[TreeChanges]] path + * + * For a [[TreeChanges]] path, this class holds the stateful information for a single node in the path. + * Each PathNode corresponds to a state being entered, exited, or retained. + * The stateful information includes parameter values and resolve data. + */ +var PathNode = /** @class */ (function () { + function PathNode(stateOrNode) { + if (stateOrNode instanceof PathNode) { + var node = stateOrNode; + this.state = node.state; + this.paramSchema = node.paramSchema.slice(); + this.paramValues = extend({}, node.paramValues); + this.resolvables = node.resolvables.slice(); + this.views = node.views && node.views.slice(); + } + else { + var state = stateOrNode; + this.state = state; + this.paramSchema = state.parameters({ inherit: false }); + this.paramValues = {}; + this.resolvables = state.resolvables.map(function (res) { return res.clone(); }); + } + } + /** Sets [[paramValues]] for the node, from the values of an object hash */ + PathNode.prototype.applyRawParams = function (params) { + var getParamVal = function (paramDef) { return [paramDef.id, paramDef.value(params[paramDef.id])]; }; + this.paramValues = this.paramSchema.reduce(function (memo, pDef) { return applyPairs(memo, getParamVal(pDef)); }, {}); + return this; + }; + /** Gets a specific [[Param]] metadata that belongs to the node */ + PathNode.prototype.parameter = function (name) { + return find(this.paramSchema, propEq("id", name)); + }; + /** + * @returns true if the state and parameter values for another PathNode are + * equal to the state and param values for this PathNode + */ + PathNode.prototype.equals = function (node, paramsFn) { + var diff = this.diff(node, paramsFn); + return diff && diff.length === 0; + }; + /** + * Finds Params with different parameter values on another PathNode. + * + * Given another node (of the same state), finds the parameter values which differ. + * Returns the [[Param]] (schema objects) whose parameter values differ. + * + * Given another node for a different state, returns `false` + * + * @param node The node to compare to + * @param paramsFn A function that returns which parameters should be compared. + * @returns The [[Param]]s which differ, or null if the two nodes are for different states + */ + PathNode.prototype.diff = function (node, paramsFn) { + if (this.state !== node.state) + return false; + var params = paramsFn ? paramsFn(this) : this.paramSchema; + return Param.changed(params, this.paramValues, node.paramValues); + }; + /** Returns a clone of the PathNode */ + PathNode.clone = function (node) { + return new PathNode(node); + }; + return PathNode; +}()); + +/** @module path */ /** for typedoc */ +/** + * This class contains functions which convert TargetStates, Nodes and paths from one type to another. + */ +var PathUtils = /** @class */ (function () { + function PathUtils() { + } + /** Given a PathNode[], create an TargetState */ + PathUtils.makeTargetState = function (registry, path) { + var state = tail(path).state; + return new TargetState(registry, state, path.map(prop("paramValues")).reduce(mergeR, {}), {}); + }; + PathUtils.buildPath = function (targetState) { + var toParams = targetState.params(); + return targetState.$state().path.map(function (state) { return new PathNode(state).applyRawParams(toParams); }); + }; + /** Given a fromPath: PathNode[] and a TargetState, builds a toPath: PathNode[] */ + PathUtils.buildToPath = function (fromPath, targetState) { + var toPath = PathUtils.buildPath(targetState); + if (targetState.options().inherit) { + return PathUtils.inheritParams(fromPath, toPath, Object.keys(targetState.params())); + } + return toPath; + }; + /** + * Creates ViewConfig objects and adds to nodes. + * + * On each [[PathNode]], creates ViewConfig objects from the views: property of the node's state + */ + PathUtils.applyViewConfigs = function ($view, path, states) { + // Only apply the viewConfigs to the nodes for the given states + path.filter(function (node) { return inArray(states, node.state); }).forEach(function (node) { + var viewDecls = values(node.state.views || {}); + var subPath = PathUtils.subPath(path, function (n) { return n === node; }); + var viewConfigs = viewDecls.map(function (view) { return $view.createViewConfig(subPath, view); }); + node.views = viewConfigs.reduce(unnestR, []); + }); + }; + /** + * Given a fromPath and a toPath, returns a new to path which inherits parameters from the fromPath + * + * For a parameter in a node to be inherited from the from path: + * - The toPath's node must have a matching node in the fromPath (by state). + * - The parameter name must not be found in the toKeys parameter array. + * + * Note: the keys provided in toKeys are intended to be those param keys explicitly specified by some + * caller, for instance, $state.transitionTo(..., toParams). If a key was found in toParams, + * it is not inherited from the fromPath. + */ + PathUtils.inheritParams = function (fromPath, toPath, toKeys) { + if (toKeys === void 0) { toKeys = []; } + function nodeParamVals(path, state) { + var node = find(path, propEq('state', state)); + return extend({}, node && node.paramValues); + } + var noInherit = fromPath.map(function (node) { return node.paramSchema; }) + .reduce(unnestR, []) + .filter(function (param) { return !param.inherit; }) + .map(prop('id')); + /** + * Given an [[PathNode]] "toNode", return a new [[PathNode]] with param values inherited from the + * matching node in fromPath. Only inherit keys that aren't found in "toKeys" from the node in "fromPath"" + */ + function makeInheritedParamsNode(toNode) { + // All param values for the node (may include default key/vals, when key was not found in toParams) + var toParamVals = extend({}, toNode && toNode.paramValues); + // limited to only those keys found in toParams + var incomingParamVals = pick(toParamVals, toKeys); + toParamVals = omit(toParamVals, toKeys); + var fromParamVals = omit(nodeParamVals(fromPath, toNode.state) || {}, noInherit); + // extend toParamVals with any fromParamVals, then override any of those those with incomingParamVals + var ownParamVals = extend(toParamVals, fromParamVals, incomingParamVals); + return new PathNode(toNode.state).applyRawParams(ownParamVals); + } + // The param keys specified by the incoming toParams + return toPath.map(makeInheritedParamsNode); + }; + /** + * Computes the tree changes (entering, exiting) between a fromPath and toPath. + */ + PathUtils.treeChanges = function (fromPath, toPath, reloadState) { + var keep = 0, max = Math.min(fromPath.length, toPath.length); + var nodesMatch = function (node1, node2) { + return node1.equals(node2, PathUtils.nonDynamicParams); + }; + while (keep < max && fromPath[keep].state !== reloadState && nodesMatch(fromPath[keep], toPath[keep])) { + keep++; + } + /** Given a retained node, return a new node which uses the to node's param values */ + function applyToParams(retainedNode, idx) { + var cloned = PathNode.clone(retainedNode); + cloned.paramValues = toPath[idx].paramValues; + return cloned; + } + var from, retained, exiting, entering, to; + from = fromPath; + retained = from.slice(0, keep); + exiting = from.slice(keep); + // Create a new retained path (with shallow copies of nodes) which have the params of the toPath mapped + var retainedWithToParams = retained.map(applyToParams); + entering = toPath.slice(keep); + to = (retainedWithToParams).concat(entering); + return { from: from, to: to, retained: retained, exiting: exiting, entering: entering }; + }; + /** + * Returns a new path which is: the subpath of the first path which matches the second path. + * + * The new path starts from root and contains any nodes that match the nodes in the second path. + * It stops before the first non-matching node. + * + * Nodes are compared using their state property and their parameter values. + * If a `paramsFn` is provided, only the [[Param]] returned by the function will be considered when comparing nodes. + * + * @param pathA the first path + * @param pathB the second path + * @param paramsFn a function which returns the parameters to consider when comparing + * + * @returns an array of PathNodes from the first path which match the nodes in the second path + */ + PathUtils.matching = function (pathA, pathB, paramsFn) { + var done = false; + var tuples = arrayTuples(pathA, pathB); + return tuples.reduce(function (matching, _a) { + var nodeA = _a[0], nodeB = _a[1]; + done = done || !nodeA.equals(nodeB, paramsFn); + return done ? matching : matching.concat(nodeA); + }, []); + }; + /** + * Returns true if two paths are identical. + * + * @param pathA + * @param pathB + * @param paramsFn a function which returns the parameters to consider when comparing + * @returns true if the the states and parameter values for both paths are identical + */ + PathUtils.equals = function (pathA, pathB, paramsFn) { + return pathA.length === pathB.length && + PathUtils.matching(pathA, pathB, paramsFn).length === pathA.length; + }; + /** + * Return a subpath of a path, which stops at the first matching node + * + * Given an array of nodes, returns a subset of the array starting from the first node, + * stopping when the first node matches the predicate. + * + * @param path a path of [[PathNode]]s + * @param predicate a [[Predicate]] fn that matches [[PathNode]]s + * @returns a subpath up to the matching node, or undefined if no match is found + */ + PathUtils.subPath = function (path, predicate) { + var node = find(path, predicate); + var elementIdx = path.indexOf(node); + return elementIdx === -1 ? undefined : path.slice(0, elementIdx + 1); + }; + PathUtils.nonDynamicParams = function (node) { + return node.state.parameters({ inherit: false }) + .filter(function (param) { return !param.dynamic; }); + }; + /** Gets the raw parameter values from a path */ + PathUtils.paramValues = function (path) { + return path.reduce(function (acc, node) { return extend(acc, node.paramValues); }, {}); + }; + return PathUtils; +}()); + +/** + * @coreapi + * @module resolve + */ /** for typedoc */ +// TODO: explicitly make this user configurable +var defaultResolvePolicy = { + when: "LAZY", + async: "WAIT" +}; +/** + * The basic building block for the resolve system. + * + * Resolvables encapsulate a state's resolve's resolveFn, the resolveFn's declared dependencies, the wrapped (.promise), + * and the unwrapped-when-complete (.data) result of the resolveFn. + * + * Resolvable.get() either retrieves the Resolvable's existing promise, or else invokes resolve() (which invokes the + * resolveFn) and returns the resulting promise. + * + * Resolvable.get() and Resolvable.resolve() both execute within a context path, which is passed as the first + * parameter to those fns. + */ +var Resolvable = /** @class */ (function () { + function Resolvable(arg1, resolveFn, deps, policy, data) { + this.resolved = false; + this.promise = undefined; + if (arg1 instanceof Resolvable) { + extend(this, arg1); + } + else if (isFunction(resolveFn)) { + if (isNullOrUndefined(arg1)) + throw new Error("new Resolvable(): token argument is required"); + if (!isFunction(resolveFn)) + throw new Error("new Resolvable(): resolveFn argument must be a function"); + this.token = arg1; + this.policy = policy; + this.resolveFn = resolveFn; + this.deps = deps || []; + this.data = data; + this.resolved = data !== undefined; + this.promise = this.resolved ? services.$q.when(this.data) : undefined; + } + else if (isObject(arg1) && arg1.token && isFunction(arg1.resolveFn)) { + var literal = arg1; + return new Resolvable(literal.token, literal.resolveFn, literal.deps, literal.policy, literal.data); + } + } + Resolvable.prototype.getPolicy = function (state) { + var thisPolicy = this.policy || {}; + var statePolicy = state && state.resolvePolicy || {}; + return { + when: thisPolicy.when || statePolicy.when || defaultResolvePolicy.when, + async: thisPolicy.async || statePolicy.async || defaultResolvePolicy.async, + }; + }; + /** + * Asynchronously resolve this Resolvable's data + * + * Given a ResolveContext that this Resolvable is found in: + * Wait for this Resolvable's dependencies, then invoke this Resolvable's function + * and update the Resolvable's state + */ + Resolvable.prototype.resolve = function (resolveContext, trans) { + var _this = this; + var $q = services.$q; + // Gets all dependencies from ResolveContext and wait for them to be resolved + var getResolvableDependencies = function () { + return $q.all(resolveContext.getDependencies(_this).map(function (resolvable) { + return resolvable.get(resolveContext, trans); + })); + }; + // Invokes the resolve function passing the resolved dependencies as arguments + var invokeResolveFn = function (resolvedDeps) { + return _this.resolveFn.apply(null, resolvedDeps); + }; + /** + * For RXWAIT policy: + * + * Given an observable returned from a resolve function: + * - enables .cache() mode (this allows multicast subscribers) + * - then calls toPromise() (this triggers subscribe() and thus fetches) + * - Waits for the promise, then return the cached observable (not the first emitted value). + */ + var waitForRx = function (observable$) { + var cached = observable$.cache(1); + return cached.take(1).toPromise().then(function () { return cached; }); + }; + // If the resolve policy is RXWAIT, wait for the observable to emit something. otherwise pass through. + var node = resolveContext.findNode(this); + var state = node && node.state; + var maybeWaitForRx = this.getPolicy(state).async === "RXWAIT" ? waitForRx : identity; + // After the final value has been resolved, update the state of the Resolvable + var applyResolvedValue = function (resolvedValue) { + _this.data = resolvedValue; + _this.resolved = true; + trace.traceResolvableResolved(_this, trans); + return _this.data; + }; + // Sets the promise property first, then getsResolvableDependencies in the context of the promise chain. Always waits one tick. + return this.promise = $q.when() + .then(getResolvableDependencies) + .then(invokeResolveFn) + .then(maybeWaitForRx) + .then(applyResolvedValue); + }; + /** + * Gets a promise for this Resolvable's data. + * + * Fetches the data and returns a promise. + * Returns the existing promise if it has already been fetched once. + */ + Resolvable.prototype.get = function (resolveContext, trans) { + return this.promise || this.resolve(resolveContext, trans); + }; + Resolvable.prototype.toString = function () { + return "Resolvable(token: " + stringify(this.token) + ", requires: [" + this.deps.map(stringify) + "])"; + }; + Resolvable.prototype.clone = function () { + return new Resolvable(this); + }; + Resolvable.fromData = function (token, data) { + return new Resolvable(token, function () { return data; }, null, null, data); + }; + return Resolvable; +}()); + +/** @internalapi */ +var resolvePolicies = { + when: { + LAZY: "LAZY", + EAGER: "EAGER" + }, + async: { + WAIT: "WAIT", + NOWAIT: "NOWAIT", + RXWAIT: "RXWAIT" + } +}; + +/** @module resolve */ +/** for typedoc */ +var whens = resolvePolicies.when; +var ALL_WHENS = [whens.EAGER, whens.LAZY]; +var EAGER_WHENS = [whens.EAGER]; +var NATIVE_INJECTOR_TOKEN = "Native Injector"; +/** + * Encapsulates Dependency Injection for a path of nodes + * + * UI-Router states are organized as a tree. + * A nested state has a path of ancestors to the root of the tree. + * When a state is being activated, each element in the path is wrapped as a [[PathNode]]. + * A `PathNode` is a stateful object that holds things like parameters and resolvables for the state being activated. + * + * The ResolveContext closes over the [[PathNode]]s, and provides DI for the last node in the path. + */ +var ResolveContext = /** @class */ (function () { + function ResolveContext(_path) { + this._path = _path; + } + /** Gets all the tokens found in the resolve context, de-duplicated */ + ResolveContext.prototype.getTokens = function () { + return this._path.reduce(function (acc, node) { return acc.concat(node.resolvables.map(function (r) { return r.token; })); }, []).reduce(uniqR, []); + }; + /** + * Gets the Resolvable that matches the token + * + * Gets the last Resolvable that matches the token in this context, or undefined. + * Throws an error if it doesn't exist in the ResolveContext + */ + ResolveContext.prototype.getResolvable = function (token) { + var matching = this._path.map(function (node) { return node.resolvables; }) + .reduce(unnestR, []) + .filter(function (r) { return r.token === token; }); + return tail(matching); + }; + /** Returns the [[ResolvePolicy]] for the given [[Resolvable]] */ + ResolveContext.prototype.getPolicy = function (resolvable) { + var node = this.findNode(resolvable); + return resolvable.getPolicy(node.state); + }; + /** + * Returns a ResolveContext that includes a portion of this one + * + * Given a state, this method creates a new ResolveContext from this one. + * The new context starts at the first node (root) and stops at the node for the `state` parameter. + * + * #### Why + * + * When a transition is created, the nodes in the "To Path" are injected from a ResolveContext. + * A ResolveContext closes over a path of [[PathNode]]s and processes the resolvables. + * The "To State" can inject values from its own resolvables, as well as those from all its ancestor state's (node's). + * This method is used to create a narrower context when injecting ancestor nodes. + * + * @example + * `let ABCD = new ResolveContext([A, B, C, D]);` + * + * Given a path `[A, B, C, D]`, where `A`, `B`, `C` and `D` are nodes for states `a`, `b`, `c`, `d`: + * When injecting `D`, `D` should have access to all resolvables from `A`, `B`, `C`, `D`. + * However, `B` should only be able to access resolvables from `A`, `B`. + * + * When resolving for the `B` node, first take the full "To Path" Context `[A,B,C,D]` and limit to the subpath `[A,B]`. + * `let AB = ABCD.subcontext(a)` + */ + ResolveContext.prototype.subContext = function (state) { + return new ResolveContext(PathUtils.subPath(this._path, function (node) { return node.state === state; })); + }; + /** + * Adds Resolvables to the node that matches the state + * + * This adds a [[Resolvable]] (generally one created on the fly; not declared on a [[StateDeclaration.resolve]] block). + * The resolvable is added to the node matching the `state` parameter. + * + * These new resolvables are not automatically fetched. + * The calling code should either fetch them, fetch something that depends on them, + * or rely on [[resolvePath]] being called when some state is being entered. + * + * Note: each resolvable's [[ResolvePolicy]] is merged with the state's policy, and the global default. + * + * @param newResolvables the new Resolvables + * @param state Used to find the node to put the resolvable on + */ + ResolveContext.prototype.addResolvables = function (newResolvables, state) { + var node = find(this._path, propEq('state', state)); + var keys = newResolvables.map(function (r) { return r.token; }); + node.resolvables = node.resolvables.filter(function (r) { return keys.indexOf(r.token) === -1; }).concat(newResolvables); + }; + /** + * Returns a promise for an array of resolved path Element promises + * + * @param when + * @param trans + * @returns {Promise|any} + */ + ResolveContext.prototype.resolvePath = function (when, trans) { + var _this = this; + if (when === void 0) { when = "LAZY"; } + // This option determines which 'when' policy Resolvables we are about to fetch. + var whenOption = inArray(ALL_WHENS, when) ? when : "LAZY"; + // If the caller specified EAGER, only the EAGER Resolvables are fetched. + // if the caller specified LAZY, both EAGER and LAZY Resolvables are fetched.` + var matchedWhens = whenOption === resolvePolicies.when.EAGER ? EAGER_WHENS : ALL_WHENS; + // get the subpath to the state argument, if provided + trace.traceResolvePath(this._path, when, trans); + var matchesPolicy = function (acceptedVals, whenOrAsync) { + return function (resolvable) { + return inArray(acceptedVals, _this.getPolicy(resolvable)[whenOrAsync]); + }; + }; + // Trigger all the (matching) Resolvables in the path + // Reduce all the "WAIT" Resolvables into an array + var promises = this._path.reduce(function (acc, node) { + var nodeResolvables = node.resolvables.filter(matchesPolicy(matchedWhens, 'when')); + var nowait = nodeResolvables.filter(matchesPolicy(['NOWAIT'], 'async')); + var wait = nodeResolvables.filter(not(matchesPolicy(['NOWAIT'], 'async'))); + // For the matching Resolvables, start their async fetch process. + var subContext = _this.subContext(node.state); + var getResult = function (r) { return r.get(subContext, trans) + .then(function (value) { return ({ token: r.token, value: value }); }); }; + nowait.forEach(getResult); + return acc.concat(wait.map(getResult)); + }, []); + // Wait for all the "WAIT" resolvables + return services.$q.all(promises); + }; + ResolveContext.prototype.injector = function () { + return this._injector || (this._injector = new UIInjectorImpl(this)); + }; + ResolveContext.prototype.findNode = function (resolvable) { + return find(this._path, function (node) { return inArray(node.resolvables, resolvable); }); + }; + /** + * Gets the async dependencies of a Resolvable + * + * Given a Resolvable, returns its dependencies as a Resolvable[] + */ + ResolveContext.prototype.getDependencies = function (resolvable) { + var _this = this; + var node = this.findNode(resolvable); + // Find which other resolvables are "visible" to the `resolvable` argument + // subpath stopping at resolvable's node, or the whole path (if the resolvable isn't in the path) + var subPath = PathUtils.subPath(this._path, function (x) { return x === node; }) || this._path; + var availableResolvables = subPath + .reduce(function (acc, _node) { return acc.concat(_node.resolvables); }, []) //all of subpath's resolvables + .filter(function (res) { return res !== resolvable; }); // filter out the `resolvable` argument + var getDependency = function (token) { + var matching = availableResolvables.filter(function (r) { return r.token === token; }); + if (matching.length) + return tail(matching); + var fromInjector = _this.injector().getNative(token); + if (isUndefined(fromInjector)) { + throw new Error("Could not find Dependency Injection token: " + stringify(token)); + } + return new Resolvable(token, function () { return fromInjector; }, [], fromInjector); + }; + return resolvable.deps.map(getDependency); + }; + return ResolveContext; +}()); +var UIInjectorImpl = /** @class */ (function () { + function UIInjectorImpl(context) { + this.context = context; + this.native = this.get(NATIVE_INJECTOR_TOKEN) || services.$injector; + } + UIInjectorImpl.prototype.get = function (token) { + var resolvable = this.context.getResolvable(token); + if (resolvable) { + if (this.context.getPolicy(resolvable).async === 'NOWAIT') { + return resolvable.get(this.context); + } + if (!resolvable.resolved) { + throw new Error("Resolvable async .get() not complete:" + stringify(resolvable.token)); + } + return resolvable.data; + } + return this.getNative(token); + }; + UIInjectorImpl.prototype.getAsync = function (token) { + var resolvable = this.context.getResolvable(token); + if (resolvable) + return resolvable.get(this.context); + return services.$q.when(this.native.get(token)); + }; + UIInjectorImpl.prototype.getNative = function (token) { + return this.native && this.native.get(token); + }; + return UIInjectorImpl; +}()); + +/** + * @coreapi + * @module transition + */ +/** for typedoc */ +/** @hidden */ +var stateSelf = prop("self"); +/** + * Represents a transition between two states. + * + * When navigating to a state, we are transitioning **from** the current state **to** the new state. + * + * This object contains all contextual information about the to/from states, parameters, resolves. + * It has information about all states being entered and exited as a result of the transition. + */ +var Transition = /** @class */ (function () { + /** + * Creates a new Transition object. + * + * If the target state is not valid, an error is thrown. + * + * @internalapi + * + * @param fromPath The path of [[PathNode]]s from which the transition is leaving. The last node in the `fromPath` + * encapsulates the "from state". + * @param targetState The target state and parameters being transitioned to (also, the transition options) + * @param router The [[UIRouter]] instance + */ + function Transition(fromPath, targetState, router) { + var _this = this; + /** @hidden */ + this._deferred = services.$q.defer(); + /** + * This promise is resolved or rejected based on the outcome of the Transition. + * + * When the transition is successful, the promise is resolved + * When the transition is unsuccessful, the promise is rejected with the [[Rejection]] or javascript error + */ + this.promise = this._deferred.promise; + /** @hidden Holds the hook registration functions such as those passed to Transition.onStart() */ + this._registeredHooks = {}; + /** @hidden */ + this._hookBuilder = new HookBuilder(this); + /** Checks if this transition is currently active/running. */ + this.isActive = function () { + return _this.router.globals.transition === _this; + }; + this.router = router; + this._targetState = targetState; + if (!targetState.valid()) { + throw new Error(targetState.error()); + } + // current() is assumed to come from targetState.options, but provide a naive implementation otherwise. + this._options = extend({ current: val(this) }, targetState.options()); + this.$id = router.transitionService._transitionCount++; + var toPath = PathUtils.buildToPath(fromPath, targetState); + this._treeChanges = PathUtils.treeChanges(fromPath, toPath, this._options.reloadState); + this.createTransitionHookRegFns(); + var onCreateHooks = this._hookBuilder.buildHooksForPhase(exports.TransitionHookPhase.CREATE); + TransitionHook.invokeHooks(onCreateHooks, function () { return null; }); + this.applyViewConfigs(router); + } + /** @hidden */ + Transition.prototype.onBefore = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onStart = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onExit = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onRetain = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onEnter = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onFinish = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onSuccess = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + Transition.prototype.onError = function (criteria, callback, options) { return; }; + /** @hidden + * Creates the transition-level hook registration functions + * (which can then be used to register hooks) + */ + Transition.prototype.createTransitionHookRegFns = function () { + var _this = this; + this.router.transitionService._pluginapi._getEvents() + .filter(function (type) { return type.hookPhase !== exports.TransitionHookPhase.CREATE; }) + .forEach(function (type) { return makeEvent(_this, _this.router.transitionService, type); }); + }; + /** @internalapi */ + Transition.prototype.getHooks = function (hookName) { + return this._registeredHooks[hookName]; + }; + Transition.prototype.applyViewConfigs = function (router) { + var enteringStates = this._treeChanges.entering.map(function (node) { return node.state; }); + PathUtils.applyViewConfigs(router.transitionService.$view, this._treeChanges.to, enteringStates); + }; + /** + * @internalapi + * + * @returns the internal from [State] object + */ + Transition.prototype.$from = function () { + return tail(this._treeChanges.from).state; + }; + /** + * @internalapi + * + * @returns the internal to [State] object + */ + Transition.prototype.$to = function () { + return tail(this._treeChanges.to).state; + }; + /** + * Returns the "from state" + * + * Returns the state that the transition is coming *from*. + * + * @returns The state declaration object for the Transition's ("from state"). + */ + Transition.prototype.from = function () { + return this.$from().self; + }; + /** + * Returns the "to state" + * + * Returns the state that the transition is going *to*. + * + * @returns The state declaration object for the Transition's target state ("to state"). + */ + Transition.prototype.to = function () { + return this.$to().self; + }; + /** + * Gets the Target State + * + * A transition's [[TargetState]] encapsulates the [[to]] state, the [[params]], and the [[options]] as a single object. + * + * @returns the [[TargetState]] of this Transition + */ + Transition.prototype.targetState = function () { + return this._targetState; + }; + /** + * Determines whether two transitions are equivalent. + * @deprecated + */ + Transition.prototype.is = function (compare) { + if (compare instanceof Transition) { + // TODO: Also compare parameters + return this.is({ to: compare.$to().name, from: compare.$from().name }); + } + return !((compare.to && !matchState(this.$to(), compare.to)) || + (compare.from && !matchState(this.$from(), compare.from))); + }; + Transition.prototype.params = function (pathname) { + if (pathname === void 0) { pathname = "to"; } + return Object.freeze(this._treeChanges[pathname].map(prop("paramValues")).reduce(mergeR, {})); + }; + /** + * Creates a [[UIInjector]] Dependency Injector + * + * Returns a Dependency Injector for the Transition's target state (to state). + * The injector provides resolve values which the target state has access to. + * + * The `UIInjector` can also provide values from the native root/global injector (ng1/ng2). + * + * #### Example: + * ```js + * .onEnter({ entering: 'myState' }, trans => { + * var myResolveValue = trans.injector().get('myResolve'); + * // Inject a global service from the global/native injector (if it exists) + * var MyService = trans.injector().get('MyService'); + * }) + * ``` + * + * In some cases (such as `onBefore`), you may need access to some resolve data but it has not yet been fetched. + * You can use [[UIInjector.getAsync]] to get a promise for the data. + * #### Example: + * ```js + * .onBefore({}, trans => { + * return trans.injector().getAsync('myResolve').then(myResolveValue => + * return myResolveValue !== 'ABORT'; + * }); + * }); + * ``` + * + * If a `state` is provided, the injector that is returned will be limited to resolve values that the provided state has access to. + * This can be useful if both a parent state `foo` and a child state `foo.bar` have both defined a resolve such as `data`. + * #### Example: + * ```js + * .onEnter({ to: 'foo.bar' }, trans => { + * // returns result of `foo` state's `data` resolve + * // even though `foo.bar` also has a `data` resolve + * var fooData = trans.injector('foo').get('data'); + * }); + * ``` + * + * If you need resolve data from the exiting states, pass `'from'` as `pathName`. + * The resolve data from the `from` path will be returned. + * #### Example: + * ```js + * .onExit({ exiting: 'foo.bar' }, trans => { + * // Gets the resolve value of `data` from the exiting state. + * var fooData = trans.injector(null, 'foo.bar').get('data'); + * }); + * ``` + * + * + * @param state Limits the resolves provided to only the resolves the provided state has access to. + * @param pathName Default: `'to'`: Chooses the path for which to create the injector. Use this to access resolves for `exiting` states. + * + * @returns a [[UIInjector]] + */ + Transition.prototype.injector = function (state, pathName) { + if (pathName === void 0) { pathName = "to"; } + var path = this._treeChanges[pathName]; + if (state) + path = PathUtils.subPath(path, function (node) { return node.state === state || node.state.name === state; }); + return new ResolveContext(path).injector(); + }; + /** + * Gets all available resolve tokens (keys) + * + * This method can be used in conjunction with [[injector]] to inspect the resolve values + * available to the Transition. + * + * This returns all the tokens defined on [[StateDeclaration.resolve]] blocks, for the states + * in the Transition's [[TreeChanges.to]] path. + * + * #### Example: + * This example logs all resolve values + * ```js + * let tokens = trans.getResolveTokens(); + * tokens.forEach(token => console.log(token + " = " + trans.injector().get(token))); + * ``` + * + * #### Example: + * This example creates promises for each resolve value. + * This triggers fetches of resolves (if any have not yet been fetched). + * When all promises have all settled, it logs the resolve values. + * ```js + * let tokens = trans.getResolveTokens(); + * let promise = tokens.map(token => trans.injector().getAsync(token)); + * Promise.all(promises).then(values => console.log("Resolved values: " + values)); + * ``` + * + * Note: Angular 1 users whould use `$q.all()` + * + * @param pathname resolve context's path name (e.g., `to` or `from`) + * + * @returns an array of resolve tokens (keys) + */ + Transition.prototype.getResolveTokens = function (pathname) { + if (pathname === void 0) { pathname = "to"; } + return new ResolveContext(this._treeChanges[pathname]).getTokens(); + }; + /** + * Dynamically adds a new [[Resolvable]] (i.e., [[StateDeclaration.resolve]]) to this transition. + * + * #### Example: + * ```js + * transitionService.onBefore({}, transition => { + * transition.addResolvable({ + * token: 'myResolve', + * deps: ['MyService'], + * resolveFn: myService => myService.getData() + * }); + * }); + * ``` + * + * @param resolvable a [[ResolvableLiteral]] object (or a [[Resolvable]]) + * @param state the state in the "to path" which should receive the new resolve (otherwise, the root state) + */ + Transition.prototype.addResolvable = function (resolvable, state) { + if (state === void 0) { state = ""; } + resolvable = is(Resolvable)(resolvable) ? resolvable : new Resolvable(resolvable); + var stateName = (typeof state === "string") ? state : state.name; + var topath = this._treeChanges.to; + var targetNode = find(topath, function (node) { return node.state.name === stateName; }); + var resolveContext = new ResolveContext(topath); + resolveContext.addResolvables([resolvable], targetNode.state); + }; + /** + * Gets the transition from which this transition was redirected. + * + * If the current transition is a redirect, this method returns the transition that was redirected. + * + * #### Example: + * ```js + * let transitionA = $state.go('A').transition + * transitionA.onStart({}, () => $state.target('B')); + * $transitions.onSuccess({ to: 'B' }, (trans) => { + * trans.to().name === 'B'; // true + * trans.redirectedFrom() === transitionA; // true + * }); + * ``` + * + * @returns The previous Transition, or null if this Transition is not the result of a redirection + */ + Transition.prototype.redirectedFrom = function () { + return this._options.redirectedFrom || null; + }; + /** + * Gets the original transition in a redirect chain + * + * A transition might belong to a long chain of multiple redirects. + * This method walks the [[redirectedFrom]] chain back to the original (first) transition in the chain. + * + * #### Example: + * ```js + * // states + * registry.register({ name: 'A', redirectTo: 'B' }); + * registry.register({ name: 'B', redirectTo: 'C' }); + * registry.register({ name: 'C', redirectTo: 'D' }); + * registry.register({ name: 'D' }); + * + * let transitionA = $state.go('A').transition + * + * $transitions.onSuccess({ to: 'D' }, (trans) => { + * trans.to().name === 'D'; // true + * trans.redirectedFrom().to().name === 'C'; // true + * trans.originalTransition() === transitionA; // true + * trans.originalTransition().to().name === 'A'; // true + * }); + * ``` + * + * @returns The original Transition that started a redirect chain + */ + Transition.prototype.originalTransition = function () { + var rf = this.redirectedFrom(); + return (rf && rf.originalTransition()) || this; + }; + /** + * Get the transition options + * + * @returns the options for this Transition. + */ + Transition.prototype.options = function () { + return this._options; + }; + /** + * Gets the states being entered. + * + * @returns an array of states that will be entered during this transition. + */ + Transition.prototype.entering = function () { + return map(this._treeChanges.entering, prop('state')).map(stateSelf); + }; + /** + * Gets the states being exited. + * + * @returns an array of states that will be exited during this transition. + */ + Transition.prototype.exiting = function () { + return map(this._treeChanges.exiting, prop('state')).map(stateSelf).reverse(); + }; + /** + * Gets the states being retained. + * + * @returns an array of states that are already entered from a previous Transition, that will not be + * exited during this Transition + */ + Transition.prototype.retained = function () { + return map(this._treeChanges.retained, prop('state')).map(stateSelf); + }; + /** + * Get the [[ViewConfig]]s associated with this Transition + * + * Each state can define one or more views (template/controller), which are encapsulated as `ViewConfig` objects. + * This method fetches the `ViewConfigs` for a given path in the Transition (e.g., "to" or "entering"). + * + * @param pathname the name of the path to fetch views for: + * (`'to'`, `'from'`, `'entering'`, `'exiting'`, `'retained'`) + * @param state If provided, only returns the `ViewConfig`s for a single state in the path + * + * @returns a list of ViewConfig objects for the given path. + */ + Transition.prototype.views = function (pathname, state) { + if (pathname === void 0) { pathname = "entering"; } + var path = this._treeChanges[pathname]; + path = !state ? path : path.filter(propEq('state', state)); + return path.map(prop("views")).filter(identity).reduce(unnestR, []); + }; + Transition.prototype.treeChanges = function (pathname) { + return pathname ? this._treeChanges[pathname] : this._treeChanges; + }; + /** + * Creates a new transition that is a redirection of the current one. + * + * This transition can be returned from a [[TransitionService]] hook to + * redirect a transition to a new state and/or set of parameters. + * + * @internalapi + * + * @returns Returns a new [[Transition]] instance. + */ + Transition.prototype.redirect = function (targetState) { + var redirects = 1, trans = this; + while ((trans = trans.redirectedFrom()) != null) { + if (++redirects > 20) + throw new Error("Too many consecutive Transition redirects (20+)"); + } + var redirectOpts = { redirectedFrom: this, source: "redirect" }; + // If the original transition was caused by URL sync, then use { location: 'replace' } + // on the new transition (unless the target state explicitly specifies location: false). + // This causes the original url to be replaced with the url for the redirect target + // so the original url disappears from the browser history. + if (this.options().source === 'url' && targetState.options().location !== false) { + redirectOpts.location = 'replace'; + } + var newOptions = extend({}, this.options(), targetState.options(), redirectOpts); + targetState = targetState.withOptions(newOptions, true); + var newTransition = this.router.transitionService.create(this._treeChanges.from, targetState); + var originalEnteringNodes = this._treeChanges.entering; + var redirectEnteringNodes = newTransition._treeChanges.entering; + // --- Re-use resolve data from original transition --- + // When redirecting from a parent state to a child state where the parent parameter values haven't changed + // (because of the redirect), the resolves fetched by the original transition are still valid in the + // redirected transition. + // + // This allows you to define a redirect on a parent state which depends on an async resolve value. + // You can wait for the resolve, then redirect to a child state based on the result. + // The redirected transition does not have to re-fetch the resolve. + // --------------------------------------------------------- + var nodeIsReloading = function (reloadState) { return function (node) { + return reloadState && node.state.includes[reloadState.name]; + }; }; + // Find any "entering" nodes in the redirect path that match the original path and aren't being reloaded + var matchingEnteringNodes = PathUtils.matching(redirectEnteringNodes, originalEnteringNodes, PathUtils.nonDynamicParams) + .filter(not(nodeIsReloading(targetState.options().reloadState))); + // Use the existing (possibly pre-resolved) resolvables for the matching entering nodes. + matchingEnteringNodes.forEach(function (node, idx) { + node.resolvables = originalEnteringNodes[idx].resolvables; + }); + return newTransition; + }; + /** @hidden If a transition doesn't exit/enter any states, returns any [[Param]] whose value changed */ + Transition.prototype._changedParams = function () { + var tc = this._treeChanges; + /** Return undefined if it's not a "dynamic" transition, for the following reasons */ + // If user explicitly wants a reload + if (this._options.reload) + return undefined; + // If any states are exiting or entering + if (tc.exiting.length || tc.entering.length) + return undefined; + // If to/from path lengths differ + if (tc.to.length !== tc.from.length) + return undefined; + // If the to/from paths are different + var pathsDiffer = arrayTuples(tc.to, tc.from) + .map(function (tuple) { return tuple[0].state !== tuple[1].state; }) + .reduce(anyTrueR, false); + if (pathsDiffer) + return undefined; + // Find any parameter values that differ + var nodeSchemas = tc.to.map(function (node) { return node.paramSchema; }); + var _a = [tc.to, tc.from].map(function (path) { return path.map(function (x) { return x.paramValues; }); }), toValues = _a[0], fromValues = _a[1]; + var tuples = arrayTuples(nodeSchemas, toValues, fromValues); + return tuples.map(function (_a) { + var schema = _a[0], toVals = _a[1], fromVals = _a[2]; + return Param.changed(schema, toVals, fromVals); + }).reduce(unnestR, []); + }; + /** + * Returns true if the transition is dynamic. + * + * A transition is dynamic if no states are entered nor exited, but at least one dynamic parameter has changed. + * + * @returns true if the Transition is dynamic + */ + Transition.prototype.dynamic = function () { + var changes = this._changedParams(); + return !changes ? false : changes.map(function (x) { return x.dynamic; }).reduce(anyTrueR, false); + }; + /** + * Returns true if the transition is ignored. + * + * A transition is ignored if no states are entered nor exited, and no parameter values have changed. + * + * @returns true if the Transition is ignored. + */ + Transition.prototype.ignored = function () { + return !!this._ignoredReason(); + }; + /** @hidden */ + Transition.prototype._ignoredReason = function () { + var pending = this.router.globals.transition; + var reloadState = this._options.reloadState; + var same = function (pathA, pathB) { + if (pathA.length !== pathB.length) + return false; + var matching = PathUtils.matching(pathA, pathB); + return pathA.length === matching.filter(function (node) { return !reloadState || !node.state.includes[reloadState.name]; }).length; + }; + var newTC = this.treeChanges(); + var pendTC = pending && pending.treeChanges(); + if (pendTC && same(pendTC.to, newTC.to) && same(pendTC.exiting, newTC.exiting)) + return "SameAsPending"; + if (newTC.exiting.length === 0 && newTC.entering.length === 0 && same(newTC.from, newTC.to)) + return "SameAsCurrent"; + }; + /** + * Runs the transition + * + * This method is generally called from the [[StateService.transitionTo]] + * + * @internalapi + * + * @returns a promise for a successful transition. + */ + Transition.prototype.run = function () { + var _this = this; + var runAllHooks = TransitionHook.runAllHooks; + // Gets transition hooks array for the given phase + var getHooksFor = function (phase) { + return _this._hookBuilder.buildHooksForPhase(phase); + }; + // When the chain is complete, then resolve or reject the deferred + var transitionSuccess = function () { + trace.traceSuccess(_this.$to(), _this); + _this.success = true; + _this._deferred.resolve(_this.to()); + runAllHooks(getHooksFor(exports.TransitionHookPhase.SUCCESS)); + }; + var transitionError = function (reason) { + trace.traceError(reason, _this); + _this.success = false; + _this._deferred.reject(reason); + _this._error = reason; + runAllHooks(getHooksFor(exports.TransitionHookPhase.ERROR)); + }; + var runTransition = function () { + // Wait to build the RUN hook chain until the BEFORE hooks are done + // This allows a BEFORE hook to dynamically add additional RUN hooks via the Transition object. + var allRunHooks = getHooksFor(exports.TransitionHookPhase.RUN); + var done = function () { return services.$q.when(undefined); }; + return TransitionHook.invokeHooks(allRunHooks, done); + }; + var startTransition = function () { + var globals = _this.router.globals; + globals.lastStartedTransitionId = _this.$id; + globals.transition = _this; + globals.transitionHistory.enqueue(_this); + trace.traceTransitionStart(_this); + return services.$q.when(undefined); + }; + var allBeforeHooks = getHooksFor(exports.TransitionHookPhase.BEFORE); + TransitionHook.invokeHooks(allBeforeHooks, startTransition) + .then(runTransition) + .then(transitionSuccess, transitionError); + return this.promise; + }; + /** + * Checks if the Transition is valid + * + * @returns true if the Transition is valid + */ + Transition.prototype.valid = function () { + return !this.error() || this.success !== undefined; + }; + /** + * Aborts this transition + * + * Imperative API to abort a Transition. + * This only applies to Transitions that are not yet complete. + */ + Transition.prototype.abort = function () { + // Do not set flag if the transition is already complete + if (isUndefined(this.success)) { + this._aborted = true; + } + }; + /** + * The Transition error reason. + * + * If the transition is invalid (and could not be run), returns the reason the transition is invalid. + * If the transition was valid and ran, but was not successful, returns the reason the transition failed. + * + * @returns an error message explaining why the transition is invalid, or the reason the transition failed. + */ + Transition.prototype.error = function () { + var state = this.$to(); + if (state.self.abstract) + return "Cannot transition to abstract state '" + state.name + "'"; + var paramDefs = state.parameters(), values$$1 = this.params(); + var invalidParams = paramDefs.filter(function (param) { return !param.validates(values$$1[param.id]); }); + if (invalidParams.length) { + return "Param values not valid for state '" + state.name + "'. Invalid params: [ " + invalidParams.map(function (param) { return param.id; }).join(', ') + " ]"; + } + if (this.success === false) + return this._error; + }; + /** + * A string representation of the Transition + * + * @returns A string representation of the Transition + */ + Transition.prototype.toString = function () { + var fromStateOrName = this.from(); + var toStateOrName = this.to(); + var avoidEmptyHash = function (params) { + return (params["#"] !== null && params["#"] !== undefined) ? params : omit(params, ["#"]); + }; + // (X) means the to state is invalid. + var id = this.$id, from = isObject(fromStateOrName) ? fromStateOrName.name : fromStateOrName, fromParams = stringify(avoidEmptyHash(this._treeChanges.from.map(prop('paramValues')).reduce(mergeR, {}))), toValid = this.valid() ? "" : "(X) ", to = isObject(toStateOrName) ? toStateOrName.name : toStateOrName, toParams = stringify(avoidEmptyHash(this.params())); + return "Transition#" + id + "( '" + from + "'" + fromParams + " -> " + toValid + "'" + to + "'" + toParams + " )"; + }; + /** @hidden */ + Transition.diToken = Transition; + return Transition; +}()); + +/** + * Functions that manipulate strings + * + * Although these functions are exported, they are subject to change without notice. + * + * @module common_strings + */ /** */ +/** + * Returns a string shortened to a maximum length + * + * If the string is already less than the `max` length, return the string. + * Else return the string, shortened to `max - 3` and append three dots ("..."). + * + * @param max the maximum length of the string to return + * @param str the input string + */ +function maxLength(max, str) { + if (str.length <= max) + return str; + return str.substr(0, max - 3) + "..."; +} +/** + * Returns a string, with spaces added to the end, up to a desired str length + * + * If the string is already longer than the desired length, return the string. + * Else returns the string, with extra spaces on the end, such that it reaches `length` characters. + * + * @param length the desired length of the string to return + * @param str the input string + */ +function padString(length, str) { + while (str.length < length) + str += " "; + return str; +} +function kebobString(camelCase) { + return camelCase + .replace(/^([A-Z])/, function ($1) { return $1.toLowerCase(); }) // replace first char + .replace(/([A-Z])/g, function ($1) { return "-" + $1.toLowerCase(); }); // replace rest +} +function functionToString(fn) { + var fnStr = fnToString(fn); + var namedFunctionMatch = fnStr.match(/^(function [^ ]+\([^)]*\))/); + var toStr = namedFunctionMatch ? namedFunctionMatch[1] : fnStr; + var fnName = fn['name'] || ""; + if (fnName && toStr.match(/function \(/)) { + return 'function ' + fnName + toStr.substr(9); + } + return toStr; +} +function fnToString(fn) { + var _fn = isArray(fn) ? fn.slice(-1)[0] : fn; + return _fn && _fn.toString() || "undefined"; +} +var stringifyPatternFn = null; +var stringifyPattern = function (value) { + var isRejection = Rejection.isRejectionPromise; + stringifyPatternFn = stringifyPatternFn || pattern([ + [not(isDefined), val("undefined")], + [isNull, val("null")], + [isPromise, val("[Promise]")], + [isRejection, function (x) { return x._transitionRejection.toString(); }], + [is(Rejection), invoke("toString")], + [is(Transition), invoke("toString")], + [is(Resolvable), invoke("toString")], + [isInjectable, functionToString], + [val(true), identity] + ]); + return stringifyPatternFn(value); +}; +function stringify(o) { + var seen = []; + function format(val$$1) { + if (isObject(val$$1)) { + if (seen.indexOf(val$$1) !== -1) + return '[circular ref]'; + seen.push(val$$1); + } + return stringifyPattern(val$$1); + } + return JSON.stringify(o, function (key, val$$1) { return format(val$$1); }).replace(/\\"/g, '"'); +} +/** Returns a function that splits a string on a character or substring */ +var beforeAfterSubstr = function (char) { return function (str) { + if (!str) + return ["", ""]; + var idx = str.indexOf(char); + if (idx === -1) + return [str, ""]; + return [str.substr(0, idx), str.substr(idx + 1)]; +}; }; +var hostRegex = new RegExp('^(?:[a-z]+:)?//[^/]+/'); +var stripFile = function (str) { return str.replace(/\/[^/]*$/, ''); }; +var splitHash = beforeAfterSubstr("#"); +var splitQuery = beforeAfterSubstr("?"); +var splitEqual = beforeAfterSubstr("="); +var trimHashVal = function (str) { return str ? str.replace(/^#/, "") : ""; }; +/** + * Splits on a delimiter, but returns the delimiters in the array + * + * #### Example: + * ```js + * var splitOnSlashes = splitOnDelim('/'); + * splitOnSlashes("/foo"); // ["/", "foo"] + * splitOnSlashes("/foo/"); // ["/", "foo", "/"] + * ``` + */ +function splitOnDelim(delim) { + var re = new RegExp("(" + delim + ")", "g"); + return function (str) { + return str.split(re).filter(identity); + }; +} + +/** + * Reduce fn that joins neighboring strings + * + * Given an array of strings, returns a new array + * where all neighboring strings have been joined. + * + * #### Example: + * ```js + * let arr = ["foo", "bar", 1, "baz", "", "qux" ]; + * arr.reduce(joinNeighborsR, []) // ["foobar", 1, "bazqux" ] + * ``` + */ +function joinNeighborsR(acc, x) { + if (isString(tail(acc)) && isString(x)) + return acc.slice(0, -1).concat(tail(acc) + x); + return pushR(acc, x); +} + +/** @module common */ /** for typedoc */ + +/** + * @coreapi + * @module params + */ +/** */ +/** + * A registry for parameter types. + * + * This registry manages the built-in (and custom) parameter types. + * + * The built-in parameter types are: + * + * - [[string]] + * - [[path]] + * - [[query]] + * - [[hash]] + * - [[int]] + * - [[bool]] + * - [[date]] + * - [[json]] + * - [[any]] + */ +var ParamTypes = /** @class */ (function () { + /** @internalapi */ + function ParamTypes() { + /** @hidden */ + this.enqueue = true; + /** @hidden */ + this.typeQueue = []; + /** @internalapi */ + this.defaultTypes = pick(ParamTypes.prototype, ["hash", "string", "query", "path", "int", "bool", "date", "json", "any"]); + // Register default types. Store them in the prototype of this.types. + var makeType = function (definition, name) { + return new ParamType(extend({ name: name }, definition)); + }; + this.types = inherit(map(this.defaultTypes, makeType), {}); + } + /** @internalapi */ + ParamTypes.prototype.dispose = function () { + this.types = {}; + }; + /** + * Registers a parameter type + * + * End users should call [[UrlMatcherFactory.type]], which delegates to this method. + */ + ParamTypes.prototype.type = function (name, definition, definitionFn) { + if (!isDefined(definition)) + return this.types[name]; + if (this.types.hasOwnProperty(name)) + throw new Error("A type named '" + name + "' has already been defined."); + this.types[name] = new ParamType(extend({ name: name }, definition)); + if (definitionFn) { + this.typeQueue.push({ name: name, def: definitionFn }); + if (!this.enqueue) + this._flushTypeQueue(); + } + return this; + }; + /** @internalapi */ + ParamTypes.prototype._flushTypeQueue = function () { + while (this.typeQueue.length) { + var type = this.typeQueue.shift(); + if (type.pattern) + throw new Error("You cannot override a type's .pattern at runtime."); + extend(this.types[type.name], services.$injector.invoke(type.def)); + } + }; + return ParamTypes; +}()); +/** @hidden */ +function initDefaultTypes() { + var makeDefaultType = function (def) { + var valToString = function (val$$1) { + return val$$1 != null ? val$$1.toString() : val$$1; + }; + var defaultTypeBase = { + encode: valToString, + decode: valToString, + is: is(String), + pattern: /.*/, + equals: function (a, b) { return a == b; }, + }; + return extend({}, defaultTypeBase, def); + }; + // Default Parameter Type Definitions + extend(ParamTypes.prototype, { + string: makeDefaultType({}), + path: makeDefaultType({ + pattern: /[^/]*/, + }), + query: makeDefaultType({}), + hash: makeDefaultType({ + inherit: false, + }), + int: makeDefaultType({ + decode: function (val$$1) { return parseInt(val$$1, 10); }, + is: function (val$$1) { + return !isNullOrUndefined(val$$1) && this.decode(val$$1.toString()) === val$$1; + }, + pattern: /-?\d+/, + }), + bool: makeDefaultType({ + encode: function (val$$1) { return val$$1 && 1 || 0; }, + decode: function (val$$1) { return parseInt(val$$1, 10) !== 0; }, + is: is(Boolean), + pattern: /0|1/, + }), + date: makeDefaultType({ + encode: function (val$$1) { + return !this.is(val$$1) ? undefined : [ + val$$1.getFullYear(), + ('0' + (val$$1.getMonth() + 1)).slice(-2), + ('0' + val$$1.getDate()).slice(-2), + ].join("-"); + }, + decode: function (val$$1) { + if (this.is(val$$1)) + return val$$1; + var match = this.capture.exec(val$$1); + return match ? new Date(match[1], match[2] - 1, match[3]) : undefined; + }, + is: function (val$$1) { return val$$1 instanceof Date && !isNaN(val$$1.valueOf()); }, + equals: function (l, r) { + return ['getFullYear', 'getMonth', 'getDate'] + .reduce(function (acc, fn) { return acc && l[fn]() === r[fn](); }, true); + }, + pattern: /[0-9]{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])/, + capture: /([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/, + }), + json: makeDefaultType({ + encode: toJson, + decode: fromJson, + is: is(Object), + equals: equals, + pattern: /[^/]*/, + }), + // does not encode/decode + any: makeDefaultType({ + encode: identity, + decode: identity, + is: function () { return true; }, + equals: equals, + }), + }); +} +initDefaultTypes(); + +/** + * @coreapi + * @module params + */ +/** */ +/** @internalapi */ +var StateParams = /** @class */ (function () { + function StateParams(params) { + if (params === void 0) { params = {}; } + extend(this, params); + } + /** + * Merges a set of parameters with all parameters inherited between the common parents of the + * current state and a given destination state. + * + * @param {Object} newParams The set of parameters which will be composited with inherited params. + * @param {Object} $current Internal definition of object representing the current state. + * @param {Object} $to Internal definition of object representing state to transition to. + */ + StateParams.prototype.$inherit = function (newParams, $current, $to) { + var parents = ancestors($current, $to), parentParams, inherited = {}, inheritList = []; + for (var i in parents) { + if (!parents[i] || !parents[i].params) + continue; + parentParams = Object.keys(parents[i].params); + if (!parentParams.length) + continue; + for (var j in parentParams) { + if (inheritList.indexOf(parentParams[j]) >= 0) + continue; + inheritList.push(parentParams[j]); + inherited[parentParams[j]] = this[parentParams[j]]; + } + } + return extend({}, inherited, newParams); + }; + + return StateParams; +}()); + +/** @module path */ /** for typedoc */ + +/** @module resolve */ /** for typedoc */ + +/** @module state */ /** for typedoc */ +var parseUrl = function (url) { + if (!isString(url)) + return false; + var root$$1 = url.charAt(0) === '^'; + return { val: root$$1 ? url.substring(1) : url, root: root$$1 }; +}; +function nameBuilder(state) { + return state.name; +} +function selfBuilder(state) { + state.self.$$state = function () { return state; }; + return state.self; +} +function dataBuilder(state) { + if (state.parent && state.parent.data) { + state.data = state.self.data = inherit(state.parent.data, state.data); + } + return state.data; +} +var getUrlBuilder = function ($urlMatcherFactoryProvider, root$$1) { + return function urlBuilder(state) { + var stateDec = state; + // For future states, i.e., states whose name ends with `.**`, + // match anything that starts with the url prefix + if (stateDec && stateDec.url && stateDec.name && stateDec.name.match(/\.\*\*$/)) { + stateDec.url += "{remainder:any}"; // match any path (.*) + } + var parsed = parseUrl(stateDec.url), parent = state.parent; + var url = !parsed ? stateDec.url : $urlMatcherFactoryProvider.compile(parsed.val, { + params: state.params || {}, + paramMap: function (paramConfig, isSearch) { + if (stateDec.reloadOnSearch === false && isSearch) + paramConfig = extend(paramConfig || {}, { dynamic: true }); + return paramConfig; + } + }); + if (!url) + return null; + if (!$urlMatcherFactoryProvider.isMatcher(url)) + throw new Error("Invalid url '" + url + "' in state '" + state + "'"); + return (parsed && parsed.root) ? url : ((parent && parent.navigable) || root$$1()).url.append(url); + }; +}; +var getNavigableBuilder = function (isRoot) { + return function navigableBuilder(state) { + return !isRoot(state) && state.url ? state : (state.parent ? state.parent.navigable : null); + }; +}; +var getParamsBuilder = function (paramFactory) { + return function paramsBuilder(state) { + var makeConfigParam = function (config, id) { return paramFactory.fromConfig(id, null, config); }; + var urlParams = (state.url && state.url.parameters({ inherit: false })) || []; + var nonUrlParams = values(mapObj(omit(state.params || {}, urlParams.map(prop('id'))), makeConfigParam)); + return urlParams.concat(nonUrlParams).map(function (p) { return [p.id, p]; }).reduce(applyPairs, {}); + }; +}; +function pathBuilder(state) { + return state.parent ? state.parent.path.concat(state) : /*root*/ [state]; +} +function includesBuilder(state) { + var includes = state.parent ? extend({}, state.parent.includes) : {}; + includes[state.name] = true; + return includes; +} +/** + * This is a [[StateBuilder.builder]] function for the `resolve:` block on a [[StateDeclaration]]. + * + * When the [[StateBuilder]] builds a [[StateObject]] object from a raw [[StateDeclaration]], this builder + * validates the `resolve` property and converts it to a [[Resolvable]] array. + * + * resolve: input value can be: + * + * { + * // analyzed but not injected + * myFooResolve: function() { return "myFooData"; }, + * + * // function.toString() parsed, "DependencyName" dep as string (not min-safe) + * myBarResolve: function(DependencyName) { return DependencyName.fetchSomethingAsPromise() }, + * + * // Array split; "DependencyName" dep as string + * myBazResolve: [ "DependencyName", function(dep) { return dep.fetchSomethingAsPromise() }, + * + * // Array split; DependencyType dep as token (compared using ===) + * myQuxResolve: [ DependencyType, function(dep) { return dep.fetchSometingAsPromise() }, + * + * // val.$inject used as deps + * // where: + * // corgeResolve.$inject = ["DependencyName"]; + * // function corgeResolve(dep) { dep.fetchSometingAsPromise() } + * // then "DependencyName" dep as string + * myCorgeResolve: corgeResolve, + * + * // inject service by name + * // When a string is found, desugar creating a resolve that injects the named service + * myGraultResolve: "SomeService" + * } + * + * or: + * + * [ + * new Resolvable("myFooResolve", function() { return "myFooData" }), + * new Resolvable("myBarResolve", function(dep) { return dep.fetchSomethingAsPromise() }, [ "DependencyName" ]), + * { provide: "myBazResolve", useFactory: function(dep) { dep.fetchSomethingAsPromise() }, deps: [ "DependencyName" ] } + * ] + */ +function resolvablesBuilder(state) { + /** convert resolve: {} and resolvePolicy: {} objects to an array of tuples */ + var objects2Tuples = function (resolveObj, resolvePolicies) { + return Object.keys(resolveObj || {}).map(function (token) { return ({ token: token, val: resolveObj[token], deps: undefined, policy: resolvePolicies[token] }); }); + }; + /** fetch DI annotations from a function or ng1-style array */ + var annotate = function (fn) { + var $injector = services.$injector; + // ng1 doesn't have an $injector until runtime. + // If the $injector doesn't exist, use "deferred" literal as a + // marker indicating they should be annotated when runtime starts + return fn['$inject'] || ($injector && $injector.annotate(fn, $injector.strictDi)) || "deferred"; + }; + /** true if the object has both `token` and `resolveFn`, and is probably a [[ResolveLiteral]] */ + var isResolveLiteral = function (obj) { return !!(obj.token && obj.resolveFn); }; + /** true if the object looks like a provide literal, or a ng2 Provider */ + var isLikeNg2Provider = function (obj) { return !!((obj.provide || obj.token) && (obj.useValue || obj.useFactory || obj.useExisting || obj.useClass)); }; + /** true if the object looks like a tuple from obj2Tuples */ + var isTupleFromObj = function (obj) { return !!(obj && obj.val && (isString(obj.val) || isArray(obj.val) || isFunction(obj.val))); }; + /** extracts the token from a Provider or provide literal */ + var token = function (p) { return p.provide || p.token; }; + /** Given a literal resolve or provider object, returns a Resolvable */ + var literal2Resolvable = pattern([ + [prop('resolveFn'), function (p) { return new Resolvable(token(p), p.resolveFn, p.deps, p.policy); }], + [prop('useFactory'), function (p) { return new Resolvable(token(p), p.useFactory, (p.deps || p.dependencies), p.policy); }], + [prop('useClass'), function (p) { return new Resolvable(token(p), function () { return new p.useClass(); }, [], p.policy); }], + [prop('useValue'), function (p) { return new Resolvable(token(p), function () { return p.useValue; }, [], p.policy, p.useValue); }], + [prop('useExisting'), function (p) { return new Resolvable(token(p), identity, [p.useExisting], p.policy); }], + ]); + var tuple2Resolvable = pattern([ + [pipe(prop("val"), isString), function (tuple) { return new Resolvable(tuple.token, identity, [tuple.val], tuple.policy); }], + [pipe(prop("val"), isArray), function (tuple) { return new Resolvable(tuple.token, tail(tuple.val), tuple.val.slice(0, -1), tuple.policy); }], + [pipe(prop("val"), isFunction), function (tuple) { return new Resolvable(tuple.token, tuple.val, annotate(tuple.val), tuple.policy); }], + ]); + var item2Resolvable = pattern([ + [is(Resolvable), function (r) { return r; }], + [isResolveLiteral, literal2Resolvable], + [isLikeNg2Provider, literal2Resolvable], + [isTupleFromObj, tuple2Resolvable], + [val(true), function (obj) { throw new Error("Invalid resolve value: " + stringify(obj)); }] + ]); + // If resolveBlock is already an array, use it as-is. + // Otherwise, assume it's an object and convert to an Array of tuples + var decl = state.resolve; + var items = isArray(decl) ? decl : objects2Tuples(decl, state.resolvePolicy || {}); + return items.map(item2Resolvable); +} +/** + * @internalapi A internal global service + * + * StateBuilder is a factory for the internal [[StateObject]] objects. + * + * When you register a state with the [[StateRegistry]], you register a plain old javascript object which + * conforms to the [[StateDeclaration]] interface. This factory takes that object and builds the corresponding + * [[StateObject]] object, which has an API and is used internally. + * + * Custom properties or API may be added to the internal [[StateObject]] object by registering a decorator function + * using the [[builder]] method. + */ +var StateBuilder = /** @class */ (function () { + function StateBuilder(matcher, urlMatcherFactory) { + this.matcher = matcher; + var self = this; + var root$$1 = function () { return matcher.find(""); }; + var isRoot = function (state) { return state.name === ""; }; + function parentBuilder(state) { + if (isRoot(state)) + return null; + return matcher.find(self.parentName(state)) || root$$1(); + } + this.builders = { + name: [nameBuilder], + self: [selfBuilder], + parent: [parentBuilder], + data: [dataBuilder], + // Build a URLMatcher if necessary, either via a relative or absolute URL + url: [getUrlBuilder(urlMatcherFactory, root$$1)], + // Keep track of the closest ancestor state that has a URL (i.e. is navigable) + navigable: [getNavigableBuilder(isRoot)], + params: [getParamsBuilder(urlMatcherFactory.paramFactory)], + // Each framework-specific ui-router implementation should define its own `views` builder + // e.g., src/ng1/statebuilders/views.ts + views: [], + // Keep a full path from the root down to this state as this is needed for state activation. + path: [pathBuilder], + // Speed up $state.includes() as it's used a lot + includes: [includesBuilder], + resolvables: [resolvablesBuilder] + }; + } + /** + * Registers a [[BuilderFunction]] for a specific [[StateObject]] property (e.g., `parent`, `url`, or `path`). + * More than one BuilderFunction can be registered for a given property. + * + * The BuilderFunction(s) will be used to define the property on any subsequently built [[StateObject]] objects. + * + * @param name The name of the State property being registered for. + * @param fn The BuilderFunction which will be used to build the State property + * @returns a function which deregisters the BuilderFunction + */ + StateBuilder.prototype.builder = function (name, fn) { + var builders = this.builders; + var array = builders[name] || []; + // Backwards compat: if only one builder exists, return it, else return whole arary. + if (isString(name) && !isDefined(fn)) + return array.length > 1 ? array : array[0]; + if (!isString(name) || !isFunction(fn)) + return; + builders[name] = array; + builders[name].push(fn); + return function () { return builders[name].splice(builders[name].indexOf(fn, 1)) && null; }; + }; + /** + * Builds all of the properties on an essentially blank State object, returning a State object which has all its + * properties and API built. + * + * @param state an uninitialized State object + * @returns the built State object + */ + StateBuilder.prototype.build = function (state) { + var _a = this, matcher = _a.matcher, builders = _a.builders; + var parent = this.parentName(state); + if (parent && !matcher.find(parent, undefined, false)) { + return null; + } + for (var key in builders) { + if (!builders.hasOwnProperty(key)) + continue; + var chain = builders[key].reduce(function (parentFn, step) { return function (_state) { return step(_state, parentFn); }; }, noop$1); + state[key] = chain(state); + } + return state; + }; + StateBuilder.prototype.parentName = function (state) { + // name = 'foo.bar.baz.**' + var name = state.name || ""; + // segments = ['foo', 'bar', 'baz', '.**'] + var segments = name.split('.'); + // segments = ['foo', 'bar', 'baz'] + var lastSegment = segments.pop(); + // segments = ['foo', 'bar'] (ignore .** segment for future states) + if (lastSegment === '**') + segments.pop(); + if (segments.length) { + if (state.parent) { + throw new Error("States that specify the 'parent:' property should not have a '.' in their name (" + name + ")"); + } + // 'foo.bar' + return segments.join("."); + } + if (!state.parent) + return ""; + return isString(state.parent) ? state.parent : state.parent.name; + }; + StateBuilder.prototype.name = function (state) { + var name = state.name; + if (name.indexOf('.') !== -1 || !state.parent) + return name; + var parentName = isString(state.parent) ? state.parent : state.parent.name; + return parentName ? parentName + "." + name : name; + }; + return StateBuilder; +}()); + +/** @module state */ /** for typedoc */ +var StateMatcher = /** @class */ (function () { + function StateMatcher(_states) { + this._states = _states; + } + StateMatcher.prototype.isRelative = function (stateName) { + stateName = stateName || ""; + return stateName.indexOf(".") === 0 || stateName.indexOf("^") === 0; + }; + StateMatcher.prototype.find = function (stateOrName, base, matchGlob) { + if (matchGlob === void 0) { matchGlob = true; } + if (!stateOrName && stateOrName !== "") + return undefined; + var isStr = isString(stateOrName); + var name = isStr ? stateOrName : stateOrName.name; + if (this.isRelative(name)) + name = this.resolvePath(name, base); + var state = this._states[name]; + if (state && (isStr || (!isStr && (state === stateOrName || state.self === stateOrName)))) { + return state; + } + else if (isStr && matchGlob) { + var _states = values(this._states); + var matches = _states.filter(function (state) { + return state.__stateObjectCache.nameGlob && + state.__stateObjectCache.nameGlob.matches(name); + }); + if (matches.length > 1) { + console.log("stateMatcher.find: Found multiple matches for " + name + " using glob: ", matches.map(function (match) { return match.name; })); + } + return matches[0]; + } + return undefined; + }; + StateMatcher.prototype.resolvePath = function (name, base) { + if (!base) + throw new Error("No reference point given for path '" + name + "'"); + var baseState = this.find(base); + var splitName = name.split("."), i = 0, pathLength = splitName.length, current = baseState; + for (; i < pathLength; i++) { + if (splitName[i] === "" && i === 0) { + current = baseState; + continue; + } + if (splitName[i] === "^") { + if (!current.parent) + throw new Error("Path '" + name + "' not valid for state '" + baseState.name + "'"); + current = current.parent; + continue; + } + break; + } + var relName = splitName.slice(i).join("."); + return current.name + (current.name && relName ? "." : "") + relName; + }; + return StateMatcher; +}()); + +/** @module state */ /** for typedoc */ +/** @internalapi */ +var StateQueueManager = /** @class */ (function () { + function StateQueueManager($registry, $urlRouter, states, builder, listeners) { + this.$registry = $registry; + this.$urlRouter = $urlRouter; + this.states = states; + this.builder = builder; + this.listeners = listeners; + this.queue = []; + this.matcher = $registry.matcher; + } + /** @internalapi */ + StateQueueManager.prototype.dispose = function () { + this.queue = []; + }; + StateQueueManager.prototype.register = function (stateDecl) { + var queue = this.queue; + var state = StateObject.create(stateDecl); + var name = state.name; + if (!isString(name)) + throw new Error("State must have a valid name"); + if (this.states.hasOwnProperty(name) || inArray(queue.map(prop('name')), name)) + throw new Error("State '" + name + "' is already defined"); + queue.push(state); + this.flush(); + return state; + }; + StateQueueManager.prototype.flush = function () { + var _this = this; + var _a = this, queue = _a.queue, states = _a.states, builder = _a.builder; + var registered = [], // states that got registered + orphans = [], // states that don't yet have a parent registered + previousQueueLength = {}; // keep track of how long the queue when an orphan was first encountered + var getState = function (name) { + return _this.states.hasOwnProperty(name) && _this.states[name]; + }; + while (queue.length > 0) { + var state = queue.shift(); + var name_1 = state.name; + var result = builder.build(state); + var orphanIdx = orphans.indexOf(state); + if (result) { + var existingState = getState(name_1); + if (existingState && existingState.name === name_1) { + throw new Error("State '" + name_1 + "' is already defined"); + } + var existingFutureState = getState(name_1 + ".**"); + if (existingFutureState) { + // Remove future state of the same name + this.$registry.deregister(existingFutureState); + } + states[name_1] = state; + this.attachRoute(state); + if (orphanIdx >= 0) + orphans.splice(orphanIdx, 1); + registered.push(state); + continue; + } + var prev = previousQueueLength[name_1]; + previousQueueLength[name_1] = queue.length; + if (orphanIdx >= 0 && prev === queue.length) { + // Wait until two consecutive iterations where no additional states were dequeued successfully. + // throw new Error(`Cannot register orphaned state '${name}'`); + queue.push(state); + return states; + } + else if (orphanIdx < 0) { + orphans.push(state); + } + queue.push(state); + } + if (registered.length) { + this.listeners.forEach(function (listener) { return listener("registered", registered.map(function (s) { return s.self; })); }); + } + return states; + }; + StateQueueManager.prototype.attachRoute = function (state) { + if (state.abstract || !state.url) + return; + this.$urlRouter.rule(this.$urlRouter.urlRuleFactory.create(state)); + }; + return StateQueueManager; +}()); + +/** + * @coreapi + * @module state + */ /** for typedoc */ +var StateRegistry = /** @class */ (function () { + /** @internalapi */ + function StateRegistry(_router) { + this._router = _router; + this.states = {}; + this.listeners = []; + this.matcher = new StateMatcher(this.states); + this.builder = new StateBuilder(this.matcher, _router.urlMatcherFactory); + this.stateQueue = new StateQueueManager(this, _router.urlRouter, this.states, this.builder, this.listeners); + this._registerRoot(); + } + /** @internalapi */ + StateRegistry.prototype._registerRoot = function () { + var rootStateDef = { + name: '', + url: '^', + views: null, + params: { + '#': { value: null, type: 'hash', dynamic: true } + }, + abstract: true + }; + var _root = this._root = this.stateQueue.register(rootStateDef); + _root.navigable = null; + }; + /** @internalapi */ + StateRegistry.prototype.dispose = function () { + var _this = this; + this.stateQueue.dispose(); + this.listeners = []; + this.get().forEach(function (state) { return _this.get(state) && _this.deregister(state); }); + }; + /** + * Listen for a State Registry events + * + * Adds a callback that is invoked when states are registered or deregistered with the StateRegistry. + * + * #### Example: + * ```js + * let allStates = registry.get(); + * + * // Later, invoke deregisterFn() to remove the listener + * let deregisterFn = registry.onStatesChanged((event, states) => { + * switch(event) { + * case: 'registered': + * states.forEach(state => allStates.push(state)); + * break; + * case: 'deregistered': + * states.forEach(state => { + * let idx = allStates.indexOf(state); + * if (idx !== -1) allStates.splice(idx, 1); + * }); + * break; + * } + * }); + * ``` + * + * @param listener a callback function invoked when the registered states changes. + * The function receives two parameters, `event` and `state`. + * See [[StateRegistryListener]] + * @return a function that deregisters the listener + */ + StateRegistry.prototype.onStatesChanged = function (listener) { + this.listeners.push(listener); + return function deregisterListener() { + removeFrom(this.listeners)(listener); + }.bind(this); + }; + /** + * Gets the implicit root state + * + * Gets the root of the state tree. + * The root state is implicitly created by UI-Router. + * Note: this returns the internal [[StateObject]] representation, not a [[StateDeclaration]] + * + * @return the root [[StateObject]] + */ + StateRegistry.prototype.root = function () { + return this._root; + }; + /** + * Adds a state to the registry + * + * Registers a [[StateDeclaration]] or queues it for registration. + * + * Note: a state will be queued if the state's parent isn't yet registered. + * + * @param stateDefinition the definition of the state to register. + * @returns the internal [[StateObject]] object. + * If the state was successfully registered, then the object is fully built (See: [[StateBuilder]]). + * If the state was only queued, then the object is not fully built. + */ + StateRegistry.prototype.register = function (stateDefinition) { + return this.stateQueue.register(stateDefinition); + }; + /** @hidden */ + StateRegistry.prototype._deregisterTree = function (state) { + var _this = this; + var all$$1 = this.get().map(function (s) { return s.$$state(); }); + var getChildren = function (states) { + var children = all$$1.filter(function (s) { return states.indexOf(s.parent) !== -1; }); + return children.length === 0 ? children : children.concat(getChildren(children)); + }; + var children = getChildren([state]); + var deregistered = [state].concat(children).reverse(); + deregistered.forEach(function (state) { + var $ur = _this._router.urlRouter; + // Remove URL rule + $ur.rules().filter(propEq("state", state)).forEach($ur.removeRule.bind($ur)); + // Remove state from registry + delete _this.states[state.name]; + }); + return deregistered; + }; + /** + * Removes a state from the registry + * + * This removes a state from the registry. + * If the state has children, they are are also removed from the registry. + * + * @param stateOrName the state's name or object representation + * @returns {StateObject[]} a list of removed states + */ + StateRegistry.prototype.deregister = function (stateOrName) { + var _state = this.get(stateOrName); + if (!_state) + throw new Error("Can't deregister state; not found: " + stateOrName); + var deregisteredStates = this._deregisterTree(_state.$$state()); + this.listeners.forEach(function (listener) { return listener("deregistered", deregisteredStates.map(function (s) { return s.self; })); }); + return deregisteredStates; + }; + StateRegistry.prototype.get = function (stateOrName, base) { + var _this = this; + if (arguments.length === 0) + return Object.keys(this.states).map(function (name) { return _this.states[name].self; }); + var found = this.matcher.find(stateOrName, base); + return found && found.self || null; + }; + StateRegistry.prototype.decorator = function (name, func) { + return this.builder.builder(name, func); + }; + return StateRegistry; +}()); + +/** + * @coreapi + * @module url + */ +/** for typedoc */ +/** @hidden */ +function quoteRegExp(string, param) { + var surroundPattern = ['', ''], result = string.replace(/[\\\[\]\^$*+?.()|{}]/g, "\\$&"); + if (!param) + return result; + switch (param.squash) { + case false: + surroundPattern = ['(', ')' + (param.isOptional ? '?' : '')]; + break; + case true: + result = result.replace(/\/$/, ''); + surroundPattern = ['(?:\/(', ')|\/)?']; + break; + default: + surroundPattern = ["(" + param.squash + "|", ')?']; + break; + } + return result + surroundPattern[0] + param.type.pattern.source + surroundPattern[1]; +} +/** @hidden */ +var memoizeTo = function (obj, prop$$1, fn) { + return obj[prop$$1] = obj[prop$$1] || fn(); +}; +/** @hidden */ +var splitOnSlash = splitOnDelim('/'); +/** + * Matches URLs against patterns. + * + * Matches URLs against patterns and extracts named parameters from the path or the search + * part of the URL. + * + * A URL pattern consists of a path pattern, optionally followed by '?' and a list of search (query) + * parameters. Multiple search parameter names are separated by '&'. Search parameters + * do not influence whether or not a URL is matched, but their values are passed through into + * the matched parameters returned by [[UrlMatcher.exec]]. + * + * - *Path parameters* are defined using curly brace placeholders (`/somepath/{param}`) + * or colon placeholders (`/somePath/:param`). + * + * - *A parameter RegExp* may be defined for a param after a colon + * (`/somePath/{param:[a-zA-Z0-9]+}`) in a curly brace placeholder. + * The regexp must match for the url to be matched. + * Should the regexp itself contain curly braces, they must be in matched pairs or escaped with a backslash. + * + * Note: a RegExp parameter will encode its value using either [[ParamTypes.path]] or [[ParamTypes.query]]. + * + * - *Custom parameter types* may also be specified after a colon (`/somePath/{param:int}`) in curly brace parameters. + * See [[UrlMatcherFactory.type]] for more information. + * + * - *Catch-all parameters* are defined using an asterisk placeholder (`/somepath/*catchallparam`). + * A catch-all * parameter value will contain the remainder of the URL. + * + * --- + * + * Parameter names may contain only word characters (latin letters, digits, and underscore) and + * must be unique within the pattern (across both path and search parameters). + * A path parameter matches any number of characters other than '/'. For catch-all + * placeholders the path parameter matches any number of characters. + * + * Examples: + * + * * `'/hello/'` - Matches only if the path is exactly '/hello/'. There is no special treatment for + * trailing slashes, and patterns have to match the entire path, not just a prefix. + * * `'/user/:id'` - Matches '/user/bob' or '/user/1234!!!' or even '/user/' but not '/user' or + * '/user/bob/details'. The second path segment will be captured as the parameter 'id'. + * * `'/user/{id}'` - Same as the previous example, but using curly brace syntax. + * * `'/user/{id:[^/]*}'` - Same as the previous example. + * * `'/user/{id:[0-9a-fA-F]{1,8}}'` - Similar to the previous example, but only matches if the id + * parameter consists of 1 to 8 hex digits. + * * `'/files/{path:.*}'` - Matches any URL starting with '/files/' and captures the rest of the + * path into the parameter 'path'. + * * `'/files/*path'` - ditto. + * * `'/calendar/{start:date}'` - Matches "/calendar/2014-11-12" (because the pattern defined + * in the built-in `date` ParamType matches `2014-11-12`) and provides a Date object in $stateParams.start + * + */ +var UrlMatcher = /** @class */ (function () { + /** + * @param pattern The pattern to compile into a matcher. + * @param paramTypes The [[ParamTypes]] registry + * @param config A configuration object + * - `caseInsensitive` - `true` if URL matching should be case insensitive, otherwise `false`, the default value (for backward compatibility) is `false`. + * - `strict` - `false` if matching against a URL with a trailing slash should be treated as equivalent to a URL without a trailing slash, the default value is `true`. + */ + function UrlMatcher(pattern$$1, paramTypes, paramFactory, config) { + var _this = this; + this.config = config; + /** @hidden */ + this._cache = { path: [this] }; + /** @hidden */ + this._children = []; + /** @hidden */ + this._params = []; + /** @hidden */ + this._segments = []; + /** @hidden */ + this._compiled = []; + this.pattern = pattern$$1; + this.config = defaults(this.config, { + params: {}, + strict: true, + caseInsensitive: false, + paramMap: identity + }); + // Find all placeholders and create a compiled pattern, using either classic or curly syntax: + // '*' name + // ':' name + // '{' name '}' + // '{' name ':' regexp '}' + // The regular expression is somewhat complicated due to the need to allow curly braces + // inside the regular expression. The placeholder regexp breaks down as follows: + // ([:*])([\w\[\]]+) - classic placeholder ($1 / $2) (search version has - for snake-case) + // \{([\w\[\]]+)(?:\:\s*( ... ))?\} - curly brace placeholder ($3) with optional regexp/type ... ($4) (search version has - for snake-case + // (?: ... | ... | ... )+ - the regexp consists of any number of atoms, an atom being either + // [^{}\\]+ - anything other than curly braces or backslash + // \\. - a backslash escape + // \{(?:[^{}\\]+|\\.)*\} - a matched set of curly braces containing other atoms + var placeholder = /([:*])([\w\[\]]+)|\{([\w\[\]]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g, searchPlaceholder = /([:]?)([\w\[\].-]+)|\{([\w\[\].-]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g, last = 0, m, patterns = []; + var checkParamErrors = function (id) { + if (!UrlMatcher.nameValidator.test(id)) + throw new Error("Invalid parameter name '" + id + "' in pattern '" + pattern$$1 + "'"); + if (find(_this._params, propEq('id', id))) + throw new Error("Duplicate parameter name '" + id + "' in pattern '" + pattern$$1 + "'"); + }; + // Split into static segments separated by path parameter placeholders. + // The number of segments is always 1 more than the number of parameters. + var matchDetails = function (m, isSearch) { + // IE[78] returns '' for unmatched groups instead of null + var id = m[2] || m[3]; + var regexp = isSearch ? m[4] : m[4] || (m[1] === '*' ? '[\\s\\S]*' : null); + var makeRegexpType = function (regexp) { return inherit(paramTypes.type(isSearch ? "query" : "path"), { + pattern: new RegExp(regexp, _this.config.caseInsensitive ? 'i' : undefined) + }); }; + return { + id: id, + regexp: regexp, + cfg: _this.config.params[id], + segment: pattern$$1.substring(last, m.index), + type: !regexp ? null : paramTypes.type(regexp) || makeRegexpType(regexp) + }; + }; + var p, segment; + while ((m = placeholder.exec(pattern$$1))) { + p = matchDetails(m, false); + if (p.segment.indexOf('?') >= 0) + break; // we're into the search part + checkParamErrors(p.id); + this._params.push(paramFactory.fromPath(p.id, p.type, this.config.paramMap(p.cfg, false))); + this._segments.push(p.segment); + patterns.push([p.segment, tail(this._params)]); + last = placeholder.lastIndex; + } + segment = pattern$$1.substring(last); + // Find any search parameter names and remove them from the last segment + var i = segment.indexOf('?'); + if (i >= 0) { + var search = segment.substring(i); + segment = segment.substring(0, i); + if (search.length > 0) { + last = 0; + while ((m = searchPlaceholder.exec(search))) { + p = matchDetails(m, true); + checkParamErrors(p.id); + this._params.push(paramFactory.fromSearch(p.id, p.type, this.config.paramMap(p.cfg, true))); + last = placeholder.lastIndex; + // check if ?& + } + } + } + this._segments.push(segment); + this._compiled = patterns.map(function (pattern$$1) { return quoteRegExp.apply(null, pattern$$1); }).concat(quoteRegExp(segment)); + } + /** + * Creates a new concatenated UrlMatcher + * + * Builds a new UrlMatcher by appending another UrlMatcher to this one. + * + * @param url A `UrlMatcher` instance to append as a child of the current `UrlMatcher`. + */ + UrlMatcher.prototype.append = function (url) { + this._children.push(url); + url._cache = { + path: this._cache.path.concat(url), + parent: this, + pattern: null, + }; + return url; + }; + /** @hidden */ + UrlMatcher.prototype.isRoot = function () { + return this._cache.path[0] === this; + }; + /** Returns the input pattern string */ + UrlMatcher.prototype.toString = function () { + return this.pattern; + }; + /** + * Tests the specified url/path against this matcher. + * + * Tests if the given url matches this matcher's pattern, and returns an object containing the captured + * parameter values. Returns null if the path does not match. + * + * The returned object contains the values + * of any search parameters that are mentioned in the pattern, but their value may be null if + * they are not present in `search`. This means that search parameters are always treated + * as optional. + * + * #### Example: + * ```js + * new UrlMatcher('/user/{id}?q&r').exec('/user/bob', { + * x: '1', q: 'hello' + * }); + * // returns { id: 'bob', q: 'hello', r: null } + * ``` + * + * @param path The URL path to match, e.g. `$location.path()`. + * @param search URL search parameters, e.g. `$location.search()`. + * @param hash URL hash e.g. `$location.hash()`. + * @param options + * + * @returns The captured parameter values. + */ + UrlMatcher.prototype.exec = function (path, search, hash, options) { + var _this = this; + if (search === void 0) { search = {}; } + if (options === void 0) { options = {}; } + var match = memoizeTo(this._cache, 'pattern', function () { + return new RegExp([ + '^', + unnest(_this._cache.path.map(prop('_compiled'))).join(''), + _this.config.strict === false ? '\/?' : '', + '$' + ].join(''), _this.config.caseInsensitive ? 'i' : undefined); + }).exec(path); + if (!match) + return null; + //options = defaults(options, { isolate: false }); + var allParams = this.parameters(), pathParams = allParams.filter(function (param) { return !param.isSearch(); }), searchParams = allParams.filter(function (param) { return param.isSearch(); }), nPathSegments = this._cache.path.map(function (urlm) { return urlm._segments.length - 1; }).reduce(function (a, x) { return a + x; }), values$$1 = {}; + if (nPathSegments !== match.length - 1) + throw new Error("Unbalanced capture group in route '" + this.pattern + "'"); + function decodePathArray(string) { + var reverseString = function (str) { return str.split("").reverse().join(""); }; + var unquoteDashes = function (str) { return str.replace(/\\-/g, "-"); }; + var split = reverseString(string).split(/-(?!\\)/); + var allReversed = map(split, reverseString); + return map(allReversed, unquoteDashes).reverse(); + } + for (var i = 0; i < nPathSegments; i++) { + var param = pathParams[i]; + var value = match[i + 1]; + // if the param value matches a pre-replace pair, replace the value before decoding. + for (var j = 0; j < param.replace.length; j++) { + if (param.replace[j].from === value) + value = param.replace[j].to; + } + if (value && param.array === true) + value = decodePathArray(value); + if (isDefined(value)) + value = param.type.decode(value); + values$$1[param.id] = param.value(value); + } + searchParams.forEach(function (param) { + var value = search[param.id]; + for (var j = 0; j < param.replace.length; j++) { + if (param.replace[j].from === value) + value = param.replace[j].to; + } + if (isDefined(value)) + value = param.type.decode(value); + values$$1[param.id] = param.value(value); + }); + if (hash) + values$$1["#"] = hash; + return values$$1; + }; + /** + * @hidden + * Returns all the [[Param]] objects of all path and search parameters of this pattern in order of appearance. + * + * @returns {Array.} An array of [[Param]] objects. Must be treated as read-only. If the + * pattern has no parameters, an empty array is returned. + */ + UrlMatcher.prototype.parameters = function (opts) { + if (opts === void 0) { opts = {}; } + if (opts.inherit === false) + return this._params; + return unnest(this._cache.path.map(function (matcher) { return matcher._params; })); + }; + /** + * @hidden + * Returns a single parameter from this UrlMatcher by id + * + * @param id + * @param opts + * @returns {T|Param|any|boolean|UrlMatcher|null} + */ + UrlMatcher.prototype.parameter = function (id, opts) { + var _this = this; + if (opts === void 0) { opts = {}; } + var findParam = function () { + for (var _i = 0, _a = _this._params; _i < _a.length; _i++) { + var param = _a[_i]; + if (param.id === id) + return param; + } + }; + var parent = this._cache.parent; + return findParam() || (opts.inherit !== false && parent && parent.parameter(id, opts)) || null; + }; + /** + * Validates the input parameter values against this UrlMatcher + * + * Checks an object hash of parameters to validate their correctness according to the parameter + * types of this `UrlMatcher`. + * + * @param params The object hash of parameters to validate. + * @returns Returns `true` if `params` validates, otherwise `false`. + */ + UrlMatcher.prototype.validates = function (params) { + var validParamVal = function (param, val$$1) { + return !param || param.validates(val$$1); + }; + params = params || {}; + // I'm not sure why this checks only the param keys passed in, and not all the params known to the matcher + var paramSchema = this.parameters().filter(function (paramDef) { return params.hasOwnProperty(paramDef.id); }); + return paramSchema.map(function (paramDef) { return validParamVal(paramDef, params[paramDef.id]); }).reduce(allTrueR, true); + }; + /** + * Given a set of parameter values, creates a URL from this UrlMatcher. + * + * Creates a URL that matches this pattern by substituting the specified values + * for the path and search parameters. + * + * #### Example: + * ```js + * new UrlMatcher('/user/{id}?q').format({ id:'bob', q:'yes' }); + * // returns '/user/bob?q=yes' + * ``` + * + * @param values the values to substitute for the parameters in this pattern. + * @returns the formatted URL (path and optionally search part). + */ + UrlMatcher.prototype.format = function (values$$1) { + if (values$$1 === void 0) { values$$1 = {}; } + // Build the full path of UrlMatchers (including all parent UrlMatchers) + var urlMatchers = this._cache.path; + // Extract all the static segments and Params (processed as ParamDetails) + // into an ordered array + var pathSegmentsAndParams = urlMatchers.map(UrlMatcher.pathSegmentsAndParams) + .reduce(unnestR, []) + .map(function (x) { return isString(x) ? x : getDetails(x); }); + // Extract the query params into a separate array + var queryParams = urlMatchers.map(UrlMatcher.queryParams) + .reduce(unnestR, []) + .map(getDetails); + var isInvalid = function (param) { return param.isValid === false; }; + if (pathSegmentsAndParams.concat(queryParams).filter(isInvalid).length) { + return null; + } + /** + * Given a Param, applies the parameter value, then returns detailed information about it + */ + function getDetails(param) { + // Normalize to typed value + var value = param.value(values$$1[param.id]); + var isValid = param.validates(value); + var isDefaultValue = param.isDefaultValue(value); + // Check if we're in squash mode for the parameter + var squash = isDefaultValue ? param.squash : false; + // Allow the Parameter's Type to encode the value + var encoded = param.type.encode(value); + return { param: param, value: value, isValid: isValid, isDefaultValue: isDefaultValue, squash: squash, encoded: encoded }; + } + // Build up the path-portion from the list of static segments and parameters + var pathString = pathSegmentsAndParams.reduce(function (acc, x) { + // The element is a static segment (a raw string); just append it + if (isString(x)) + return acc + x; + // Otherwise, it's a ParamDetails. + var squash = x.squash, encoded = x.encoded, param = x.param; + // If squash is === true, try to remove a slash from the path + if (squash === true) + return (acc.match(/\/$/)) ? acc.slice(0, -1) : acc; + // If squash is a string, use the string for the param value + if (isString(squash)) + return acc + squash; + if (squash !== false) + return acc; // ? + if (encoded == null) + return acc; + // If this parameter value is an array, encode the value using encodeDashes + if (isArray(encoded)) + return acc + map(encoded, UrlMatcher.encodeDashes).join("-"); + // If the parameter type is "raw", then do not encodeURIComponent + if (param.raw) + return acc + encoded; + // Encode the value + return acc + encodeURIComponent(encoded); + }, ""); + // Build the query string by applying parameter values (array or regular) + // then mapping to key=value, then flattening and joining using "&" + var queryString = queryParams.map(function (paramDetails) { + var param = paramDetails.param, squash = paramDetails.squash, encoded = paramDetails.encoded, isDefaultValue = paramDetails.isDefaultValue; + if (encoded == null || (isDefaultValue && squash !== false)) + return; + if (!isArray(encoded)) + encoded = [encoded]; + if (encoded.length === 0) + return; + if (!param.raw) + encoded = map(encoded, encodeURIComponent); + return encoded.map(function (val$$1) { return param.id + "=" + val$$1; }); + }).filter(identity).reduce(unnestR, []).join("&"); + // Concat the pathstring with the queryString (if exists) and the hashString (if exists) + return pathString + (queryString ? "?" + queryString : "") + (values$$1["#"] ? "#" + values$$1["#"] : ""); + }; + /** @hidden */ + UrlMatcher.encodeDashes = function (str) { + return encodeURIComponent(str).replace(/-/g, function (c) { return "%5C%" + c.charCodeAt(0).toString(16).toUpperCase(); }); + }; + /** @hidden Given a matcher, return an array with the matcher's path segments and path params, in order */ + UrlMatcher.pathSegmentsAndParams = function (matcher) { + var staticSegments = matcher._segments; + var pathParams = matcher._params.filter(function (p) { return p.location === exports.DefType.PATH; }); + return arrayTuples(staticSegments, pathParams.concat(undefined)) + .reduce(unnestR, []) + .filter(function (x) { return x !== "" && isDefined(x); }); + }; + /** @hidden Given a matcher, return an array with the matcher's query params */ + UrlMatcher.queryParams = function (matcher) { + return matcher._params.filter(function (p) { return p.location === exports.DefType.SEARCH; }); + }; + /** + * Compare two UrlMatchers + * + * This comparison function converts a UrlMatcher into static and dynamic path segments. + * Each static path segment is a static string between a path separator (slash character). + * Each dynamic segment is a path parameter. + * + * The comparison function sorts static segments before dynamic ones. + */ + UrlMatcher.compare = function (a, b) { + /** + * Turn a UrlMatcher and all its parent matchers into an array + * of slash literals '/', string literals, and Param objects + * + * This example matcher matches strings like "/foo/:param/tail": + * var matcher = $umf.compile("/foo").append($umf.compile("/:param")).append($umf.compile("/")).append($umf.compile("tail")); + * var result = segments(matcher); // [ '/', 'foo', '/', Param, '/', 'tail' ] + * + * Caches the result as `matcher._cache.segments` + */ + var segments = function (matcher) { + return matcher._cache.segments = matcher._cache.segments || + matcher._cache.path.map(UrlMatcher.pathSegmentsAndParams) + .reduce(unnestR, []) + .reduce(joinNeighborsR, []) + .map(function (x) { return isString(x) ? splitOnSlash(x) : x; }) + .reduce(unnestR, []); + }; + /** + * Gets the sort weight for each segment of a UrlMatcher + * + * Caches the result as `matcher._cache.weights` + */ + var weights = function (matcher) { + return matcher._cache.weights = matcher._cache.weights || + segments(matcher).map(function (segment) { + // Sort slashes first, then static strings, the Params + if (segment === '/') + return 1; + if (isString(segment)) + return 2; + if (segment instanceof Param) + return 3; + }); + }; + /** + * Pads shorter array in-place (mutates) + */ + var padArrays = function (l, r, padVal) { + var len = Math.max(l.length, r.length); + while (l.length < len) + l.push(padVal); + while (r.length < len) + r.push(padVal); + }; + var weightsA = weights(a), weightsB = weights(b); + padArrays(weightsA, weightsB, 0); + var cmp, i, pairs$$1 = arrayTuples(weightsA, weightsB); + for (i = 0; i < pairs$$1.length; i++) { + cmp = pairs$$1[i][0] - pairs$$1[i][1]; + if (cmp !== 0) + return cmp; + } + return 0; + }; + /** @hidden */ + UrlMatcher.nameValidator = /^\w+([-.]+\w+)*(?:\[\])?$/; + return UrlMatcher; +}()); + +/** + * @internalapi + * @module url + */ /** for typedoc */ +/** + * Factory for [[UrlMatcher]] instances. + * + * The factory is available to ng1 services as + * `$urlMatcherFactory` or ng1 providers as `$urlMatcherFactoryProvider`. + */ +var UrlMatcherFactory = /** @class */ (function () { + function UrlMatcherFactory() { + var _this = this; + /** @hidden */ this.paramTypes = new ParamTypes(); + /** @hidden */ this._isCaseInsensitive = false; + /** @hidden */ this._isStrictMode = true; + /** @hidden */ this._defaultSquashPolicy = false; + /** @hidden */ + this._getConfig = function (config) { + return extend({ strict: _this._isStrictMode, caseInsensitive: _this._isCaseInsensitive }, config); + }; + /** @internalapi Creates a new [[Param]] for a given location (DefType) */ + this.paramFactory = { + /** Creates a new [[Param]] from a CONFIG block */ + fromConfig: function (id, type, config) { + return new Param(id, type, config, exports.DefType.CONFIG, _this); + }, + /** Creates a new [[Param]] from a url PATH */ + fromPath: function (id, type, config) { + return new Param(id, type, config, exports.DefType.PATH, _this); + }, + /** Creates a new [[Param]] from a url SEARCH */ + fromSearch: function (id, type, config) { + return new Param(id, type, config, exports.DefType.SEARCH, _this); + }, + }; + extend(this, { UrlMatcher: UrlMatcher, Param: Param }); + } + /** @inheritdoc */ + UrlMatcherFactory.prototype.caseInsensitive = function (value) { + return this._isCaseInsensitive = isDefined(value) ? value : this._isCaseInsensitive; + }; + /** @inheritdoc */ + UrlMatcherFactory.prototype.strictMode = function (value) { + return this._isStrictMode = isDefined(value) ? value : this._isStrictMode; + }; + /** @inheritdoc */ + UrlMatcherFactory.prototype.defaultSquashPolicy = function (value) { + if (isDefined(value) && value !== true && value !== false && !isString(value)) + throw new Error("Invalid squash policy: " + value + ". Valid policies: false, true, arbitrary-string"); + return this._defaultSquashPolicy = isDefined(value) ? value : this._defaultSquashPolicy; + }; + /** + * Creates a [[UrlMatcher]] for the specified pattern. + * + * @param pattern The URL pattern. + * @param config The config object hash. + * @returns The UrlMatcher. + */ + UrlMatcherFactory.prototype.compile = function (pattern, config) { + return new UrlMatcher(pattern, this.paramTypes, this.paramFactory, this._getConfig(config)); + }; + /** + * Returns true if the specified object is a [[UrlMatcher]], or false otherwise. + * + * @param object The object to perform the type check against. + * @returns `true` if the object matches the `UrlMatcher` interface, by + * implementing all the same methods. + */ + UrlMatcherFactory.prototype.isMatcher = function (object) { + // TODO: typeof? + if (!isObject(object)) + return false; + var result = true; + forEach(UrlMatcher.prototype, function (val, name) { + if (isFunction(val)) + result = result && (isDefined(object[name]) && isFunction(object[name])); + }); + return result; + }; + + /** + * Creates and registers a custom [[ParamType]] object + * + * A [[ParamType]] can be used to generate URLs with typed parameters. + * + * @param name The type name. + * @param definition The type definition. See [[ParamTypeDefinition]] for information on the values accepted. + * @param definitionFn A function that is injected before the app runtime starts. + * The result of this function should be a [[ParamTypeDefinition]]. + * The result is merged into the existing `definition`. + * See [[ParamType]] for information on the values accepted. + * + * @returns - if a type was registered: the [[UrlMatcherFactory]] + * - if only the `name` parameter was specified: the currently registered [[ParamType]] object, or undefined + * + * Note: Register custom types *before using them* in a state definition. + * + * See [[ParamTypeDefinition]] for examples + */ + UrlMatcherFactory.prototype.type = function (name, definition, definitionFn) { + var type = this.paramTypes.type(name, definition, definitionFn); + return !isDefined(definition) ? type : this; + }; + + /** @hidden */ + UrlMatcherFactory.prototype.$get = function () { + this.paramTypes.enqueue = false; + this.paramTypes._flushTypeQueue(); + return this; + }; + + /** @internalapi */ + UrlMatcherFactory.prototype.dispose = function () { + this.paramTypes.dispose(); + }; + return UrlMatcherFactory; +}()); + +/** + * @coreapi + * @module url + */ /** */ +/** + * Creates a [[UrlRule]] + * + * Creates a [[UrlRule]] from a: + * + * - `string` + * - [[UrlMatcher]] + * - `RegExp` + * - [[StateObject]] + * @internalapi + */ +var UrlRuleFactory = /** @class */ (function () { + function UrlRuleFactory(router) { + this.router = router; + } + UrlRuleFactory.prototype.compile = function (str) { + return this.router.urlMatcherFactory.compile(str); + }; + UrlRuleFactory.prototype.create = function (what, handler) { + var _this = this; + var makeRule = pattern([ + [isString, function (_what) { return makeRule(_this.compile(_what)); }], + [is(UrlMatcher), function (_what) { return _this.fromUrlMatcher(_what, handler); }], + [isState, function (_what) { return _this.fromState(_what, _this.router); }], + [is(RegExp), function (_what) { return _this.fromRegExp(_what, handler); }], + [isFunction, function (_what) { return new BaseUrlRule(_what, handler); }], + ]); + var rule = makeRule(what); + if (!rule) + throw new Error("invalid 'what' in when()"); + return rule; + }; + /** + * A UrlRule which matches based on a UrlMatcher + * + * The `handler` may be either a `string`, a [[UrlRuleHandlerFn]] or another [[UrlMatcher]] + * + * ## Handler as a function + * + * If `handler` is a function, the function is invoked with: + * + * - matched parameter values ([[RawParams]] from [[UrlMatcher.exec]]) + * - url: the current Url ([[UrlParts]]) + * - router: the router object ([[UIRouter]]) + * + * #### Example: + * ```js + * var urlMatcher = $umf.compile("/foo/:fooId/:barId"); + * var rule = factory.fromUrlMatcher(urlMatcher, match => "/home/" + match.fooId + "/" + match.barId); + * var match = rule.match('/foo/123/456'); // results in { fooId: '123', barId: '456' } + * var result = rule.handler(match); // '/home/123/456' + * ``` + * + * ## Handler as UrlMatcher + * + * If `handler` is a UrlMatcher, the handler matcher is used to create the new url. + * The `handler` UrlMatcher is formatted using the matched param from the first matcher. + * The url is replaced with the result. + * + * #### Example: + * ```js + * var urlMatcher = $umf.compile("/foo/:fooId/:barId"); + * var handler = $umf.compile("/home/:fooId/:barId"); + * var rule = factory.fromUrlMatcher(urlMatcher, handler); + * var match = rule.match('/foo/123/456'); // results in { fooId: '123', barId: '456' } + * var result = rule.handler(match); // '/home/123/456' + * ``` + */ + UrlRuleFactory.prototype.fromUrlMatcher = function (urlMatcher, handler) { + var _handler = handler; + if (isString(handler)) + handler = this.router.urlMatcherFactory.compile(handler); + if (is(UrlMatcher)(handler)) + _handler = function (match) { return handler.format(match); }; + function match(url) { + var match = urlMatcher.exec(url.path, url.search, url.hash); + return urlMatcher.validates(match) && match; + } + // Prioritize URLs, lowest to highest: + // - Some optional URL parameters, but none matched + // - No optional parameters in URL + // - Some optional parameters, some matched + // - Some optional parameters, all matched + function matchPriority(params) { + var optional = urlMatcher.parameters().filter(function (param) { return param.isOptional; }); + if (!optional.length) + return 0.000001; + var matched = optional.filter(function (param) { return params[param.id]; }); + return matched.length / optional.length; + } + var details = { urlMatcher: urlMatcher, matchPriority: matchPriority, type: "URLMATCHER" }; + return extend(new BaseUrlRule(match, _handler), details); + }; + /** + * A UrlRule which matches a state by its url + * + * #### Example: + * ```js + * var rule = factory.fromState($state.get('foo'), router); + * var match = rule.match('/foo/123/456'); // results in { fooId: '123', barId: '456' } + * var result = rule.handler(match); + * // Starts a transition to 'foo' with params: { fooId: '123', barId: '456' } + * ``` + */ + UrlRuleFactory.prototype.fromState = function (state, router) { + /** + * Handles match by transitioning to matched state + * + * First checks if the router should start a new transition. + * A new transition is not required if the current state's URL + * and the new URL are already identical + */ + var handler = function (match) { + var $state = router.stateService; + var globals = router.globals; + if ($state.href(state, match) !== $state.href(globals.current, globals.params)) { + $state.transitionTo(state, match, { inherit: true, source: "url" }); + } + }; + var details = { state: state, type: "STATE" }; + return extend(this.fromUrlMatcher(state.url, handler), details); + }; + /** + * A UrlRule which matches based on a regular expression + * + * The `handler` may be either a [[UrlRuleHandlerFn]] or a string. + * + * ## Handler as a function + * + * If `handler` is a function, the function is invoked with: + * + * - regexp match array (from `regexp`) + * - url: the current Url ([[UrlParts]]) + * - router: the router object ([[UIRouter]]) + * + * #### Example: + * ```js + * var rule = factory.fromRegExp(/^\/foo\/(bar|baz)$/, match => "/home/" + match[1]) + * var match = rule.match('/foo/bar'); // results in [ '/foo/bar', 'bar' ] + * var result = rule.handler(match); // '/home/bar' + * ``` + * + * ## Handler as string + * + * If `handler` is a string, the url is *replaced by the string* when the Rule is invoked. + * The string is first interpolated using `string.replace()` style pattern. + * + * #### Example: + * ```js + * var rule = factory.fromRegExp(/^\/foo\/(bar|baz)$/, "/home/$1") + * var match = rule.match('/foo/bar'); // results in [ '/foo/bar', 'bar' ] + * var result = rule.handler(match); // '/home/bar' + * ``` + */ + UrlRuleFactory.prototype.fromRegExp = function (regexp, handler) { + if (regexp.global || regexp.sticky) + throw new Error("Rule RegExp must not be global or sticky"); + /** + * If handler is a string, the url will be replaced by the string. + * If the string has any String.replace() style variables in it (like `$2`), + * they will be replaced by the captures from [[match]] + */ + var redirectUrlTo = function (match) { + // Interpolates matched values into $1 $2, etc using a String.replace()-style pattern + return handler.replace(/\$(\$|\d{1,2})/, function (m, what) { + return match[what === '$' ? 0 : Number(what)]; + }); + }; + var _handler = isString(handler) ? redirectUrlTo : handler; + var match = function (url) { + return regexp.exec(url.path); + }; + var details = { regexp: regexp, type: "REGEXP" }; + return extend(new BaseUrlRule(match, _handler), details); + }; + UrlRuleFactory.isUrlRule = function (obj) { + return obj && ['type', 'match', 'handler'].every(function (key) { return isDefined(obj[key]); }); + }; + return UrlRuleFactory; +}()); +/** + * A base rule which calls `match` + * + * The value from the `match` function is passed through to the `handler`. + * @internalapi + */ +var BaseUrlRule = /** @class */ (function () { + function BaseUrlRule(match, handler) { + var _this = this; + this.match = match; + this.type = "RAW"; + this.matchPriority = function (match) { return 0 - _this.$id; }; + this.handler = handler || identity; + } + return BaseUrlRule; +}()); + +/** + * @internalapi + * @module url + */ +/** for typedoc */ +/** @hidden */ +function appendBasePath(url, isHtml5, absolute, baseHref) { + if (baseHref === '/') + return url; + if (isHtml5) + return stripFile(baseHref) + url; + if (absolute) + return baseHref.slice(1) + url; + return url; +} +/** @hidden */ +var prioritySort = function (a, b) { + return (b.priority || 0) - (a.priority || 0); +}; +/** @hidden */ +var typeSort = function (a, b) { + var weights = { "STATE": 4, "URLMATCHER": 4, "REGEXP": 3, "RAW": 2, "OTHER": 1 }; + return (weights[a.type] || 0) - (weights[b.type] || 0); +}; +/** @hidden */ +var urlMatcherSort = function (a, b) { + return !a.urlMatcher || !b.urlMatcher ? 0 : UrlMatcher.compare(a.urlMatcher, b.urlMatcher); +}; +/** @hidden */ +var idSort = function (a, b) { + // Identically sorted STATE and URLMATCHER best rule will be chosen by `matchPriority` after each rule matches the URL + var useMatchPriority = { STATE: true, URLMATCHER: true }; + var equal = useMatchPriority[a.type] && useMatchPriority[b.type]; + return equal ? 0 : (a.$id || 0) - (b.$id || 0); +}; +/** + * Default rule priority sorting function. + * + * Sorts rules by: + * + * - Explicit priority (set rule priority using [[UrlRulesApi.when]]) + * - Rule type (STATE: 4, URLMATCHER: 4, REGEXP: 3, RAW: 2, OTHER: 1) + * - `UrlMatcher` specificity ([[UrlMatcher.compare]]): works for STATE and URLMATCHER types to pick the most specific rule. + * - Rule registration order (for rule types other than STATE and URLMATCHER) + * - Equally sorted State and UrlMatcher rules will each match the URL. + * Then, the *best* match is chosen based on how many parameter values were matched. + * + * @coreapi + */ +var defaultRuleSortFn; +defaultRuleSortFn = function (a, b) { + var cmp = prioritySort(a, b); + if (cmp !== 0) + return cmp; + cmp = typeSort(a, b); + if (cmp !== 0) + return cmp; + cmp = urlMatcherSort(a, b); + if (cmp !== 0) + return cmp; + return idSort(a, b); +}; +/** + * Updates URL and responds to URL changes + * + * ### Deprecation warning: + * This class is now considered to be an internal API + * Use the [[UrlService]] instead. + * For configuring URL rules, use the [[UrlRulesApi]] which can be found as [[UrlService.rules]]. + * + * This class updates the URL when the state changes. + * It also responds to changes in the URL. + */ +var UrlRouter = /** @class */ (function () { + /** @hidden */ + function UrlRouter(router) { + /** @hidden */ this._sortFn = defaultRuleSortFn; + /** @hidden */ this._rules = []; + /** @hidden */ this.interceptDeferred = false; + /** @hidden */ this._id = 0; + /** @hidden */ this._sorted = false; + this._router = router; + this.urlRuleFactory = new UrlRuleFactory(router); + createProxyFunctions(val(UrlRouter.prototype), this, val(this)); + } + /** @internalapi */ + UrlRouter.prototype.dispose = function () { + this.listen(false); + this._rules = []; + delete this._otherwiseFn; + }; + /** @inheritdoc */ + UrlRouter.prototype.sort = function (compareFn) { + this._rules = this.stableSort(this._rules, this._sortFn = compareFn || this._sortFn); + this._sorted = true; + }; + UrlRouter.prototype.ensureSorted = function () { + this._sorted || this.sort(); + }; + UrlRouter.prototype.stableSort = function (arr, compareFn) { + var arrOfWrapper = arr.map(function (elem, idx) { return ({ elem: elem, idx: idx }); }); + arrOfWrapper.sort(function (wrapperA, wrapperB) { + var cmpDiff = compareFn(wrapperA.elem, wrapperB.elem); + return cmpDiff === 0 + ? wrapperA.idx - wrapperB.idx + : cmpDiff; + }); + return arrOfWrapper.map(function (wrapper) { return wrapper.elem; }); + }; + /** + * Given a URL, check all rules and return the best [[MatchResult]] + * @param url + * @returns {MatchResult} + */ + UrlRouter.prototype.match = function (url) { + var _this = this; + this.ensureSorted(); + url = extend({ path: '', search: {}, hash: '' }, url); + var rules = this.rules(); + if (this._otherwiseFn) + rules.push(this._otherwiseFn); + // Checks a single rule. Returns { rule: rule, match: match, weight: weight } if it matched, or undefined + var checkRule = function (rule) { + var match = rule.match(url, _this._router); + return match && { match: match, rule: rule, weight: rule.matchPriority(match) }; + }; + // The rules are pre-sorted. + // - Find the first matching rule. + // - Find any other matching rule that sorted *exactly the same*, according to `.sort()`. + // - Choose the rule with the highest match weight. + var best; + for (var i = 0; i < rules.length; i++) { + // Stop when there is a 'best' rule and the next rule sorts differently than it. + if (best && this._sortFn(rules[i], best.rule) !== 0) + break; + var current = checkRule(rules[i]); + // Pick the best MatchResult + best = (!best || current && current.weight > best.weight) ? current : best; + } + return best; + }; + /** @inheritdoc */ + UrlRouter.prototype.sync = function (evt) { + if (evt && evt.defaultPrevented) + return; + var router = this._router, $url = router.urlService, $state = router.stateService; + var url = { + path: $url.path(), search: $url.search(), hash: $url.hash(), + }; + var best = this.match(url); + var applyResult = pattern([ + [isString, function (newurl) { return $url.url(newurl, true); }], + [TargetState.isDef, function (def) { return $state.go(def.state, def.params, def.options); }], + [is(TargetState), function (target) { return $state.go(target.state(), target.params(), target.options()); }], + ]); + applyResult(best && best.rule.handler(best.match, url, router)); + }; + /** @inheritdoc */ + UrlRouter.prototype.listen = function (enabled) { + var _this = this; + if (enabled === false) { + this._stopFn && this._stopFn(); + delete this._stopFn; + } + else { + return this._stopFn = this._stopFn || this._router.urlService.onChange(function (evt) { return _this.sync(evt); }); + } + }; + /** + * Internal API. + * @internalapi + */ + UrlRouter.prototype.update = function (read) { + var $url = this._router.locationService; + if (read) { + this.location = $url.path(); + return; + } + if ($url.path() === this.location) + return; + $url.url(this.location, true); + }; + /** + * Internal API. + * + * Pushes a new location to the browser history. + * + * @internalapi + * @param urlMatcher + * @param params + * @param options + */ + UrlRouter.prototype.push = function (urlMatcher, params, options) { + var replace = options && !!options.replace; + this._router.urlService.url(urlMatcher.format(params || {}), replace); + }; + /** + * Builds and returns a URL with interpolated parameters + * + * #### Example: + * ```js + * matcher = $umf.compile("/about/:person"); + * params = { person: "bob" }; + * $bob = $urlRouter.href(matcher, params); + * // $bob == "/about/bob"; + * ``` + * + * @param urlMatcher The [[UrlMatcher]] object which is used as the template of the URL to generate. + * @param params An object of parameter values to fill the matcher's required parameters. + * @param options Options object. The options are: + * + * - **`absolute`** - {boolean=false}, If true will generate an absolute url, e.g. "http://www.example.com/fullurl". + * + * @returns Returns the fully compiled URL, or `null` if `params` fail validation against `urlMatcher` + */ + UrlRouter.prototype.href = function (urlMatcher, params, options) { + var url = urlMatcher.format(params); + if (url == null) + return null; + options = options || { absolute: false }; + var cfg = this._router.urlService.config; + var isHtml5 = cfg.html5Mode(); + if (!isHtml5 && url !== null) { + url = "#" + cfg.hashPrefix() + url; + } + url = appendBasePath(url, isHtml5, options.absolute, cfg.baseHref()); + if (!options.absolute || !url) { + return url; + } + var slash = (!isHtml5 && url ? '/' : ''), port = cfg.port(); + port = (port === 80 || port === 443 ? '' : ':' + port); + return [cfg.protocol(), '://', cfg.host(), port, slash, url].join(''); + }; + /** + * Manually adds a URL Rule. + * + * Usually, a url rule is added using [[StateDeclaration.url]] or [[when]]. + * This api can be used directly for more control (to register a [[BaseUrlRule]], for example). + * Rules can be created using [[UrlRouter.urlRuleFactory]], or create manually as simple objects. + * + * A rule should have a `match` function which returns truthy if the rule matched. + * It should also have a `handler` function which is invoked if the rule is the best match. + * + * @return a function that deregisters the rule + */ + UrlRouter.prototype.rule = function (rule) { + var _this = this; + if (!UrlRuleFactory.isUrlRule(rule)) + throw new Error("invalid rule"); + rule.$id = this._id++; + rule.priority = rule.priority || 0; + this._rules.push(rule); + this._sorted = false; + return function () { return _this.removeRule(rule); }; + }; + /** @inheritdoc */ + UrlRouter.prototype.removeRule = function (rule) { + removeFrom(this._rules, rule); + }; + /** @inheritdoc */ + UrlRouter.prototype.rules = function () { + this.ensureSorted(); + return this._rules.slice(); + }; + /** @inheritdoc */ + UrlRouter.prototype.otherwise = function (handler) { + var handlerFn = getHandlerFn(handler); + this._otherwiseFn = this.urlRuleFactory.create(val(true), handlerFn); + this._sorted = false; + }; + + /** @inheritdoc */ + UrlRouter.prototype.initial = function (handler) { + var handlerFn = getHandlerFn(handler); + var matchFn = function (urlParts, router) { + return router.globals.transitionHistory.size() === 0 && !!/^\/?$/.exec(urlParts.path); + }; + this.rule(this.urlRuleFactory.create(matchFn, handlerFn)); + }; + + /** @inheritdoc */ + UrlRouter.prototype.when = function (matcher, handler, options) { + var rule = this.urlRuleFactory.create(matcher, handler); + if (isDefined(options && options.priority)) + rule.priority = options.priority; + this.rule(rule); + return rule; + }; + + /** @inheritdoc */ + UrlRouter.prototype.deferIntercept = function (defer) { + if (defer === undefined) + defer = true; + this.interceptDeferred = defer; + }; + + return UrlRouter; +}()); +function getHandlerFn(handler) { + if (!isFunction(handler) && !isString(handler) && !is(TargetState)(handler) && !TargetState.isDef(handler)) { + throw new Error("'handler' must be a string, function, TargetState, or have a state: 'newtarget' property"); + } + return isFunction(handler) ? handler : val(handler); +} + +/** + * @coreapi + * @module view + */ /** for typedoc */ +/** + * The View service + * + * This service pairs existing `ui-view` components (which live in the DOM) + * with view configs (from the state declaration objects: [[StateDeclaration.views]]). + * + * - After a successful Transition, the views from the newly entered states are activated via [[activateViewConfig]]. + * The views from exited states are deactivated via [[deactivateViewConfig]]. + * (See: the [[registerActivateViews]] Transition Hook) + * + * - As `ui-view` components pop in and out of existence, they register themselves using [[registerUIView]]. + * + * - When the [[sync]] function is called, the registered `ui-view`(s) ([[ActiveUIView]]) + * are configured with the matching [[ViewConfig]](s) + * + */ +var ViewService = /** @class */ (function () { + function ViewService() { + var _this = this; + this._uiViews = []; + this._viewConfigs = []; + this._viewConfigFactories = {}; + this._pluginapi = { + _rootViewContext: this._rootViewContext.bind(this), + _viewConfigFactory: this._viewConfigFactory.bind(this), + _registeredUIViews: function () { return _this._uiViews; }, + _activeViewConfigs: function () { return _this._viewConfigs; }, + }; + } + ViewService.prototype._rootViewContext = function (context) { + return this._rootContext = context || this._rootContext; + }; + + ViewService.prototype._viewConfigFactory = function (viewType, factory) { + this._viewConfigFactories[viewType] = factory; + }; + ViewService.prototype.createViewConfig = function (path, decl) { + var cfgFactory = this._viewConfigFactories[decl.$type]; + if (!cfgFactory) + throw new Error("ViewService: No view config factory registered for type " + decl.$type); + var cfgs = cfgFactory(path, decl); + return isArray(cfgs) ? cfgs : [cfgs]; + }; + /** + * Deactivates a ViewConfig. + * + * This function deactivates a `ViewConfig`. + * After calling [[sync]], it will un-pair from any `ui-view` with which it is currently paired. + * + * @param viewConfig The ViewConfig view to deregister. + */ + ViewService.prototype.deactivateViewConfig = function (viewConfig) { + trace.traceViewServiceEvent("<- Removing", viewConfig); + removeFrom(this._viewConfigs, viewConfig); + }; + ViewService.prototype.activateViewConfig = function (viewConfig) { + trace.traceViewServiceEvent("-> Registering", viewConfig); + this._viewConfigs.push(viewConfig); + }; + ViewService.prototype.sync = function () { + var _this = this; + var uiViewsByFqn = this._uiViews.map(function (uiv) { return [uiv.fqn, uiv]; }).reduce(applyPairs, {}); + // Return a weighted depth value for a uiView. + // The depth is the nesting depth of ui-views (based on FQN; times 10,000) + // plus the depth of the state that is populating the uiView + function uiViewDepth(uiView) { + var stateDepth = function (context) { + return context && context.parent ? stateDepth(context.parent) + 1 : 1; + }; + return (uiView.fqn.split(".").length * 10000) + stateDepth(uiView.creationContext); + } + // Return the ViewConfig's context's depth in the context tree. + function viewConfigDepth(config) { + var context = config.viewDecl.$context, count = 0; + while (++count && context.parent) + context = context.parent; + return count; + } + // Given a depth function, returns a compare function which can return either ascending or descending order + var depthCompare = curry(function (depthFn, posNeg, left, right) { return posNeg * (depthFn(left) - depthFn(right)); }); + var matchingConfigPair = function (uiView) { + var matchingConfigs = _this._viewConfigs.filter(ViewService.matches(uiViewsByFqn, uiView)); + if (matchingConfigs.length > 1) { + // This is OK. Child states can target a ui-view that the parent state also targets (the child wins) + // Sort by depth and return the match from the deepest child + // console.log(`Multiple matching view configs for ${uiView.fqn}`, matchingConfigs); + matchingConfigs.sort(depthCompare(viewConfigDepth, -1)); // descending + } + return [uiView, matchingConfigs[0]]; + }; + var configureUIView = function (_a) { + var uiView = _a[0], viewConfig = _a[1]; + // If a parent ui-view is reconfigured, it could destroy child ui-views. + // Before configuring a child ui-view, make sure it's still in the active uiViews array. + if (_this._uiViews.indexOf(uiView) !== -1) + uiView.configUpdated(viewConfig); + }; + // Sort views by FQN and state depth. Process uiviews nearest the root first. + var pairs$$1 = this._uiViews.sort(depthCompare(uiViewDepth, 1)).map(matchingConfigPair); + trace.traceViewSync(pairs$$1); + pairs$$1.forEach(configureUIView); + }; + + /** + * Registers a `ui-view` component + * + * When a `ui-view` component is created, it uses this method to register itself. + * After registration the [[sync]] method is used to ensure all `ui-view` are configured with the proper [[ViewConfig]]. + * + * Note: the `ui-view` component uses the `ViewConfig` to determine what view should be loaded inside the `ui-view`, + * and what the view's state context is. + * + * Note: There is no corresponding `deregisterUIView`. + * A `ui-view` should hang on to the return value of `registerUIView` and invoke it to deregister itself. + * + * @param uiView The metadata for a UIView + * @return a de-registration function used when the view is destroyed. + */ + ViewService.prototype.registerUIView = function (uiView) { + trace.traceViewServiceUIViewEvent("-> Registering", uiView); + var uiViews = this._uiViews; + var fqnAndTypeMatches = function (uiv) { return uiv.fqn === uiView.fqn && uiv.$type === uiView.$type; }; + if (uiViews.filter(fqnAndTypeMatches).length) + trace.traceViewServiceUIViewEvent("!!!! duplicate uiView named:", uiView); + uiViews.push(uiView); + this.sync(); + return function () { + var idx = uiViews.indexOf(uiView); + if (idx === -1) { + trace.traceViewServiceUIViewEvent("Tried removing non-registered uiView", uiView); + return; + } + trace.traceViewServiceUIViewEvent("<- Deregistering", uiView); + removeFrom(uiViews)(uiView); + }; + }; + + /** + * Returns the list of views currently available on the page, by fully-qualified name. + * + * @return {Array} Returns an array of fully-qualified view names. + */ + ViewService.prototype.available = function () { + return this._uiViews.map(prop("fqn")); + }; + /** + * Returns the list of views on the page containing loaded content. + * + * @return {Array} Returns an array of fully-qualified view names. + */ + ViewService.prototype.active = function () { + return this._uiViews.filter(prop("$config")).map(prop("name")); + }; + /** + * Normalizes a view's name from a state.views configuration block. + * + * This should be used by a framework implementation to calculate the values for + * [[_ViewDeclaration.$uiViewName]] and [[_ViewDeclaration.$uiViewContextAnchor]]. + * + * @param context the context object (state declaration) that the view belongs to + * @param rawViewName the name of the view, as declared in the [[StateDeclaration.views]] + * + * @returns the normalized uiViewName and uiViewContextAnchor that the view targets + */ + ViewService.normalizeUIViewTarget = function (context, rawViewName) { + if (rawViewName === void 0) { rawViewName = ""; } + // TODO: Validate incoming view name with a regexp to allow: + // ex: "view.name@foo.bar" , "^.^.view.name" , "view.name@^.^" , "" , + // "@" , "$default@^" , "!$default.$default" , "!foo.bar" + var viewAtContext = rawViewName.split("@"); + var uiViewName = viewAtContext[0] || "$default"; // default to unnamed view + var uiViewContextAnchor = isString(viewAtContext[1]) ? viewAtContext[1] : "^"; // default to parent context + // Handle relative view-name sugar syntax. + // Matches rawViewName "^.^.^.foo.bar" into array: ["^.^.^.foo.bar", "^.^.^", "foo.bar"], + var relativeViewNameSugar = /^(\^(?:\.\^)*)\.(.*$)/.exec(uiViewName); + if (relativeViewNameSugar) { + // Clobbers existing contextAnchor (rawViewName validation will fix this) + uiViewContextAnchor = relativeViewNameSugar[1]; // set anchor to "^.^.^" + uiViewName = relativeViewNameSugar[2]; // set view-name to "foo.bar" + } + if (uiViewName.charAt(0) === '!') { + uiViewName = uiViewName.substr(1); + uiViewContextAnchor = ""; // target absolutely from root + } + // handle parent relative targeting "^.^.^" + var relativeMatch = /^(\^(?:\.\^)*)$/; + if (relativeMatch.exec(uiViewContextAnchor)) { + var anchor = uiViewContextAnchor.split(".").reduce((function (anchor, x) { return anchor.parent; }), context); + uiViewContextAnchor = anchor.name; + } + else if (uiViewContextAnchor === '.') { + uiViewContextAnchor = context.name; + } + return { uiViewName: uiViewName, uiViewContextAnchor: uiViewContextAnchor }; + }; + /** + * Given a ui-view and a ViewConfig, determines if they "match". + * + * A ui-view has a fully qualified name (fqn) and a context object. The fqn is built from its overall location in + * the DOM, describing its nesting relationship to any parent ui-view tags it is nested inside of. + * + * A ViewConfig has a target ui-view name and a context anchor. The ui-view name can be a simple name, or + * can be a segmented ui-view path, describing a portion of a ui-view fqn. + * + * In order for a ui-view to match ViewConfig, ui-view's $type must match the ViewConfig's $type + * + * If the ViewConfig's target ui-view name is a simple name (no dots), then a ui-view matches if: + * - the ui-view's name matches the ViewConfig's target name + * - the ui-view's context matches the ViewConfig's anchor + * + * If the ViewConfig's target ui-view name is a segmented name (with dots), then a ui-view matches if: + * - There exists a parent ui-view where: + * - the parent ui-view's name matches the first segment (index 0) of the ViewConfig's target name + * - the parent ui-view's context matches the ViewConfig's anchor + * - And the remaining segments (index 1..n) of the ViewConfig's target name match the tail of the ui-view's fqn + * + * Example: + * + * DOM: + * + * + * + * + * + * + * + * + * + * uiViews: [ + * { fqn: "$default", creationContext: { name: "" } }, + * { fqn: "$default.foo", creationContext: { name: "A" } }, + * { fqn: "$default.foo.$default", creationContext: { name: "A.B" } } + * { fqn: "$default.foo.$default.bar", creationContext: { name: "A.B.C" } } + * ] + * + * These four view configs all match the ui-view with the fqn: "$default.foo.$default.bar": + * + * - ViewConfig1: { uiViewName: "bar", uiViewContextAnchor: "A.B.C" } + * - ViewConfig2: { uiViewName: "$default.bar", uiViewContextAnchor: "A.B" } + * - ViewConfig3: { uiViewName: "foo.$default.bar", uiViewContextAnchor: "A" } + * - ViewConfig4: { uiViewName: "$default.foo.$default.bar", uiViewContextAnchor: "" } + * + * Using ViewConfig3 as an example, it matches the ui-view with fqn "$default.foo.$default.bar" because: + * - The ViewConfig's segmented target name is: [ "foo", "$default", "bar" ] + * - There exists a parent ui-view (which has fqn: "$default.foo") where: + * - the parent ui-view's name "foo" matches the first segment "foo" of the ViewConfig's target name + * - the parent ui-view's context "A" matches the ViewConfig's anchor context "A" + * - And the remaining segments [ "$default", "bar" ].join("."_ of the ViewConfig's target name match + * the tail of the ui-view's fqn "default.bar" + * + * @internalapi + */ + ViewService.matches = function (uiViewsByFqn, uiView) { return function (viewConfig) { + // Don't supply an ng1 ui-view with an ng2 ViewConfig, etc + if (uiView.$type !== viewConfig.viewDecl.$type) + return false; + // Split names apart from both viewConfig and uiView into segments + var vc = viewConfig.viewDecl; + var vcSegments = vc.$uiViewName.split("."); + var uivSegments = uiView.fqn.split("."); + // Check if the tails of the segment arrays match. ex, these arrays' tails match: + // vc: ["foo", "bar"], uiv fqn: ["$default", "foo", "bar"] + if (!equals(vcSegments, uivSegments.slice(0 - vcSegments.length))) + return false; + // Now check if the fqn ending at the first segment of the viewConfig matches the context: + // ["$default", "foo"].join(".") == "$default.foo", does the ui-view $default.foo context match? + var negOffset = (1 - vcSegments.length) || undefined; + var fqnToFirstSegment = uivSegments.slice(0, negOffset).join("."); + var uiViewContext = uiViewsByFqn[fqnToFirstSegment].creationContext; + return vc.$uiViewContextAnchor === (uiViewContext && uiViewContext.name); + }; }; + return ViewService; +}()); + +/** + * @coreapi + * @module core + */ /** */ +/** + * Global router state + * + * This is where we hold the global mutable state such as current state, current + * params, current transition, etc. + */ +var UIRouterGlobals = /** @class */ (function () { + function UIRouterGlobals() { + /** + * Current parameter values + * + * The parameter values from the latest successful transition + */ + this.params = new StateParams(); + /** @internalapi */ + this.lastStartedTransitionId = -1; + /** @internalapi */ + this.transitionHistory = new Queue([], 1); + /** @internalapi */ + this.successfulTransitions = new Queue([], 1); + } + UIRouterGlobals.prototype.dispose = function () { + this.transitionHistory.clear(); + this.successfulTransitions.clear(); + this.transition = null; + }; + return UIRouterGlobals; +}()); + +/** + * @coreapi + * @module url + */ /** */ +/** @hidden */ +var makeStub = function (keys) { + return keys.reduce(function (acc, key) { return (acc[key] = notImplemented(key), acc); }, { dispose: noop$1 }); +}; +/** @hidden */ var locationServicesFns = ["url", "path", "search", "hash", "onChange"]; +/** @hidden */ var locationConfigFns = ["port", "protocol", "host", "baseHref", "html5Mode", "hashPrefix"]; +/** @hidden */ var umfFns = ["type", "caseInsensitive", "strictMode", "defaultSquashPolicy"]; +/** @hidden */ var rulesFns = ["sort", "when", "initial", "otherwise", "rules", "rule", "removeRule"]; +/** @hidden */ var syncFns = ["deferIntercept", "listen", "sync", "match"]; +/** + * API for URL management + */ +var UrlService = /** @class */ (function () { + /** @hidden */ + function UrlService(router, lateBind) { + if (lateBind === void 0) { lateBind = true; } + this.router = router; + this.rules = {}; + this.config = {}; + // proxy function calls from UrlService to the LocationService/LocationConfig + var locationServices = function () { return router.locationService; }; + createProxyFunctions(locationServices, this, locationServices, locationServicesFns, lateBind); + var locationConfig = function () { return router.locationConfig; }; + createProxyFunctions(locationConfig, this.config, locationConfig, locationConfigFns, lateBind); + var umf = function () { return router.urlMatcherFactory; }; + createProxyFunctions(umf, this.config, umf, umfFns); + var urlRouter = function () { return router.urlRouter; }; + createProxyFunctions(urlRouter, this.rules, urlRouter, rulesFns); + createProxyFunctions(urlRouter, this, urlRouter, syncFns); + } + UrlService.prototype.url = function (newurl, replace, state) { return; }; + + /** @inheritdoc */ + UrlService.prototype.path = function () { return; }; + + /** @inheritdoc */ + UrlService.prototype.search = function () { return; }; + + /** @inheritdoc */ + UrlService.prototype.hash = function () { return; }; + + /** @inheritdoc */ + UrlService.prototype.onChange = function (callback) { return; }; + + /** + * Returns the current URL parts + * + * This method returns the current URL components as a [[UrlParts]] object. + * + * @returns the current url parts + */ + UrlService.prototype.parts = function () { + return { path: this.path(), search: this.search(), hash: this.hash() }; + }; + UrlService.prototype.dispose = function () { }; + /** @inheritdoc */ + UrlService.prototype.sync = function (evt) { return; }; + /** @inheritdoc */ + UrlService.prototype.listen = function (enabled) { return; }; + + /** @inheritdoc */ + UrlService.prototype.deferIntercept = function (defer) { return; }; + /** @inheritdoc */ + UrlService.prototype.match = function (urlParts) { return; }; + /** @hidden */ + UrlService.locationServiceStub = makeStub(locationServicesFns); + /** @hidden */ + UrlService.locationConfigStub = makeStub(locationConfigFns); + return UrlService; +}()); + +/** + * @coreapi + * @module core + */ /** */ +/** @hidden */ +var _routerInstance = 0; +/** + * The master class used to instantiate an instance of UI-Router. + * + * UI-Router (for each specific framework) will create an instance of this class during bootstrap. + * This class instantiates and wires the UI-Router services together. + * + * After a new instance of the UIRouter class is created, it should be configured for your app. + * For instance, app states should be registered with the [[UIRouter.stateRegistry]]. + * + * --- + * + * Normally the framework code will bootstrap UI-Router. + * If you are bootstrapping UIRouter manually, tell it to monitor the URL by calling + * [[UrlService.listen]] then [[UrlService.sync]]. + */ +var UIRouter = /** @class */ (function () { + /** + * Creates a new `UIRouter` object + * + * @param locationService a [[LocationServices]] implementation + * @param locationConfig a [[LocationConfig]] implementation + * @internalapi + */ + function UIRouter(locationService, locationConfig) { + if (locationService === void 0) { locationService = UrlService.locationServiceStub; } + if (locationConfig === void 0) { locationConfig = UrlService.locationConfigStub; } + this.locationService = locationService; + this.locationConfig = locationConfig; + /** @hidden */ this.$id = _routerInstance++; + /** @hidden */ this._disposed = false; + /** @hidden */ this._disposables = []; + /** Provides trace information to the console */ + this.trace = trace; + /** Provides services related to ui-view synchronization */ + this.viewService = new ViewService(); + /** Provides services related to Transitions */ + this.transitionService = new TransitionService(this); + /** Global router state */ + this.globals = new UIRouterGlobals(); + /** + * Deprecated for public use. Use [[urlService]] instead. + * @deprecated Use [[urlService]] instead + */ + this.urlMatcherFactory = new UrlMatcherFactory(); + /** + * Deprecated for public use. Use [[urlService]] instead. + * @deprecated Use [[urlService]] instead + */ + this.urlRouter = new UrlRouter(this); + /** Provides a registry for states, and related registration services */ + this.stateRegistry = new StateRegistry(this); + /** Provides services related to states */ + this.stateService = new StateService(this); + /** Provides services related to the URL */ + this.urlService = new UrlService(this); + /** @hidden */ + this._plugins = {}; + this.viewService._pluginapi._rootViewContext(this.stateRegistry.root()); + this.globals.$current = this.stateRegistry.root(); + this.globals.current = this.globals.$current.self; + this.disposable(this.globals); + this.disposable(this.stateService); + this.disposable(this.stateRegistry); + this.disposable(this.transitionService); + this.disposable(this.urlRouter); + this.disposable(locationService); + this.disposable(locationConfig); + } + /** Registers an object to be notified when the router is disposed */ + UIRouter.prototype.disposable = function (disposable) { + this._disposables.push(disposable); + }; + /** + * Disposes this router instance + * + * When called, clears resources retained by the router by calling `dispose(this)` on all + * registered [[disposable]] objects. + * + * Or, if a `disposable` object is provided, calls `dispose(this)` on that object only. + * + * @param disposable (optional) the disposable to dispose + */ + UIRouter.prototype.dispose = function (disposable) { + var _this = this; + if (disposable && isFunction(disposable.dispose)) { + disposable.dispose(this); + return undefined; + } + this._disposed = true; + this._disposables.slice().forEach(function (d) { + try { + typeof d.dispose === 'function' && d.dispose(_this); + removeFrom(_this._disposables, d); + } + catch (ignored) { } + }); + }; + /** + * Adds a plugin to UI-Router + * + * This method adds a UI-Router Plugin. + * A plugin can enhance or change UI-Router behavior using any public API. + * + * #### Example: + * ```js + * import { MyCoolPlugin } from "ui-router-cool-plugin"; + * + * var plugin = router.addPlugin(MyCoolPlugin); + * ``` + * + * ### Plugin authoring + * + * A plugin is simply a class (or constructor function) which accepts a [[UIRouter]] instance and (optionally) an options object. + * + * The plugin can implement its functionality using any of the public APIs of [[UIRouter]]. + * For example, it may configure router options or add a Transition Hook. + * + * The plugin can then be published as a separate module. + * + * #### Example: + * ```js + * export class MyAuthPlugin implements UIRouterPlugin { + * constructor(router: UIRouter, options: any) { + * this.name = "MyAuthPlugin"; + * let $transitions = router.transitionService; + * let $state = router.stateService; + * + * let authCriteria = { + * to: (state) => state.data && state.data.requiresAuth + * }; + * + * function authHook(transition: Transition) { + * let authService = transition.injector().get('AuthService'); + * if (!authService.isAuthenticated()) { + * return $state.target('login'); + * } + * } + * + * $transitions.onStart(authCriteria, authHook); + * } + * } + * ``` + * + * @param plugin one of: + * - a plugin class which implements [[UIRouterPlugin]] + * - a constructor function for a [[UIRouterPlugin]] which accepts a [[UIRouter]] instance + * - a factory function which accepts a [[UIRouter]] instance and returns a [[UIRouterPlugin]] instance + * @param options options to pass to the plugin class/factory + * @returns the registered plugin instance + */ + UIRouter.prototype.plugin = function (plugin, options) { + if (options === void 0) { options = {}; } + var pluginInstance = new plugin(this, options); + if (!pluginInstance.name) + throw new Error("Required property `name` missing on plugin: " + pluginInstance); + this._disposables.push(pluginInstance); + return this._plugins[pluginInstance.name] = pluginInstance; + }; + UIRouter.prototype.getPlugin = function (pluginName) { + return pluginName ? this._plugins[pluginName] : values(this._plugins); + }; + return UIRouter; +}()); + +/** @module hooks */ /** */ +function addCoreResolvables(trans) { + trans.addResolvable({ token: UIRouter, deps: [], resolveFn: function () { return trans.router; }, data: trans.router }, ""); + trans.addResolvable({ token: Transition, deps: [], resolveFn: function () { return trans; }, data: trans }, ""); + trans.addResolvable({ token: '$transition$', deps: [], resolveFn: function () { return trans; }, data: trans }, ""); + trans.addResolvable({ token: '$stateParams', deps: [], resolveFn: function () { return trans.params(); }, data: trans.params() }, ""); + trans.entering().forEach(function (state) { + trans.addResolvable({ token: '$state$', deps: [], resolveFn: function () { return state; }, data: state }, state); + }); +} +var registerAddCoreResolvables = function (transitionService) { + return transitionService.onCreate({}, addCoreResolvables); +}; + +/** @module hooks */ /** */ +/** + * A [[TransitionHookFn]] that redirects to a different state or params + * + * Registered using `transitionService.onStart({ to: (state) => !!state.redirectTo }, redirectHook);` + * + * See [[StateDeclaration.redirectTo]] + */ +var redirectToHook = function (trans) { + var redirect = trans.to().redirectTo; + if (!redirect) + return; + var $state = trans.router.stateService; + function handleResult(result) { + if (!result) + return; + if (result instanceof TargetState) + return result; + if (isString(result)) + return $state.target(result, trans.params(), trans.options()); + if (result['state'] || result['params']) + return $state.target(result['state'] || trans.to(), result['params'] || trans.params(), trans.options()); + } + if (isFunction(redirect)) { + return services.$q.when(redirect(trans)).then(handleResult); + } + return handleResult(redirect); +}; +var registerRedirectToHook = function (transitionService) { + return transitionService.onStart({ to: function (state) { return !!state.redirectTo; } }, redirectToHook); +}; + +/** + * A factory which creates an onEnter, onExit or onRetain transition hook function + * + * The returned function invokes the (for instance) state.onEnter hook when the + * state is being entered. + * + * @hidden + */ +function makeEnterExitRetainHook(hookName) { + return function (transition, state) { + var _state = state.$$state(); + var hookFn = _state[hookName]; + return hookFn(transition, state); + }; +} +/** + * The [[TransitionStateHookFn]] for onExit + * + * When the state is being exited, the state's .onExit function is invoked. + * + * Registered using `transitionService.onExit({ exiting: (state) => !!state.onExit }, onExitHook);` + * + * See: [[IHookRegistry.onExit]] + */ +var onExitHook = makeEnterExitRetainHook('onExit'); +var registerOnExitHook = function (transitionService) { + return transitionService.onExit({ exiting: function (state) { return !!state.onExit; } }, onExitHook); +}; +/** + * The [[TransitionStateHookFn]] for onRetain + * + * When the state was already entered, and is not being exited or re-entered, the state's .onRetain function is invoked. + * + * Registered using `transitionService.onRetain({ retained: (state) => !!state.onRetain }, onRetainHook);` + * + * See: [[IHookRegistry.onRetain]] + */ +var onRetainHook = makeEnterExitRetainHook('onRetain'); +var registerOnRetainHook = function (transitionService) { + return transitionService.onRetain({ retained: function (state) { return !!state.onRetain; } }, onRetainHook); +}; +/** + * The [[TransitionStateHookFn]] for onEnter + * + * When the state is being entered, the state's .onEnter function is invoked. + * + * Registered using `transitionService.onEnter({ entering: (state) => !!state.onEnter }, onEnterHook);` + * + * See: [[IHookRegistry.onEnter]] + */ +var onEnterHook = makeEnterExitRetainHook('onEnter'); +var registerOnEnterHook = function (transitionService) { + return transitionService.onEnter({ entering: function (state) { return !!state.onEnter; } }, onEnterHook); +}; + +/** @module hooks */ +/** for typedoc */ +/** + * A [[TransitionHookFn]] which resolves all EAGER Resolvables in the To Path + * + * Registered using `transitionService.onStart({}, eagerResolvePath);` + * + * When a Transition starts, this hook resolves all the EAGER Resolvables, which the transition then waits for. + * + * See [[StateDeclaration.resolve]] + */ +var eagerResolvePath = function (trans) { + return new ResolveContext(trans.treeChanges().to) + .resolvePath("EAGER", trans) + .then(noop$1); +}; +var registerEagerResolvePath = function (transitionService) { + return transitionService.onStart({}, eagerResolvePath, { priority: 1000 }); +}; +/** + * A [[TransitionHookFn]] which resolves all LAZY Resolvables for the state (and all its ancestors) in the To Path + * + * Registered using `transitionService.onEnter({ entering: () => true }, lazyResolveState);` + * + * When a State is being entered, this hook resolves all the Resolvables for this state, which the transition then waits for. + * + * See [[StateDeclaration.resolve]] + */ +var lazyResolveState = function (trans, state) { + return new ResolveContext(trans.treeChanges().to) + .subContext(state.$$state()) + .resolvePath("LAZY", trans) + .then(noop$1); +}; +var registerLazyResolveState = function (transitionService) { + return transitionService.onEnter({ entering: val(true) }, lazyResolveState, { priority: 1000 }); +}; + +/** @module hooks */ /** for typedoc */ +/** + * A [[TransitionHookFn]] which waits for the views to load + * + * Registered using `transitionService.onStart({}, loadEnteringViews);` + * + * Allows the views to do async work in [[ViewConfig.load]] before the transition continues. + * In angular 1, this includes loading the templates. + */ +var loadEnteringViews = function (transition) { + var $q = services.$q; + var enteringViews = transition.views("entering"); + if (!enteringViews.length) + return; + return $q.all(enteringViews.map(function (view) { return $q.when(view.load()); })).then(noop$1); +}; +var registerLoadEnteringViews = function (transitionService) { + return transitionService.onFinish({}, loadEnteringViews); +}; +/** + * A [[TransitionHookFn]] which activates the new views when a transition is successful. + * + * Registered using `transitionService.onSuccess({}, activateViews);` + * + * After a transition is complete, this hook deactivates the old views from the previous state, + * and activates the new views from the destination state. + * + * See [[ViewService]] + */ +var activateViews = function (transition) { + var enteringViews = transition.views("entering"); + var exitingViews = transition.views("exiting"); + if (!enteringViews.length && !exitingViews.length) + return; + var $view = transition.router.viewService; + exitingViews.forEach(function (vc) { return $view.deactivateViewConfig(vc); }); + enteringViews.forEach(function (vc) { return $view.activateViewConfig(vc); }); + $view.sync(); +}; +var registerActivateViews = function (transitionService) { + return transitionService.onSuccess({}, activateViews); +}; + +/** + * A [[TransitionHookFn]] which updates global UI-Router state + * + * Registered using `transitionService.onBefore({}, updateGlobalState);` + * + * Before a [[Transition]] starts, updates the global value of "the current transition" ([[Globals.transition]]). + * After a successful [[Transition]], updates the global values of "the current state" + * ([[Globals.current]] and [[Globals.$current]]) and "the current param values" ([[Globals.params]]). + * + * See also the deprecated properties: + * [[StateService.transition]], [[StateService.current]], [[StateService.params]] + */ +var updateGlobalState = function (trans) { + var globals = trans.router.globals; + var transitionSuccessful = function () { + globals.successfulTransitions.enqueue(trans); + globals.$current = trans.$to(); + globals.current = globals.$current.self; + copy(trans.params(), globals.params); + }; + var clearCurrentTransition = function () { + // Do not clear globals.transition if a different transition has started in the meantime + if (globals.transition === trans) + globals.transition = null; + }; + trans.onSuccess({}, transitionSuccessful, { priority: 10000 }); + trans.promise.then(clearCurrentTransition, clearCurrentTransition); +}; +var registerUpdateGlobalState = function (transitionService) { + return transitionService.onCreate({}, updateGlobalState); +}; + +/** + * A [[TransitionHookFn]] which updates the URL after a successful transition + * + * Registered using `transitionService.onSuccess({}, updateUrl);` + */ +var updateUrl = function (transition) { + var options = transition.options(); + var $state = transition.router.stateService; + var $urlRouter = transition.router.urlRouter; + // Dont update the url in these situations: + // The transition was triggered by a URL sync (options.source === 'url') + // The user doesn't want the url to update (options.location === false) + // The destination state, and all parents have no navigable url + if (options.source !== 'url' && options.location && $state.$current.navigable) { + var urlOptions = { replace: options.location === 'replace' }; + $urlRouter.push($state.$current.navigable.url, $state.params, urlOptions); + } + $urlRouter.update(true); +}; +var registerUpdateUrl = function (transitionService) { + return transitionService.onSuccess({}, updateUrl, { priority: 9999 }); +}; + +/** + * A [[TransitionHookFn]] that performs lazy loading + * + * When entering a state "abc" which has a `lazyLoad` function defined: + * - Invoke the `lazyLoad` function (unless it is already in process) + * - Flag the hook function as "in process" + * - The function should return a promise (that resolves when lazy loading is complete) + * - Wait for the promise to settle + * - If the promise resolves to a [[LazyLoadResult]], then register those states + * - Flag the hook function as "not in process" + * - If the hook was successful + * - Remove the `lazyLoad` function from the state declaration + * - If all the hooks were successful + * - Retry the transition (by returning a TargetState) + * + * ``` + * .state('abc', { + * component: 'fooComponent', + * lazyLoad: () => System.import('./fooComponent') + * }); + * ``` + * + * See [[StateDeclaration.lazyLoad]] + */ +var lazyLoadHook = function (transition) { + var router = transition.router; + function retryTransition() { + if (transition.originalTransition().options().source !== 'url') { + // The original transition was not triggered via url sync + // The lazy state should be loaded now, so re-try the original transition + var orig = transition.targetState(); + return router.stateService.target(orig.identifier(), orig.params(), orig.options()); + } + // The original transition was triggered via url sync + // Run the URL rules and find the best match + var $url = router.urlService; + var result = $url.match($url.parts()); + var rule = result && result.rule; + // If the best match is a state, redirect the transition (instead + // of calling sync() which supersedes the current transition) + if (rule && rule.type === "STATE") { + var state = rule.state; + var params = result.match; + return router.stateService.target(state, params, transition.options()); + } + // No matching state found, so let .sync() choose the best non-state match/otherwise + router.urlService.sync(); + } + var promises = transition.entering() + .filter(function (state) { return !!state.$$state().lazyLoad; }) + .map(function (state) { return lazyLoadState(transition, state); }); + return services.$q.all(promises).then(retryTransition); +}; +var registerLazyLoadHook = function (transitionService) { + return transitionService.onBefore({ entering: function (state) { return !!state.lazyLoad; } }, lazyLoadHook); +}; +/** + * Invokes a state's lazy load function + * + * @param transition a Transition context + * @param state the state to lazy load + * @returns A promise for the lazy load result + */ +function lazyLoadState(transition, state) { + var lazyLoadFn = state.$$state().lazyLoad; + // Store/get the lazy load promise on/from the hookfn so it doesn't get re-invoked + var promise = lazyLoadFn['_promise']; + if (!promise) { + var success = function (result) { + delete state.lazyLoad; + delete state.$$state().lazyLoad; + delete lazyLoadFn['_promise']; + return result; + }; + var error = function (err) { + delete lazyLoadFn['_promise']; + return services.$q.reject(err); + }; + promise = lazyLoadFn['_promise'] = + services.$q.when(lazyLoadFn(transition, state)) + .then(updateStateRegistry) + .then(success, error); + } + /** Register any lazy loaded state definitions */ + function updateStateRegistry(result) { + if (result && Array.isArray(result.states)) { + result.states.forEach(function (state) { return transition.router.stateRegistry.register(state); }); + } + return result; + } + return promise; +} + +/** + * This class defines a type of hook, such as `onBefore` or `onEnter`. + * Plugins can define custom hook types, such as sticky states does for `onInactive`. + * + * @interalapi + */ +var TransitionEventType = /** @class */ (function () { + function TransitionEventType(name, hookPhase, hookOrder, criteriaMatchPath, reverseSort, getResultHandler, getErrorHandler, synchronous) { + if (reverseSort === void 0) { reverseSort = false; } + if (getResultHandler === void 0) { getResultHandler = TransitionHook.HANDLE_RESULT; } + if (getErrorHandler === void 0) { getErrorHandler = TransitionHook.REJECT_ERROR; } + if (synchronous === void 0) { synchronous = false; } + this.name = name; + this.hookPhase = hookPhase; + this.hookOrder = hookOrder; + this.criteriaMatchPath = criteriaMatchPath; + this.reverseSort = reverseSort; + this.getResultHandler = getResultHandler; + this.getErrorHandler = getErrorHandler; + this.synchronous = synchronous; + } + return TransitionEventType; +}()); + +/** @module hooks */ /** */ +/** + * A [[TransitionHookFn]] that skips a transition if it should be ignored + * + * This hook is invoked at the end of the onBefore phase. + * + * If the transition should be ignored (because no parameter or states changed) + * then the transition is ignored and not processed. + */ +function ignoredHook(trans) { + var ignoredReason = trans._ignoredReason(); + if (!ignoredReason) + return; + trace.traceTransitionIgnored(trans); + var pending = trans.router.globals.transition; + // The user clicked a link going back to the *current state* ('A') + // However, there is also a pending transition in flight (to 'B') + // Abort the transition to 'B' because the user now wants to be back at 'A'. + if (ignoredReason === 'SameAsCurrent' && pending) { + pending.abort(); + } + return Rejection.ignored().toPromise(); +} +var registerIgnoredTransitionHook = function (transitionService) { + return transitionService.onBefore({}, ignoredHook, { priority: -9999 }); +}; + +/** @module hooks */ /** */ +/** + * A [[TransitionHookFn]] that rejects the Transition if it is invalid + * + * This hook is invoked at the end of the onBefore phase. + * If the transition is invalid (for example, param values do not validate) + * then the transition is rejected. + */ +function invalidTransitionHook(trans) { + if (!trans.valid()) { + throw new Error(trans.error()); + } +} +var registerInvalidTransitionHook = function (transitionService) { + return transitionService.onBefore({}, invalidTransitionHook, { priority: -10000 }); +}; + +/** + * @coreapi + * @module transition + */ +/** for typedoc */ +/** + * The default [[Transition]] options. + * + * Include this object when applying custom defaults: + * let reloadOpts = { reload: true, notify: true } + * let options = defaults(theirOpts, customDefaults, defaultOptions); + */ +var defaultTransOpts = { + location: true, + relative: null, + inherit: false, + notify: true, + reload: false, + custom: {}, + current: function () { return null; }, + source: "unknown" +}; +/** + * This class provides services related to Transitions. + * + * - Most importantly, it allows global Transition Hooks to be registered. + * - It allows the default transition error handler to be set. + * - It also has a factory function for creating new [[Transition]] objects, (used internally by the [[StateService]]). + * + * At bootstrap, [[UIRouter]] creates a single instance (singleton) of this class. + */ +var TransitionService = /** @class */ (function () { + /** @hidden */ + function TransitionService(_router) { + /** @hidden */ + this._transitionCount = 0; + /** @hidden The transition hook types, such as `onEnter`, `onStart`, etc */ + this._eventTypes = []; + /** @hidden The registered transition hooks */ + this._registeredHooks = {}; + /** @hidden The paths on a criteria object */ + this._criteriaPaths = {}; + this._router = _router; + this.$view = _router.viewService; + this._deregisterHookFns = {}; + this._pluginapi = createProxyFunctions(val(this), {}, val(this), [ + '_definePathType', + '_defineEvent', + '_getPathTypes', + '_getEvents', + 'getHooks', + ]); + this._defineCorePaths(); + this._defineCoreEvents(); + this._registerCoreTransitionHooks(); + } + /** + * Registers a [[TransitionHookFn]], called *while a transition is being constructed*. + * + * Registers a transition lifecycle hook, which is invoked during transition construction. + * + * This low level hook should only be used by plugins. + * This can be a useful time for plugins to add resolves or mutate the transition as needed. + * The Sticky States plugin uses this hook to modify the treechanges. + * + * ### Lifecycle + * + * `onCreate` hooks are invoked *while a transition is being constructed*. + * + * ### Return value + * + * The hook's return value is ignored + * + * @internalapi + * @param criteria defines which Transitions the Hook should be invoked for. + * @param callback the hook function which will be invoked. + * @param options the registration options + * @returns a function which deregisters the hook. + */ + TransitionService.prototype.onCreate = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onBefore = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onStart = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onExit = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onRetain = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onEnter = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onFinish = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onSuccess = function (criteria, callback, options) { return; }; + /** @inheritdoc */ + TransitionService.prototype.onError = function (criteria, callback, options) { return; }; + /** + * dispose + * @internalapi + */ + TransitionService.prototype.dispose = function (router) { + values(this._registeredHooks).forEach(function (hooksArray) { return hooksArray.forEach(function (hook) { + hook._deregistered = true; + removeFrom(hooksArray, hook); + }); }); + }; + /** + * Creates a new [[Transition]] object + * + * This is a factory function for creating new Transition objects. + * It is used internally by the [[StateService]] and should generally not be called by application code. + * + * @param fromPath the path to the current state (the from state) + * @param targetState the target state (destination) + * @returns a Transition + */ + TransitionService.prototype.create = function (fromPath, targetState) { + return new Transition(fromPath, targetState, this._router); + }; + /** @hidden */ + TransitionService.prototype._defineCoreEvents = function () { + var Phase = exports.TransitionHookPhase; + var TH = TransitionHook; + var paths = this._criteriaPaths; + var NORMAL_SORT = false, REVERSE_SORT = true; + var ASYNCHRONOUS = false, SYNCHRONOUS = true; + this._defineEvent("onCreate", Phase.CREATE, 0, paths.to, NORMAL_SORT, TH.LOG_REJECTED_RESULT, TH.THROW_ERROR, SYNCHRONOUS); + this._defineEvent("onBefore", Phase.BEFORE, 0, paths.to); + this._defineEvent("onStart", Phase.RUN, 0, paths.to); + this._defineEvent("onExit", Phase.RUN, 100, paths.exiting, REVERSE_SORT); + this._defineEvent("onRetain", Phase.RUN, 200, paths.retained); + this._defineEvent("onEnter", Phase.RUN, 300, paths.entering); + this._defineEvent("onFinish", Phase.RUN, 400, paths.to); + this._defineEvent("onSuccess", Phase.SUCCESS, 0, paths.to, NORMAL_SORT, TH.LOG_REJECTED_RESULT, TH.LOG_ERROR, SYNCHRONOUS); + this._defineEvent("onError", Phase.ERROR, 0, paths.to, NORMAL_SORT, TH.LOG_REJECTED_RESULT, TH.LOG_ERROR, SYNCHRONOUS); + }; + /** @hidden */ + TransitionService.prototype._defineCorePaths = function () { + var STATE = exports.TransitionHookScope.STATE, TRANSITION = exports.TransitionHookScope.TRANSITION; + this._definePathType("to", TRANSITION); + this._definePathType("from", TRANSITION); + this._definePathType("exiting", STATE); + this._definePathType("retained", STATE); + this._definePathType("entering", STATE); + }; + /** @hidden */ + TransitionService.prototype._defineEvent = function (name, hookPhase, hookOrder, criteriaMatchPath, reverseSort, getResultHandler, getErrorHandler, synchronous) { + if (reverseSort === void 0) { reverseSort = false; } + if (getResultHandler === void 0) { getResultHandler = TransitionHook.HANDLE_RESULT; } + if (getErrorHandler === void 0) { getErrorHandler = TransitionHook.REJECT_ERROR; } + if (synchronous === void 0) { synchronous = false; } + var eventType = new TransitionEventType(name, hookPhase, hookOrder, criteriaMatchPath, reverseSort, getResultHandler, getErrorHandler, synchronous); + this._eventTypes.push(eventType); + makeEvent(this, this, eventType); + }; + + /** @hidden */ + TransitionService.prototype._getEvents = function (phase) { + var transitionHookTypes = isDefined(phase) ? + this._eventTypes.filter(function (type) { return type.hookPhase === phase; }) : + this._eventTypes.slice(); + return transitionHookTypes.sort(function (l, r) { + var cmpByPhase = l.hookPhase - r.hookPhase; + return cmpByPhase === 0 ? l.hookOrder - r.hookOrder : cmpByPhase; + }); + }; + /** + * Adds a Path to be used as a criterion against a TreeChanges path + * + * For example: the `exiting` path in [[HookMatchCriteria]] is a STATE scoped path. + * It was defined by calling `defineTreeChangesCriterion('exiting', TransitionHookScope.STATE)` + * Each state in the exiting path is checked against the criteria and returned as part of the match. + * + * Another example: the `to` path in [[HookMatchCriteria]] is a TRANSITION scoped path. + * It was defined by calling `defineTreeChangesCriterion('to', TransitionHookScope.TRANSITION)` + * Only the tail of the `to` path is checked against the criteria and returned as part of the match. + * + * @hidden + */ + TransitionService.prototype._definePathType = function (name, hookScope) { + this._criteriaPaths[name] = { name: name, scope: hookScope }; + }; + /** * @hidden */ + TransitionService.prototype._getPathTypes = function () { + return this._criteriaPaths; + }; + /** @hidden */ + TransitionService.prototype.getHooks = function (hookName) { + return this._registeredHooks[hookName]; + }; + /** @hidden */ + TransitionService.prototype._registerCoreTransitionHooks = function () { + var fns = this._deregisterHookFns; + fns.addCoreResolves = registerAddCoreResolvables(this); + fns.ignored = registerIgnoredTransitionHook(this); + fns.invalid = registerInvalidTransitionHook(this); + // Wire up redirectTo hook + fns.redirectTo = registerRedirectToHook(this); + // Wire up onExit/Retain/Enter state hooks + fns.onExit = registerOnExitHook(this); + fns.onRetain = registerOnRetainHook(this); + fns.onEnter = registerOnEnterHook(this); + // Wire up Resolve hooks + fns.eagerResolve = registerEagerResolvePath(this); + fns.lazyResolve = registerLazyResolveState(this); + // Wire up the View management hooks + fns.loadViews = registerLoadEnteringViews(this); + fns.activateViews = registerActivateViews(this); + // Updates global state after a transition + fns.updateGlobals = registerUpdateGlobalState(this); + // After globals.current is updated at priority: 10000 + fns.updateUrl = registerUpdateUrl(this); + // Lazy load state trees + fns.lazyLoad = registerLazyLoadHook(this); + }; + return TransitionService; +}()); + +/** + * @coreapi + * @module state + */ +/** */ +/** + * Provides state related service functions + * + * This class provides services related to ui-router states. + * An instance of this class is located on the global [[UIRouter]] object. + */ +var StateService = /** @class */ (function () { + /** @internalapi */ + function StateService(router) { + this.router = router; + /** @internalapi */ + this.invalidCallbacks = []; + /** @hidden */ + this._defaultErrorHandler = function $defaultErrorHandler($error$) { + if ($error$ instanceof Error && $error$.stack) { + console.error($error$); + console.error($error$.stack); + } + else if ($error$ instanceof Rejection) { + console.error($error$.toString()); + if ($error$.detail && $error$.detail.stack) + console.error($error$.detail.stack); + } + else { + console.error($error$); + } + }; + var getters = ['current', '$current', 'params', 'transition']; + var boundFns = Object.keys(StateService.prototype).filter(not(inArray(getters))); + createProxyFunctions(val(StateService.prototype), this, val(this), boundFns); + } + Object.defineProperty(StateService.prototype, "transition", { + /** + * The [[Transition]] currently in progress (or null) + * + * This is a passthrough through to [[UIRouterGlobals.transition]] + */ + get: function () { return this.router.globals.transition; }, + enumerable: true, + configurable: true + }); + Object.defineProperty(StateService.prototype, "params", { + /** + * The latest successful state parameters + * + * This is a passthrough through to [[UIRouterGlobals.params]] + */ + get: function () { return this.router.globals.params; }, + enumerable: true, + configurable: true + }); + Object.defineProperty(StateService.prototype, "current", { + /** + * The current [[StateDeclaration]] + * + * This is a passthrough through to [[UIRouterGlobals.current]] + */ + get: function () { return this.router.globals.current; }, + enumerable: true, + configurable: true + }); + Object.defineProperty(StateService.prototype, "$current", { + /** + * The current [[StateObject]] + * + * This is a passthrough through to [[UIRouterGlobals.$current]] + */ + get: function () { return this.router.globals.$current; }, + enumerable: true, + configurable: true + }); + /** @internalapi */ + StateService.prototype.dispose = function () { + this.defaultErrorHandler(noop$1); + this.invalidCallbacks = []; + }; + /** + * Handler for when [[transitionTo]] is called with an invalid state. + * + * Invokes the [[onInvalid]] callbacks, in natural order. + * Each callback's return value is checked in sequence until one of them returns an instance of TargetState. + * The results of the callbacks are wrapped in $q.when(), so the callbacks may return promises. + * + * If a callback returns an TargetState, then it is used as arguments to $state.transitionTo() and the result returned. + * + * @internalapi + */ + StateService.prototype._handleInvalidTargetState = function (fromPath, toState) { + var _this = this; + var fromState = PathUtils.makeTargetState(this.router.stateRegistry, fromPath); + var globals = this.router.globals; + var latestThing = function () { return globals.transitionHistory.peekTail(); }; + var latest = latestThing(); + var callbackQueue = new Queue(this.invalidCallbacks.slice()); + var injector = new ResolveContext(fromPath).injector(); + var checkForRedirect = function (result) { + if (!(result instanceof TargetState)) { + return; + } + var target = result; + // Recreate the TargetState, in case the state is now defined. + target = _this.target(target.identifier(), target.params(), target.options()); + if (!target.valid()) { + return Rejection.invalid(target.error()).toPromise(); + } + if (latestThing() !== latest) { + return Rejection.superseded().toPromise(); + } + return _this.transitionTo(target.identifier(), target.params(), target.options()); + }; + function invokeNextCallback() { + var nextCallback = callbackQueue.dequeue(); + if (nextCallback === undefined) + return Rejection.invalid(toState.error()).toPromise(); + var callbackResult = services.$q.when(nextCallback(toState, fromState, injector)); + return callbackResult.then(checkForRedirect).then(function (result) { return result || invokeNextCallback(); }); + } + return invokeNextCallback(); + }; + /** + * Registers an Invalid State handler + * + * Registers a [[OnInvalidCallback]] function to be invoked when [[StateService.transitionTo]] + * has been called with an invalid state reference parameter + * + * Example: + * ```js + * stateService.onInvalid(function(to, from, injector) { + * if (to.name() === 'foo') { + * let lazyLoader = injector.get('LazyLoadService'); + * return lazyLoader.load('foo') + * .then(() => stateService.target('foo')); + * } + * }); + * ``` + * + * @param {function} callback invoked when the toState is invalid + * This function receives the (invalid) toState, the fromState, and an injector. + * The function may optionally return a [[TargetState]] or a Promise for a TargetState. + * If one is returned, it is treated as a redirect. + * + * @returns a function which deregisters the callback + */ + StateService.prototype.onInvalid = function (callback) { + this.invalidCallbacks.push(callback); + return function deregisterListener() { + removeFrom(this.invalidCallbacks)(callback); + }.bind(this); + }; + /** + * Reloads the current state + * + * A method that force reloads the current state, or a partial state hierarchy. + * All resolves are re-resolved, and components reinstantiated. + * + * #### Example: + * ```js + * let app angular.module('app', ['ui.router']); + * + * app.controller('ctrl', function ($scope, $state) { + * $scope.reload = function(){ + * $state.reload(); + * } + * }); + * ``` + * + * Note: `reload()` is just an alias for: + * + * ```js + * $state.transitionTo($state.current, $state.params, { + * reload: true, inherit: false + * }); + * ``` + * + * @param reloadState A state name or a state object. + * If present, this state and all its children will be reloaded, but ancestors will not reload. + * + * #### Example: + * ```js + * //assuming app application consists of 3 states: 'contacts', 'contacts.detail', 'contacts.detail.item' + * //and current state is 'contacts.detail.item' + * let app angular.module('app', ['ui.router']); + * + * app.controller('ctrl', function ($scope, $state) { + * $scope.reload = function(){ + * //will reload 'contact.detail' and nested 'contact.detail.item' states + * $state.reload('contact.detail'); + * } + * }); + * ``` + * + * @returns A promise representing the state of the new transition. See [[StateService.go]] + */ + StateService.prototype.reload = function (reloadState) { + return this.transitionTo(this.current, this.params, { + reload: isDefined(reloadState) ? reloadState : true, + inherit: false, + notify: false, + }); + }; + + /** + * Transition to a different state and/or parameters + * + * Convenience method for transitioning to a new state. + * + * `$state.go` calls `$state.transitionTo` internally but automatically sets options to + * `{ location: true, inherit: true, relative: router.globals.$current, notify: true }`. + * This allows you to use either an absolute or relative `to` argument (because of `relative: router.globals.$current`). + * It also allows you to specify * only the parameters you'd like to update, while letting unspecified parameters + * inherit from the current parameter values (because of `inherit: true`). + * + * #### Example: + * ```js + * let app = angular.module('app', ['ui.router']); + * + * app.controller('ctrl', function ($scope, $state) { + * $scope.changeState = function () { + * $state.go('contact.detail'); + * }; + * }); + * ``` + * + * @param to Absolute state name, state object, or relative state path (relative to current state). + * + * Some examples: + * + * - `$state.go('contact.detail')` - will go to the `contact.detail` state + * - `$state.go('^')` - will go to the parent state + * - `$state.go('^.sibling')` - if current state is `home.child`, will go to the `home.sibling` state + * - `$state.go('.child.grandchild')` - if current state is home, will go to the `home.child.grandchild` state + * + * @param params A map of the parameters that will be sent to the state, will populate $stateParams. + * + * Any parameters that are not specified will be inherited from current parameter values (because of `inherit: true`). + * This allows, for example, going to a sibling state that shares parameters defined by a parent state. + * + * @param options Transition options + * + * @returns {promise} A promise representing the state of the new transition. + */ + StateService.prototype.go = function (to, params, options) { + var defautGoOpts = { relative: this.$current, inherit: true }; + var transOpts = defaults(options, defautGoOpts, defaultTransOpts); + return this.transitionTo(to, params, transOpts); + }; + + /** + * Creates a [[TargetState]] + * + * This is a factory method for creating a TargetState + * + * This may be returned from a Transition Hook to redirect a transition, for example. + */ + StateService.prototype.target = function (identifier, params, options) { + if (options === void 0) { options = {}; } + // If we're reloading, find the state object to reload from + if (isObject(options.reload) && !options.reload.name) + throw new Error('Invalid reload state object'); + var reg = this.router.stateRegistry; + options.reloadState = options.reload === true ? reg.root() : reg.matcher.find(options.reload, options.relative); + if (options.reload && !options.reloadState) + throw new Error("No such reload state '" + (isString(options.reload) ? options.reload : options.reload.name) + "'"); + return new TargetState(this.router.stateRegistry, identifier, params, options); + }; + + StateService.prototype.getCurrentPath = function () { + var _this = this; + var globals = this.router.globals; + var latestSuccess = globals.successfulTransitions.peekTail(); + var rootPath = function () { return [new PathNode(_this.router.stateRegistry.root())]; }; + return latestSuccess ? latestSuccess.treeChanges().to : rootPath(); + }; + /** + * Low-level method for transitioning to a new state. + * + * The [[go]] method (which uses `transitionTo` internally) is recommended in most situations. + * + * #### Example: + * ```js + * let app = angular.module('app', ['ui.router']); + * + * app.controller('ctrl', function ($scope, $state) { + * $scope.changeState = function () { + * $state.transitionTo('contact.detail'); + * }; + * }); + * ``` + * + * @param to State name or state object. + * @param toParams A map of the parameters that will be sent to the state, + * will populate $stateParams. + * @param options Transition options + * + * @returns A promise representing the state of the new transition. See [[go]] + */ + StateService.prototype.transitionTo = function (to, toParams, options) { + var _this = this; + if (toParams === void 0) { toParams = {}; } + if (options === void 0) { options = {}; } + var router = this.router; + var globals = router.globals; + options = defaults(options, defaultTransOpts); + var getCurrent = function () { + return globals.transition; + }; + options = extend(options, { current: getCurrent }); + var ref = this.target(to, toParams, options); + var currentPath = this.getCurrentPath(); + if (!ref.exists()) + return this._handleInvalidTargetState(currentPath, ref); + if (!ref.valid()) + return silentRejection(ref.error()); + /** + * Special handling for Ignored, Aborted, and Redirected transitions + * + * The semantics for the transition.run() promise and the StateService.transitionTo() + * promise differ. For instance, the run() promise may be rejected because it was + * IGNORED, but the transitionTo() promise is resolved because from the user perspective + * no error occurred. Likewise, the transition.run() promise may be rejected because of + * a Redirect, but the transitionTo() promise is chained to the new Transition's promise. + */ + var rejectedTransitionHandler = function (transition) { return function (error) { + if (error instanceof Rejection) { + var isLatest = router.globals.lastStartedTransitionId === transition.$id; + if (error.type === exports.RejectType.IGNORED) { + isLatest && router.urlRouter.update(); + // Consider ignored `Transition.run()` as a successful `transitionTo` + return services.$q.when(globals.current); + } + var detail = error.detail; + if (error.type === exports.RejectType.SUPERSEDED && error.redirected && detail instanceof TargetState) { + // If `Transition.run()` was redirected, allow the `transitionTo()` promise to resolve successfully + // by returning the promise for the new (redirect) `Transition.run()`. + var redirect = transition.redirect(detail); + return redirect.run().catch(rejectedTransitionHandler(redirect)); + } + if (error.type === exports.RejectType.ABORTED) { + isLatest && router.urlRouter.update(); + return services.$q.reject(error); + } + } + var errorHandler = _this.defaultErrorHandler(); + errorHandler(error); + return services.$q.reject(error); + }; }; + var transition = this.router.transitionService.create(currentPath, ref); + var transitionToPromise = transition.run().catch(rejectedTransitionHandler(transition)); + silenceUncaughtInPromise(transitionToPromise); // issue #2676 + // Return a promise for the transition, which also has the transition object on it. + return extend(transitionToPromise, { transition: transition }); + }; + + /** + * Checks if the current state *is* the provided state + * + * Similar to [[includes]] but only checks for the full state name. + * If params is supplied then it will be tested for strict equality against the current + * active params object, so all params must match with none missing and no extras. + * + * #### Example: + * ```js + * $state.$current.name = 'contacts.details.item'; + * + * // absolute name + * $state.is('contact.details.item'); // returns true + * $state.is(contactDetailItemStateObject); // returns true + * ``` + * + * // relative name (. and ^), typically from a template + * // E.g. from the 'contacts.details' template + * ```html + *
Item
+ * ``` + * + * @param stateOrName The state name (absolute or relative) or state object you'd like to check. + * @param params A param object, e.g. `{sectionId: section.id}`, that you'd like + * to test against the current active state. + * @param options An options object. The options are: + * - `relative`: If `stateOrName` is a relative state name and `options.relative` is set, .is will + * test relative to `options.relative` state (or name). + * + * @returns Returns true if it is the state. + */ + StateService.prototype.is = function (stateOrName, params, options) { + options = defaults(options, { relative: this.$current }); + var state = this.router.stateRegistry.matcher.find(stateOrName, options.relative); + if (!isDefined(state)) + return undefined; + if (this.$current !== state) + return false; + if (!params) + return true; + var schema = state.parameters({ inherit: true, matchingKeys: params }); + return Param.equals(schema, Param.values(schema, params), this.params); + }; + + /** + * Checks if the current state *includes* the provided state + * + * A method to determine if the current active state is equal to or is the child of the + * state stateName. If any params are passed then they will be tested for a match as well. + * Not all the parameters need to be passed, just the ones you'd like to test for equality. + * + * #### Example when `$state.$current.name === 'contacts.details.item'` + * ```js + * // Using partial names + * $state.includes("contacts"); // returns true + * $state.includes("contacts.details"); // returns true + * $state.includes("contacts.details.item"); // returns true + * $state.includes("contacts.list"); // returns false + * $state.includes("about"); // returns false + * ``` + * + * #### Glob Examples when `* $state.$current.name === 'contacts.details.item.url'`: + * ```js + * $state.includes("*.details.*.*"); // returns true + * $state.includes("*.details.**"); // returns true + * $state.includes("**.item.**"); // returns true + * $state.includes("*.details.item.url"); // returns true + * $state.includes("*.details.*.url"); // returns true + * $state.includes("*.details.*"); // returns false + * $state.includes("item.**"); // returns false + * ``` + * + * @param stateOrName A partial name, relative name, glob pattern, + * or state object to be searched for within the current state name. + * @param params A param object, e.g. `{sectionId: section.id}`, + * that you'd like to test against the current active state. + * @param options An options object. The options are: + * - `relative`: If `stateOrName` is a relative state name and `options.relative` is set, .is will + * test relative to `options.relative` state (or name). + * + * @returns {boolean} Returns true if it does include the state + */ + StateService.prototype.includes = function (stateOrName, params, options) { + options = defaults(options, { relative: this.$current }); + var glob = isString(stateOrName) && Glob.fromString(stateOrName); + if (glob) { + if (!glob.matches(this.$current.name)) + return false; + stateOrName = this.$current.name; + } + var state = this.router.stateRegistry.matcher.find(stateOrName, options.relative), include = this.$current.includes; + if (!isDefined(state)) + return undefined; + if (!isDefined(include[state.name])) + return false; + if (!params) + return true; + var schema = state.parameters({ inherit: true, matchingKeys: params }); + return Param.equals(schema, Param.values(schema, params), this.params); + }; + + /** + * Generates a URL for a state and parameters + * + * Returns the url for the given state populated with the given params. + * + * #### Example: + * ```js + * expect($state.href("about.person", { person: "bob" })).toEqual("/about/bob"); + * ``` + * + * @param stateOrName The state name or state object you'd like to generate a url from. + * @param params An object of parameter values to fill the state's required parameters. + * @param options Options object. The options are: + * + * @returns {string} compiled state url + */ + StateService.prototype.href = function (stateOrName, params, options) { + var defaultHrefOpts = { + lossy: true, + inherit: true, + absolute: false, + relative: this.$current, + }; + options = defaults(options, defaultHrefOpts); + params = params || {}; + var state = this.router.stateRegistry.matcher.find(stateOrName, options.relative); + if (!isDefined(state)) + return null; + if (options.inherit) + params = this.params.$inherit(params, this.$current, state); + var nav = (state && options.lossy) ? state.navigable : state; + if (!nav || nav.url === undefined || nav.url === null) { + return null; + } + return this.router.urlRouter.href(nav.url, params, { + absolute: options.absolute, + }); + }; + + /** + * Sets or gets the default [[transitionTo]] error handler. + * + * The error handler is called when a [[Transition]] is rejected or when any error occurred during the Transition. + * This includes errors caused by resolves and transition hooks. + * + * Note: + * This handler does not receive certain Transition rejections. + * Redirected and Ignored Transitions are not considered to be errors by [[StateService.transitionTo]]. + * + * The built-in default error handler logs the error to the console. + * + * You can provide your own custom handler. + * + * #### Example: + * ```js + * stateService.defaultErrorHandler(function() { + * // Do not log transitionTo errors + * }); + * ``` + * + * @param handler a global error handler function + * @returns the current global error handler + */ + StateService.prototype.defaultErrorHandler = function (handler) { + return this._defaultErrorHandler = handler || this._defaultErrorHandler; + }; + StateService.prototype.get = function (stateOrName, base) { + var reg = this.router.stateRegistry; + if (arguments.length === 0) + return reg.get(); + return reg.get(stateOrName, base || this.$current); + }; + /** + * Lazy loads a state + * + * Explicitly runs a state's [[StateDeclaration.lazyLoad]] function. + * + * @param stateOrName the state that should be lazy loaded + * @param transition the optional Transition context to use (if the lazyLoad function requires an injector, etc) + * Note: If no transition is provided, a noop transition is created using the from the current state to the current state. + * This noop transition is not actually run. + * + * @returns a promise to lazy load + */ + StateService.prototype.lazyLoad = function (stateOrName, transition) { + var state = this.get(stateOrName); + if (!state || !state.lazyLoad) + throw new Error("Can not lazy load " + stateOrName); + var currentPath = this.getCurrentPath(); + var target = PathUtils.makeTargetState(this.router.stateRegistry, currentPath); + transition = transition || this.router.transitionService.create(currentPath, target); + return lazyLoadState(transition, state); + }; + return StateService; +}()); + +/** + * # Transition subsystem + * + * This module contains APIs related to a Transition. + * + * See: + * - [[TransitionService]] + * - [[Transition]] + * - [[HookFn]], [[TransitionHookFn]], [[TransitionStateHookFn]], [[HookMatchCriteria]], [[HookResult]] + * + * @coreapi + * @preferred + * @module transition + */ /** for typedoc */ + +/** + * @internalapi + * @module vanilla + */ +/** */ +/** + * An angular1-like promise api + * + * This object implements four methods similar to the + * [angular 1 promise api](https://docs.angularjs.org/api/ng/service/$q) + * + * UI-Router evolved from an angular 1 library to a framework agnostic library. + * However, some of the `@uirouter/core` code uses these ng1 style APIs to support ng1 style dependency injection. + * + * This API provides native ES6 promise support wrapped as a $q-like API. + * Internally, UI-Router uses this $q object to perform promise operations. + * The `angular-ui-router` (ui-router for angular 1) uses the $q API provided by angular. + * + * $q-like promise api + */ +var $q = { + /** Normalizes a value as a promise */ + when: function (val) { return new Promise(function (resolve, reject) { return resolve(val); }); }, + /** Normalizes a value as a promise rejection */ + reject: function (val) { return new Promise(function (resolve, reject) { reject(val); }); }, + /** @returns a deferred object, which has `resolve` and `reject` functions */ + defer: function () { + var deferred = {}; + deferred.promise = new Promise(function (resolve, reject) { + deferred.resolve = resolve; + deferred.reject = reject; + }); + return deferred; + }, + /** Like Promise.all(), but also supports object key/promise notation like $q */ + all: function (promises) { + if (isArray(promises)) { + return Promise.all(promises); + } + if (isObject(promises)) { + // Convert promises map to promises array. + // When each promise resolves, map it to a tuple { key: key, val: val } + var chain = Object.keys(promises) + .map(function (key) { return promises[key].then(function (val) { return ({ key: key, val: val }); }); }); + // Then wait for all promises to resolve, and convert them back to an object + return $q.all(chain).then(function (values) { + return values.reduce(function (acc, tuple) { acc[tuple.key] = tuple.val; return acc; }, {}); + }); + } + } +}; + +/** + * @internalapi + * @module vanilla + */ +/** */ +// globally available injectables +var globals = {}; +var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg; +var ARGUMENT_NAMES = /([^\s,]+)/g; +/** + * A basic angular1-like injector api + * + * This object implements four methods similar to the + * [angular 1 dependency injector](https://docs.angularjs.org/api/auto/service/$injector) + * + * UI-Router evolved from an angular 1 library to a framework agnostic library. + * However, some of the `@uirouter/core` code uses these ng1 style APIs to support ng1 style dependency injection. + * + * This object provides a naive implementation of a globally scoped dependency injection system. + * It supports the following DI approaches: + * + * ### Function parameter names + * + * A function's `.toString()` is called, and the parameter names are parsed. + * This only works when the parameter names aren't "mangled" by a minifier such as UglifyJS. + * + * ```js + * function injectedFunction(FooService, BarService) { + * // FooService and BarService are injected + * } + * ``` + * + * ### Function annotation + * + * A function may be annotated with an array of dependency names as the `$inject` property. + * + * ```js + * injectedFunction.$inject = [ 'FooService', 'BarService' ]; + * function injectedFunction(fs, bs) { + * // FooService and BarService are injected as fs and bs parameters + * } + * ``` + * + * ### Array notation + * + * An array provides the names of the dependencies to inject (as strings). + * The function is the last element of the array. + * + * ```js + * [ 'FooService', 'BarService', function (fs, bs) { + * // FooService and BarService are injected as fs and bs parameters + * }] + * ``` + * + * @type {$InjectorLike} + */ +var $injector = { + /** Gets an object from DI based on a string token */ + get: function (name) { return globals[name]; }, + /** Returns true if an object named `name` exists in global DI */ + has: function (name) { return $injector.get(name) != null; }, + /** + * Injects a function + * + * @param fn the function to inject + * @param context the function's `this` binding + * @param locals An object with additional DI tokens and values, such as `{ someToken: { foo: 1 } }` + */ + invoke: function (fn, context, locals) { + var all = extend({}, globals, locals || {}); + var params = $injector.annotate(fn); + var ensureExist = assertPredicate(function (key) { return all.hasOwnProperty(key); }, function (key) { return "DI can't find injectable: '" + key + "'"; }); + var args = params.filter(ensureExist).map(function (x) { return all[x]; }); + if (isFunction(fn)) + return fn.apply(context, args); + else + return fn.slice(-1)[0].apply(context, args); + }, + /** + * Returns a function's dependencies + * + * Analyzes a function (or array) and returns an array of DI tokens that the function requires. + * @return an array of `string`s + */ + annotate: function (fn) { + if (!isInjectable(fn)) + throw new Error("Not an injectable function: " + fn); + if (fn && fn.$inject) + return fn.$inject; + if (isArray(fn)) + return fn.slice(0, -1); + var fnStr = fn.toString().replace(STRIP_COMMENTS, ''); + var result = fnStr.slice(fnStr.indexOf('(') + 1, fnStr.indexOf(')')).match(ARGUMENT_NAMES); + return result || []; + } +}; + +/** + * @internalapi + * @module vanilla + */ +/** */ +var keyValsToObjectR = function (accum, _a) { + var key = _a[0], val = _a[1]; + if (!accum.hasOwnProperty(key)) { + accum[key] = val; + } + else if (isArray(accum[key])) { + accum[key].push(val); + } + else { + accum[key] = [accum[key], val]; + } + return accum; +}; +var getParams = function (queryString) { + return queryString.split("&").filter(identity).map(splitEqual).reduce(keyValsToObjectR, {}); +}; +function parseUrl$1(url) { + var orEmptyString = function (x) { return x || ""; }; + var _a = splitHash(url).map(orEmptyString), beforehash = _a[0], hash = _a[1]; + var _b = splitQuery(beforehash).map(orEmptyString), path = _b[0], search = _b[1]; + return { path: path, search: search, hash: hash, url: url }; +} +var buildUrl = function (loc) { + var path = loc.path(); + var searchObject = loc.search(); + var hash = loc.hash(); + var search = Object.keys(searchObject).map(function (key) { + var param = searchObject[key]; + var vals = isArray(param) ? param : [param]; + return vals.map(function (val) { return key + "=" + val; }); + }).reduce(unnestR, []).join("&"); + return path + (search ? "?" + search : "") + (hash ? "#" + hash : ""); +}; +function locationPluginFactory(name, isHtml5, serviceClass, configurationClass) { + return function (router) { + var service = router.locationService = new serviceClass(router); + var configuration = router.locationConfig = new configurationClass(router, isHtml5); + function dispose(router) { + router.dispose(service); + router.dispose(configuration); + } + return { name: name, service: service, configuration: configuration, dispose: dispose }; + }; +} + +/** + * @internalapi + * @module vanilla + */ /** */ +/** A base `LocationServices` */ +var BaseLocationServices = /** @class */ (function () { + function BaseLocationServices(router, fireAfterUpdate) { + var _this = this; + this.fireAfterUpdate = fireAfterUpdate; + this._listener = function (evt) { return _this._listeners.forEach(function (cb) { return cb(evt); }); }; + this._listeners = []; + this.hash = function () { return parseUrl$1(_this._get()).hash; }; + this.path = function () { return parseUrl$1(_this._get()).path; }; + this.search = function () { return getParams(parseUrl$1(_this._get()).search); }; + this._location = root.location; + this._history = root.history; + } + BaseLocationServices.prototype.url = function (url, replace) { + if (replace === void 0) { replace = true; } + if (isDefined(url) && url !== this._get()) { + this._set(null, null, url, replace); + if (this.fireAfterUpdate) { + this._listeners.forEach(function (cb) { return cb({ url: url }); }); + } + } + return buildUrl(this); + }; + BaseLocationServices.prototype.onChange = function (cb) { + var _this = this; + this._listeners.push(cb); + return function () { return removeFrom(_this._listeners, cb); }; + }; + BaseLocationServices.prototype.dispose = function (router) { + deregAll(this._listeners); + }; + return BaseLocationServices; +}()); + +var __extends = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +/** + * @internalapi + * @module vanilla + */ +/** */ +/** A `LocationServices` that uses the browser hash "#" to get/set the current location */ +var HashLocationService = /** @class */ (function (_super) { + __extends(HashLocationService, _super); + function HashLocationService(router) { + var _this = _super.call(this, router, false) || this; + root.addEventListener('hashchange', _this._listener, false); + return _this; + } + HashLocationService.prototype._get = function () { + return trimHashVal(this._location.hash); + }; + HashLocationService.prototype._set = function (state, title, url, replace) { + this._location.hash = url; + }; + HashLocationService.prototype.dispose = function (router) { + _super.prototype.dispose.call(this, router); + root.removeEventListener('hashchange', this._listener); + }; + return HashLocationService; +}(BaseLocationServices)); + +var __extends$1 = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +/** + * @internalapi + * @module vanilla + */ +/** */ +/** A `LocationServices` that gets/sets the current location from an in-memory object */ +var MemoryLocationService = /** @class */ (function (_super) { + __extends$1(MemoryLocationService, _super); + function MemoryLocationService(router) { + return _super.call(this, router, true) || this; + } + MemoryLocationService.prototype._get = function () { + return this._url; + }; + MemoryLocationService.prototype._set = function (state, title, url, replace) { + this._url = url; + }; + return MemoryLocationService; +}(BaseLocationServices)); + +var __extends$2 = (undefined && undefined.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +/** + * A `LocationServices` that gets/sets the current location using the browser's `location` and `history` apis + * + * Uses `history.pushState` and `history.replaceState` + */ +var PushStateLocationService = /** @class */ (function (_super) { + __extends$2(PushStateLocationService, _super); + function PushStateLocationService(router) { + var _this = _super.call(this, router, true) || this; + _this._config = router.urlService.config; + root.addEventListener('popstate', _this._listener, false); + return _this; + } + + /** + * Gets the base prefix without: + * - trailing slash + * - trailing filename + * - protocol and hostname + * + * If , this returns '/base'. + * If , this returns '/base'. + * + * See: https://html.spec.whatwg.org/dev/semantics.html#the-base-element + */ + PushStateLocationService.prototype._getBasePrefix = function () { + return stripFile(this._config.baseHref()); + }; + PushStateLocationService.prototype._get = function () { + var _a = this._location, pathname = _a.pathname, hash = _a.hash, search = _a.search; + search = splitQuery(search)[1]; // strip ? if found + hash = splitHash(hash)[1]; // strip # if found + var basePrefix = this._getBasePrefix(); + var exactMatch = pathname === this._config.baseHref(); + var startsWith = pathname.startsWith(basePrefix); + pathname = exactMatch ? '/' : startsWith ? pathname.substring(basePrefix.length) : pathname; + return pathname + (search ? '?' + search : '') + (hash ? '#' + hash : ''); + }; + PushStateLocationService.prototype._set = function (state, title, url, replace) { + var fullUrl = this._getBasePrefix() + url; + if (replace) { + this._history.replaceState(state, title, fullUrl); + } + else { + this._history.pushState(state, title, fullUrl); + } + }; + PushStateLocationService.prototype.dispose = function (router) { + _super.prototype.dispose.call(this, router); + root.removeEventListener('popstate', this._listener); + }; + return PushStateLocationService; +}(BaseLocationServices)); + +/** A `LocationConfig` mock that gets/sets all config from an in-memory object */ +var MemoryLocationConfig = /** @class */ (function () { + function MemoryLocationConfig() { + var _this = this; + this._baseHref = ''; + this._port = 80; + this._protocol = "http"; + this._host = "localhost"; + this._hashPrefix = ""; + this.port = function () { return _this._port; }; + this.protocol = function () { return _this._protocol; }; + this.host = function () { return _this._host; }; + this.baseHref = function () { return _this._baseHref; }; + this.html5Mode = function () { return false; }; + this.hashPrefix = function (newval) { return isDefined(newval) ? _this._hashPrefix = newval : _this._hashPrefix; }; + this.dispose = noop$1; + } + return MemoryLocationConfig; +}()); + +/** + * @internalapi + * @module vanilla + */ +/** */ +/** A `LocationConfig` that delegates to the browser's `location` object */ +var BrowserLocationConfig = /** @class */ (function () { + function BrowserLocationConfig(router, _isHtml5) { + if (_isHtml5 === void 0) { _isHtml5 = false; } + this._isHtml5 = _isHtml5; + this._baseHref = undefined; + this._hashPrefix = ""; + } + BrowserLocationConfig.prototype.port = function () { + if (location.port) { + return Number(location.port); + } + return this.protocol() === 'https' ? 443 : 80; + }; + BrowserLocationConfig.prototype.protocol = function () { + return location.protocol.replace(/:/g, ''); + }; + BrowserLocationConfig.prototype.host = function () { + return location.hostname; + }; + BrowserLocationConfig.prototype.html5Mode = function () { + return this._isHtml5; + }; + BrowserLocationConfig.prototype.hashPrefix = function (newprefix) { + return isDefined(newprefix) ? this._hashPrefix = newprefix : this._hashPrefix; + }; + + BrowserLocationConfig.prototype.baseHref = function (href) { + return isDefined(href) ? this._baseHref = href : + isDefined(this._baseHref) ? this._baseHref : this.applyDocumentBaseHref(); + }; + BrowserLocationConfig.prototype.applyDocumentBaseHref = function () { + var baseTag = document.getElementsByTagName("base")[0]; + return this._baseHref = baseTag ? baseTag.href.substr(location.origin.length) : ""; + }; + BrowserLocationConfig.prototype.dispose = function () { }; + return BrowserLocationConfig; +}()); + +/** + * @internalapi + * @module vanilla + */ +/** */ +function servicesPlugin(router) { + services.$injector = $injector; + services.$q = $q; + return { name: "vanilla.services", $q: $q, $injector: $injector, dispose: function () { return null; } }; +} +/** A `UIRouterPlugin` uses the browser hash to get/set the current location */ +var hashLocationPlugin = locationPluginFactory('vanilla.hashBangLocation', false, HashLocationService, BrowserLocationConfig); +/** A `UIRouterPlugin` that gets/sets the current location using the browser's `location` and `history` apis */ +var pushStateLocationPlugin = locationPluginFactory("vanilla.pushStateLocation", true, PushStateLocationService, BrowserLocationConfig); +/** A `UIRouterPlugin` that gets/sets the current location from an in-memory object */ +var memoryLocationPlugin = locationPluginFactory("vanilla.memoryLocation", false, MemoryLocationService, MemoryLocationConfig); + +/** + * @internalapi + * @module vanilla + */ +/** */ + +/** + * # Core classes and interfaces + * + * The classes and interfaces that are core to ui-router and do not belong + * to a more specific subsystem (such as resolve). + * + * @coreapi + * @preferred + * @module core + */ /** for typedoc */ +/** @internalapi */ +var UIRouterPluginBase = /** @class */ (function () { + function UIRouterPluginBase() { + } + UIRouterPluginBase.prototype.dispose = function (router) { }; + return UIRouterPluginBase; +}()); + +/** + * @coreapi + * @module common + */ /** */ + + + +var index$1 = Object.freeze({ + root: root, + fromJson: fromJson, + toJson: toJson, + forEach: forEach, + extend: extend, + equals: equals, + identity: identity, + noop: noop$1, + createProxyFunctions: createProxyFunctions, + inherit: inherit, + inArray: inArray, + _inArray: _inArray, + removeFrom: removeFrom, + _removeFrom: _removeFrom, + pushTo: pushTo, + _pushTo: _pushTo, + deregAll: deregAll, + defaults: defaults, + mergeR: mergeR, + ancestors: ancestors, + pick: pick, + omit: omit, + pluck: pluck, + filter: filter, + find: find, + mapObj: mapObj, + map: map, + values: values, + allTrueR: allTrueR, + anyTrueR: anyTrueR, + unnestR: unnestR, + flattenR: flattenR, + pushR: pushR, + uniqR: uniqR, + unnest: unnest, + flatten: flatten, + assertPredicate: assertPredicate, + assertMap: assertMap, + assertFn: assertFn, + pairs: pairs, + arrayTuples: arrayTuples, + applyPairs: applyPairs, + tail: tail, + copy: copy, + _extend: _extend, + silenceUncaughtInPromise: silenceUncaughtInPromise, + silentRejection: silentRejection, + notImplemented: notImplemented, + services: services, + Glob: Glob, + curry: curry, + compose: compose, + pipe: pipe, + prop: prop, + propEq: propEq, + parse: parse, + not: not, + and: and, + or: or, + all: all, + any: any, + is: is, + eq: eq, + val: val, + invoke: invoke, + pattern: pattern, + isUndefined: isUndefined, + isDefined: isDefined, + isNull: isNull, + isNullOrUndefined: isNullOrUndefined, + isFunction: isFunction, + isNumber: isNumber, + isString: isString, + isObject: isObject, + isArray: isArray, + isDate: isDate, + isRegExp: isRegExp, + isState: isState, + isInjectable: isInjectable, + isPromise: isPromise, + Queue: Queue, + maxLength: maxLength, + padString: padString, + kebobString: kebobString, + functionToString: functionToString, + fnToString: fnToString, + stringify: stringify, + beforeAfterSubstr: beforeAfterSubstr, + hostRegex: hostRegex, + stripFile: stripFile, + splitHash: splitHash, + splitQuery: splitQuery, + splitEqual: splitEqual, + trimHashVal: trimHashVal, + splitOnDelim: splitOnDelim, + joinNeighborsR: joinNeighborsR, + get Category () { return exports.Category; }, + Trace: Trace, + trace: trace, + get DefType () { return exports.DefType; }, + Param: Param, + ParamTypes: ParamTypes, + StateParams: StateParams, + ParamType: ParamType, + PathNode: PathNode, + PathUtils: PathUtils, + resolvePolicies: resolvePolicies, + defaultResolvePolicy: defaultResolvePolicy, + Resolvable: Resolvable, + NATIVE_INJECTOR_TOKEN: NATIVE_INJECTOR_TOKEN, + ResolveContext: ResolveContext, + resolvablesBuilder: resolvablesBuilder, + StateBuilder: StateBuilder, + StateObject: StateObject, + StateMatcher: StateMatcher, + StateQueueManager: StateQueueManager, + StateRegistry: StateRegistry, + StateService: StateService, + TargetState: TargetState, + get TransitionHookPhase () { return exports.TransitionHookPhase; }, + get TransitionHookScope () { return exports.TransitionHookScope; }, + HookBuilder: HookBuilder, + matchState: matchState, + RegisteredHook: RegisteredHook, + makeEvent: makeEvent, + get RejectType () { return exports.RejectType; }, + Rejection: Rejection, + Transition: Transition, + TransitionHook: TransitionHook, + TransitionEventType: TransitionEventType, + defaultTransOpts: defaultTransOpts, + TransitionService: TransitionService, + UrlMatcher: UrlMatcher, + UrlMatcherFactory: UrlMatcherFactory, + UrlRouter: UrlRouter, + UrlRuleFactory: UrlRuleFactory, + BaseUrlRule: BaseUrlRule, + UrlService: UrlService, + ViewService: ViewService, + UIRouterGlobals: UIRouterGlobals, + UIRouter: UIRouter, + $q: $q, + $injector: $injector, + BaseLocationServices: BaseLocationServices, + HashLocationService: HashLocationService, + MemoryLocationService: MemoryLocationService, + PushStateLocationService: PushStateLocationService, + MemoryLocationConfig: MemoryLocationConfig, + BrowserLocationConfig: BrowserLocationConfig, + keyValsToObjectR: keyValsToObjectR, + getParams: getParams, + parseUrl: parseUrl$1, + buildUrl: buildUrl, + locationPluginFactory: locationPluginFactory, + servicesPlugin: servicesPlugin, + hashLocationPlugin: hashLocationPlugin, + pushStateLocationPlugin: pushStateLocationPlugin, + memoryLocationPlugin: memoryLocationPlugin, + UIRouterPluginBase: UIRouterPluginBase +}); + +function getNg1ViewConfigFactory() { + var templateFactory = null; + return function (path, view) { + templateFactory = templateFactory || services.$injector.get("$templateFactory"); + return [new Ng1ViewConfig(path, view, templateFactory)]; + }; +} +var hasAnyKey = function (keys, obj) { + return keys.reduce(function (acc, key) { return acc || isDefined(obj[key]); }, false); +}; +/** + * This is a [[StateBuilder.builder]] function for angular1 `views`. + * + * When the [[StateBuilder]] builds a [[StateObject]] object from a raw [[StateDeclaration]], this builder + * handles the `views` property with logic specific to @uirouter/angularjs (ng1). + * + * If no `views: {}` property exists on the [[StateDeclaration]], then it creates the `views` object + * and applies the state-level configuration to a view named `$default`. + */ +function ng1ViewsBuilder(state) { + // Do not process root state + if (!state.parent) + return {}; + var tplKeys = ['templateProvider', 'templateUrl', 'template', 'notify', 'async'], ctrlKeys = ['controller', 'controllerProvider', 'controllerAs', 'resolveAs'], compKeys = ['component', 'bindings', 'componentProvider'], nonCompKeys = tplKeys.concat(ctrlKeys), allViewKeys = compKeys.concat(nonCompKeys); + // Do not allow a state to have both state-level props and also a `views: {}` property. + // A state without a `views: {}` property can declare properties for the `$default` view as properties of the state. + // However, the `$default` approach should not be mixed with a separate `views: ` block. + if (isDefined(state.views) && hasAnyKey(allViewKeys, state)) { + throw new Error("State '" + state.name + "' has a 'views' object. " + + "It cannot also have \"view properties\" at the state level. " + + "Move the following properties into a view (in the 'views' object): " + + (" " + allViewKeys.filter(function (key) { return isDefined(state[key]); }).join(", "))); + } + var views = {}, viewsObject = state.views || { "$default": pick(state, allViewKeys) }; + forEach(viewsObject, function (config, name) { + // Account for views: { "": { template... } } + name = name || "$default"; + // Account for views: { header: "headerComponent" } + if (isString(config)) + config = { component: config }; + // Make a shallow copy of the config object + config = extend({}, config); + // Do not allow a view to mix props for component-style view with props for template/controller-style view + if (hasAnyKey(compKeys, config) && hasAnyKey(nonCompKeys, config)) { + throw new Error("Cannot combine: " + compKeys.join("|") + " with: " + nonCompKeys.join("|") + " in stateview: '" + name + "@" + state.name + "'"); + } + config.resolveAs = config.resolveAs || '$resolve'; + config.$type = "ng1"; + config.$context = state; + config.$name = name; + var normalized = ViewService.normalizeUIViewTarget(config.$context, config.$name); + config.$uiViewName = normalized.uiViewName; + config.$uiViewContextAnchor = normalized.uiViewContextAnchor; + views[name] = config; + }); + return views; +} +var id$1 = 0; +var Ng1ViewConfig = /** @class */ (function () { + function Ng1ViewConfig(path, viewDecl, factory) { + var _this = this; + this.path = path; + this.viewDecl = viewDecl; + this.factory = factory; + this.$id = id$1++; + this.loaded = false; + this.getTemplate = function (uiView, context) { + return _this.component ? _this.factory.makeComponentTemplate(uiView, context, _this.component, _this.viewDecl.bindings) : _this.template; + }; + } + Ng1ViewConfig.prototype.load = function () { + var _this = this; + var $q = services.$q; + var context = new ResolveContext(this.path); + var params = this.path.reduce(function (acc, node) { return extend(acc, node.paramValues); }, {}); + var promises = { + template: $q.when(this.factory.fromConfig(this.viewDecl, params, context)), + controller: $q.when(this.getController(context)) + }; + return $q.all(promises).then(function (results) { + trace.traceViewServiceEvent("Loaded", _this); + _this.controller = results.controller; + extend(_this, results.template); // Either { template: "tpl" } or { component: "cmpName" } + return _this; + }); + }; + /** + * Gets the controller for a view configuration. + * + * @returns {Function|Promise.} Returns a controller, or a promise that resolves to a controller. + */ + Ng1ViewConfig.prototype.getController = function (context) { + var provider = this.viewDecl.controllerProvider; + if (!isInjectable(provider)) + return this.viewDecl.controller; + var deps = services.$injector.annotate(provider); + var providerFn = isArray(provider) ? tail(provider) : provider; + var resolvable = new Resolvable("", providerFn, deps); + return resolvable.get(context); + }; + return Ng1ViewConfig; +}()); + +/** @module view */ +/** for typedoc */ +/** + * Service which manages loading of templates from a ViewConfig. + */ +var TemplateFactory = /** @class */ (function () { + function TemplateFactory() { + var _this = this; + /** @hidden */ this._useHttp = ng.version.minor < 3; + /** @hidden */ this.$get = ['$http', '$templateCache', '$injector', function ($http, $templateCache, $injector) { + _this.$templateRequest = $injector.has && $injector.has('$templateRequest') && $injector.get('$templateRequest'); + _this.$http = $http; + _this.$templateCache = $templateCache; + return _this; + }]; + } + /** @hidden */ + TemplateFactory.prototype.useHttpService = function (value) { + this._useHttp = value; + }; + + /** + * Creates a template from a configuration object. + * + * @param config Configuration object for which to load a template. + * The following properties are search in the specified order, and the first one + * that is defined is used to create the template: + * + * @param params Parameters to pass to the template function. + * @param context The resolve context associated with the template's view + * + * @return {string|object} The template html as a string, or a promise for + * that string,or `null` if no template is configured. + */ + TemplateFactory.prototype.fromConfig = function (config, params, context) { + var defaultTemplate = ""; + var asTemplate = function (result) { return services.$q.when(result).then(function (str) { return ({ template: str }); }); }; + var asComponent = function (result) { return services.$q.when(result).then(function (str) { return ({ component: str }); }); }; + return (isDefined(config.template) ? asTemplate(this.fromString(config.template, params)) : + isDefined(config.templateUrl) ? asTemplate(this.fromUrl(config.templateUrl, params)) : + isDefined(config.templateProvider) ? asTemplate(this.fromProvider(config.templateProvider, params, context)) : + isDefined(config.component) ? asComponent(config.component) : + isDefined(config.componentProvider) ? asComponent(this.fromComponentProvider(config.componentProvider, params, context)) : + asTemplate(defaultTemplate)); + }; + + /** + * Creates a template from a string or a function returning a string. + * + * @param template html template as a string or function that returns an html template as a string. + * @param params Parameters to pass to the template function. + * + * @return {string|object} The template html as a string, or a promise for that + * string. + */ + TemplateFactory.prototype.fromString = function (template, params) { + return isFunction(template) ? template(params) : template; + }; + + /** + * Loads a template from the a URL via `$http` and `$templateCache`. + * + * @param {string|Function} url url of the template to load, or a function + * that returns a url. + * @param {Object} params Parameters to pass to the url function. + * @return {string|Promise.} The template html as a string, or a promise + * for that string. + */ + TemplateFactory.prototype.fromUrl = function (url, params) { + if (isFunction(url)) + url = url(params); + if (url == null) + return null; + if (this._useHttp) { + return this.$http.get(url, { cache: this.$templateCache, headers: { Accept: 'text/html' } }) + .then(function (response) { + return response.data; + }); + } + return this.$templateRequest(url); + }; + + /** + * Creates a template by invoking an injectable provider function. + * + * @param provider Function to invoke via `locals` + * @param {Function} injectFn a function used to invoke the template provider + * @return {string|Promise.} The template html as a string, or a promise + * for that string. + */ + TemplateFactory.prototype.fromProvider = function (provider, params, context) { + var deps = services.$injector.annotate(provider); + var providerFn = isArray(provider) ? tail(provider) : provider; + var resolvable = new Resolvable("", providerFn, deps); + return resolvable.get(context); + }; + + /** + * Creates a component's template by invoking an injectable provider function. + * + * @param provider Function to invoke via `locals` + * @param {Function} injectFn a function used to invoke the template provider + * @return {string} The template html as a string: "". + */ + TemplateFactory.prototype.fromComponentProvider = function (provider, params, context) { + var deps = services.$injector.annotate(provider); + var providerFn = isArray(provider) ? tail(provider) : provider; + var resolvable = new Resolvable("", providerFn, deps); + return resolvable.get(context); + }; + + /** + * Creates a template from a component's name + * + * This implements route-to-component. + * It works by retrieving the component (directive) metadata from the injector. + * It analyses the component's bindings, then constructs a template that instantiates the component. + * The template wires input and output bindings to resolves or from the parent component. + * + * @param uiView {object} The parent ui-view (for binding outputs to callbacks) + * @param context The ResolveContext (for binding outputs to callbacks returned from resolves) + * @param component {string} Component's name in camel case. + * @param bindings An object defining the component's bindings: {foo: '<'} + * @return {string} The template as a string: "". + */ + TemplateFactory.prototype.makeComponentTemplate = function (uiView, context, component, bindings) { + bindings = bindings || {}; + // Bind once prefix + var prefix = ng.version.minor >= 3 ? "::" : ""; + // Convert to kebob name. Add x- prefix if the string starts with `x-` or `data-` + var kebob = function (camelCase) { + var kebobed = kebobString(camelCase); + return /^(x|data)-/.exec(kebobed) ? "x-" + kebobed : kebobed; + }; + var attributeTpl = function (input) { + var name = input.name, type = input.type; + var attrName = kebob(name); + // If the ui-view has an attribute which matches a binding on the routed component + // then pass that attribute through to the routed component template. + // Prefer ui-view wired mappings to resolve data, unless the resolve was explicitly bound using `bindings:` + if (uiView.attr(attrName) && !bindings[name]) + return attrName + "='" + uiView.attr(attrName) + "'"; + var resolveName = bindings[name] || name; + // Pre-evaluate the expression for "@" bindings by enclosing in {{ }} + // some-attr="{{ ::$resolve.someResolveName }}" + if (type === '@') + return attrName + "='{{" + prefix + "$resolve." + resolveName + "}}'"; + // Wire "&" callbacks to resolves that return a callback function + // Get the result of the resolve (should be a function) and annotate it to get its arguments. + // some-attr="$resolve.someResolveResultName(foo, bar)" + if (type === '&') { + var res = context.getResolvable(resolveName); + var fn = res && res.data; + var args = fn && services.$injector.annotate(fn) || []; + // account for array style injection, i.e., ['foo', function(foo) {}] + var arrayIdxStr = isArray(fn) ? "[" + (fn.length - 1) + "]" : ''; + return attrName + "='$resolve." + resolveName + arrayIdxStr + "(" + args.join(",") + ")'"; + } + // some-attr="::$resolve.someResolveName" + return attrName + "='" + prefix + "$resolve." + resolveName + "'"; + }; + var attrs = getComponentBindings(component).map(attributeTpl).join(" "); + var kebobName = kebob(component); + return "<" + kebobName + " " + attrs + ">"; + }; + + return TemplateFactory; +}()); +// Gets all the directive(s)' inputs ('@', '=', and '<') and outputs ('&') +function getComponentBindings(name) { + var cmpDefs = services.$injector.get(name + "Directive"); // could be multiple + if (!cmpDefs || !cmpDefs.length) + throw new Error("Unable to find component named '" + name + "'"); + return cmpDefs.map(getBindings).reduce(unnestR, []); +} +// Given a directive definition, find its object input attributes +// Use different properties, depending on the type of directive (component, bindToController, normal) +var getBindings = function (def) { + if (isObject(def.bindToController)) + return scopeBindings(def.bindToController); + return scopeBindings(def.scope); +}; +// for ng 1.2 style, process the scope: { input: "=foo" } +// for ng 1.3 through ng 1.5, process the component's bindToController: { input: "=foo" } object +var scopeBindings = function (bindingsObj) { return Object.keys(bindingsObj || {}) + .map(function (key) { return [key, /^([=<@&])[?]?(.*)/.exec(bindingsObj[key])]; }) + .filter(function (tuple) { return isDefined(tuple) && isArray(tuple[1]); }) + .map(function (tuple) { return ({ name: tuple[1][2] || tuple[0], type: tuple[1][1] }); }); }; + +/** @module ng1 */ /** for typedoc */ +/** + * The Angular 1 `StateProvider` + * + * The `$stateProvider` works similar to Angular's v1 router, but it focuses purely + * on state. + * + * A state corresponds to a "place" in the application in terms of the overall UI and + * navigation. A state describes (via the controller / template / view properties) what + * the UI looks like and does at that place. + * + * States often have things in common, and the primary way of factoring out these + * commonalities in this model is via the state hierarchy, i.e. parent/child states aka + * nested states. + * + * The `$stateProvider` provides interfaces to declare these states for your app. + */ +var StateProvider = /** @class */ (function () { + function StateProvider(stateRegistry, stateService) { + this.stateRegistry = stateRegistry; + this.stateService = stateService; + createProxyFunctions(val(StateProvider.prototype), this, val(this)); + } + /** + * Decorates states when they are registered + * + * Allows you to extend (carefully) or override (at your own peril) the + * `stateBuilder` object used internally by [[StateRegistry]]. + * This can be used to add custom functionality to ui-router, + * for example inferring templateUrl based on the state name. + * + * When passing only a name, it returns the current (original or decorated) builder + * function that matches `name`. + * + * The builder functions that can be decorated are listed below. Though not all + * necessarily have a good use case for decoration, that is up to you to decide. + * + * In addition, users can attach custom decorators, which will generate new + * properties within the state's internal definition. There is currently no clear + * use-case for this beyond accessing internal states (i.e. $state.$current), + * however, expect this to become increasingly relevant as we introduce additional + * meta-programming features. + * + * **Warning**: Decorators should not be interdependent because the order of + * execution of the builder functions in non-deterministic. Builder functions + * should only be dependent on the state definition object and super function. + * + * + * Existing builder functions and current return values: + * + * - **parent** `{object}` - returns the parent state object. + * - **data** `{object}` - returns state data, including any inherited data that is not + * overridden by own values (if any). + * - **url** `{object}` - returns a {@link ui.router.util.type:UrlMatcher UrlMatcher} + * or `null`. + * - **navigable** `{object}` - returns closest ancestor state that has a URL (aka is + * navigable). + * - **params** `{object}` - returns an array of state params that are ensured to + * be a super-set of parent's params. + * - **views** `{object}` - returns a views object where each key is an absolute view + * name (i.e. "viewName@stateName") and each value is the config object + * (template, controller) for the view. Even when you don't use the views object + * explicitly on a state config, one is still created for you internally. + * So by decorating this builder function you have access to decorating template + * and controller properties. + * - **ownParams** `{object}` - returns an array of params that belong to the state, + * not including any params defined by ancestor states. + * - **path** `{string}` - returns the full path from the root down to this state. + * Needed for state activation. + * - **includes** `{object}` - returns an object that includes every state that + * would pass a `$state.includes()` test. + * + * #### Example: + * Override the internal 'views' builder with a function that takes the state + * definition, and a reference to the internal function being overridden: + * ```js + * $stateProvider.decorator('views', function (state, parent) { + * let result = {}, + * views = parent(state); + * + * angular.forEach(views, function (config, name) { + * let autoName = (state.name + '.' + name).replace('.', '/'); + * config.templateUrl = config.templateUrl || '/partials/' + autoName + '.html'; + * result[name] = config; + * }); + * return result; + * }); + * + * $stateProvider.state('home', { + * views: { + * 'contact.list': { controller: 'ListController' }, + * 'contact.item': { controller: 'ItemController' } + * } + * }); + * ``` + * + * + * ```js + * // Auto-populates list and item views with /partials/home/contact/list.html, + * // and /partials/home/contact/item.html, respectively. + * $state.go('home'); + * ``` + * + * @param {string} name The name of the builder function to decorate. + * @param {object} func A function that is responsible for decorating the original + * builder function. The function receives two parameters: + * + * - `{object}` - state - The state config object. + * - `{object}` - super - The original builder function. + * + * @return {object} $stateProvider - $stateProvider instance + */ + StateProvider.prototype.decorator = function (name, func) { + return this.stateRegistry.decorator(name, func) || this; + }; + StateProvider.prototype.state = function (name, definition) { + if (isObject(name)) { + definition = name; + } + else { + definition.name = name; + } + this.stateRegistry.register(definition); + return this; + }; + /** + * Registers an invalid state handler + * + * This is a passthrough to [[StateService.onInvalid]] for ng1. + */ + StateProvider.prototype.onInvalid = function (callback) { + return this.stateService.onInvalid(callback); + }; + return StateProvider; +}()); + +/** @module ng1 */ /** */ +/** + * This is a [[StateBuilder.builder]] function for angular1 `onEnter`, `onExit`, + * `onRetain` callback hooks on a [[Ng1StateDeclaration]]. + * + * When the [[StateBuilder]] builds a [[StateObject]] object from a raw [[StateDeclaration]], this builder + * ensures that those hooks are injectable for @uirouter/angularjs (ng1). + */ +var getStateHookBuilder = function (hookName) { + return function stateHookBuilder(state, parentFn) { + var hook = state[hookName]; + var pathname = hookName === 'onExit' ? 'from' : 'to'; + function decoratedNg1Hook(trans, state) { + var resolveContext = new ResolveContext(trans.treeChanges(pathname)); + var locals = extend(getLocals(resolveContext), { $state$: state, $transition$: trans }); + return services.$injector.invoke(hook, this, locals); + } + return hook ? decoratedNg1Hook : undefined; + }; +}; + +/** + * Implements UI-Router LocationServices and LocationConfig using Angular 1's $location service + */ +var Ng1LocationServices = /** @class */ (function () { + function Ng1LocationServices($locationProvider) { + // .onChange() registry + this._urlListeners = []; + this.$locationProvider = $locationProvider; + var _lp = val($locationProvider); + createProxyFunctions(_lp, this, _lp, ['hashPrefix']); + } + Ng1LocationServices.prototype.dispose = function () { }; + Ng1LocationServices.prototype.onChange = function (callback) { + var _this = this; + this._urlListeners.push(callback); + return function () { return removeFrom(_this._urlListeners)(callback); }; + }; + Ng1LocationServices.prototype.html5Mode = function () { + var html5Mode = this.$locationProvider.html5Mode(); + html5Mode = isObject(html5Mode) ? html5Mode.enabled : html5Mode; + return html5Mode && this.$sniffer.history; + }; + Ng1LocationServices.prototype.url = function (newUrl, replace, state) { + if (replace === void 0) { replace = false; } + if (newUrl) + this.$location.url(newUrl); + if (replace) + this.$location.replace(); + if (state) + this.$location.state(state); + return this.$location.url(); + }; + Ng1LocationServices.prototype._runtimeServices = function ($rootScope, $location, $sniffer, $browser) { + var _this = this; + this.$location = $location; + this.$sniffer = $sniffer; + // Bind $locationChangeSuccess to the listeners registered in LocationService.onChange + $rootScope.$on("$locationChangeSuccess", function (evt) { return _this._urlListeners.forEach(function (fn) { return fn(evt); }); }); + var _loc = val($location); + var _browser = val($browser); + // Bind these LocationService functions to $location + createProxyFunctions(_loc, this, _loc, ["replace", "path", "search", "hash"]); + // Bind these LocationConfig functions to $location + createProxyFunctions(_loc, this, _loc, ['port', 'protocol', 'host']); + // Bind these LocationConfig functions to $browser + createProxyFunctions(_browser, this, _browser, ['baseHref']); + }; + /** + * Applys ng1-specific path parameter encoding + * + * The Angular 1 `$location` service is a bit weird. + * It doesn't allow slashes to be encoded/decoded bi-directionally. + * + * See the writeup at https://github.com/angular-ui/ui-router/issues/2598 + * + * This code patches the `path` parameter type so it encoded/decodes slashes as ~2F + * + * @param router + */ + Ng1LocationServices.monkeyPatchPathParameterType = function (router) { + var pathType = router.urlMatcherFactory.type('path'); + pathType.encode = function (val) { + return val != null ? val.toString().replace(/(~|\/)/g, function (m) { return ({ '~': '~~', '/': '~2F' }[m]); }) : val; + }; + pathType.decode = function (val) { + return val != null ? val.toString().replace(/(~~|~2F)/g, function (m) { return ({ '~~': '~', '~2F': '/' }[m]); }) : val; + }; + }; + return Ng1LocationServices; +}()); + +/** @module url */ /** */ +/** + * Manages rules for client-side URL + * + * ### Deprecation warning: + * This class is now considered to be an internal API + * Use the [[UrlService]] instead. + * For configuring URL rules, use the [[UrlRulesApi]] which can be found as [[UrlService.rules]]. + * + * This class manages the router rules for what to do when the URL changes. + * + * This provider remains for backwards compatibility. + * + * @deprecated + */ +var UrlRouterProvider = /** @class */ (function () { + /** @hidden */ + function UrlRouterProvider(router) { + this._router = router; + this._urlRouter = router.urlRouter; + } + /** @hidden */ + UrlRouterProvider.prototype.$get = function () { + var urlRouter = this._urlRouter; + urlRouter.update(true); + if (!urlRouter.interceptDeferred) + urlRouter.listen(); + return urlRouter; + }; + /** + * Registers a url handler function. + * + * Registers a low level url handler (a `rule`). + * A rule detects specific URL patterns and returns a redirect, or performs some action. + * + * If a rule returns a string, the URL is replaced with the string, and all rules are fired again. + * + * #### Example: + * ```js + * var app = angular.module('app', ['ui.router.router']); + * + * app.config(function ($urlRouterProvider) { + * // Here's an example of how you might allow case insensitive urls + * $urlRouterProvider.rule(function ($injector, $location) { + * var path = $location.path(), + * normalized = path.toLowerCase(); + * + * if (path !== normalized) { + * return normalized; + * } + * }); + * }); + * ``` + * + * @param ruleFn + * Handler function that takes `$injector` and `$location` services as arguments. + * You can use them to detect a url and return a different url as a string. + * + * @return [[UrlRouterProvider]] (`this`) + */ + UrlRouterProvider.prototype.rule = function (ruleFn) { + var _this = this; + if (!isFunction(ruleFn)) + throw new Error("'rule' must be a function"); + var match = function () { + return ruleFn(services.$injector, _this._router.locationService); + }; + var rule = new BaseUrlRule(match, identity); + this._urlRouter.rule(rule); + return this; + }; + + /** + * Defines the path or behavior to use when no url can be matched. + * + * #### Example: + * ```js + * var app = angular.module('app', ['ui.router.router']); + * + * app.config(function ($urlRouterProvider) { + * // if the path doesn't match any of the urls you configured + * // otherwise will take care of routing the user to the + * // specified url + * $urlRouterProvider.otherwise('/index'); + * + * // Example of using function rule as param + * $urlRouterProvider.otherwise(function ($injector, $location) { + * return '/a/valid/url'; + * }); + * }); + * ``` + * + * @param rule + * The url path you want to redirect to or a function rule that returns the url path or performs a `$state.go()`. + * The function version is passed two params: `$injector` and `$location` services, and should return a url string. + * + * @return {object} `$urlRouterProvider` - `$urlRouterProvider` instance + */ + UrlRouterProvider.prototype.otherwise = function (rule) { + var _this = this; + var urlRouter = this._urlRouter; + if (isString(rule)) { + urlRouter.otherwise(rule); + } + else if (isFunction(rule)) { + urlRouter.otherwise(function () { return rule(services.$injector, _this._router.locationService); }); + } + else { + throw new Error("'rule' must be a string or function"); + } + return this; + }; + + /** + * Registers a handler for a given url matching. + * + * If the handler is a string, it is + * treated as a redirect, and is interpolated according to the syntax of match + * (i.e. like `String.replace()` for `RegExp`, or like a `UrlMatcher` pattern otherwise). + * + * If the handler is a function, it is injectable. + * It gets invoked if `$location` matches. + * You have the option of inject the match object as `$match`. + * + * The handler can return + * + * - **falsy** to indicate that the rule didn't match after all, then `$urlRouter` + * will continue trying to find another one that matches. + * - **string** which is treated as a redirect and passed to `$location.url()` + * - **void** or any **truthy** value tells `$urlRouter` that the url was handled. + * + * #### Example: + * ```js + * var app = angular.module('app', ['ui.router.router']); + * + * app.config(function ($urlRouterProvider) { + * $urlRouterProvider.when($state.url, function ($match, $stateParams) { + * if ($state.$current.navigable !== state || + * !equalForKeys($match, $stateParams) { + * $state.transitionTo(state, $match, false); + * } + * }); + * }); + * ``` + * + * @param what A pattern string to match, compiled as a [[UrlMatcher]]. + * @param handler The path (or function that returns a path) that you want to redirect your user to. + * @param ruleCallback [optional] A callback that receives the `rule` registered with [[UrlMatcher.rule]] + * + * Note: the handler may also invoke arbitrary code, such as `$state.go()` + */ + UrlRouterProvider.prototype.when = function (what, handler) { + if (isArray(handler) || isFunction(handler)) { + handler = UrlRouterProvider.injectableHandler(this._router, handler); + } + this._urlRouter.when(what, handler); + return this; + }; + + UrlRouterProvider.injectableHandler = function (router, handler) { + return function (match) { + return services.$injector.invoke(handler, null, { $match: match, $stateParams: router.globals.params }); + }; + }; + /** + * Disables monitoring of the URL. + * + * Call this method before UI-Router has bootstrapped. + * It will stop UI-Router from performing the initial url sync. + * + * This can be useful to perform some asynchronous initialization before the router starts. + * Once the initialization is complete, call [[listen]] to tell UI-Router to start watching and synchronizing the URL. + * + * #### Example: + * ```js + * var app = angular.module('app', ['ui.router']); + * + * app.config(function ($urlRouterProvider) { + * // Prevent $urlRouter from automatically intercepting URL changes; + * $urlRouterProvider.deferIntercept(); + * }) + * + * app.run(function (MyService, $urlRouter, $http) { + * $http.get("/stuff").then(function(resp) { + * MyService.doStuff(resp.data); + * $urlRouter.listen(); + * $urlRouter.sync(); + * }); + * }); + * ``` + * + * @param defer Indicates whether to defer location change interception. + * Passing no parameter is equivalent to `true`. + */ + UrlRouterProvider.prototype.deferIntercept = function (defer) { + this._urlRouter.deferIntercept(defer); + }; + + return UrlRouterProvider; +}()); + +/** + * # Angular 1 types + * + * UI-Router core provides various Typescript types which you can use for code completion and validating parameter values, etc. + * The customizations to the core types for Angular UI-Router are documented here. + * + * The optional [[$resolve]] service is also documented here. + * + * @module ng1 + * @preferred + */ +/** for typedoc */ +ng.module("ui.router.angular1", []); +var mod_init = ng.module('ui.router.init', []); +var mod_util = ng.module('ui.router.util', ['ng', 'ui.router.init']); +var mod_rtr = ng.module('ui.router.router', ['ui.router.util']); +var mod_state = ng.module('ui.router.state', ['ui.router.router', 'ui.router.util', 'ui.router.angular1']); +var mod_main = ng.module('ui.router', ['ui.router.init', 'ui.router.state', 'ui.router.angular1']); +var mod_cmpt = ng.module('ui.router.compat', ['ui.router']); // tslint:disable-line +var router = null; +$uiRouter.$inject = ['$locationProvider']; +/** This angular 1 provider instantiates a Router and exposes its services via the angular injector */ +function $uiRouter($locationProvider) { + // Create a new instance of the Router when the $uiRouterProvider is initialized + router = this.router = new UIRouter(); + router.stateProvider = new StateProvider(router.stateRegistry, router.stateService); + // Apply ng1 specific StateBuilder code for `views`, `resolve`, and `onExit/Retain/Enter` properties + router.stateRegistry.decorator("views", ng1ViewsBuilder); + router.stateRegistry.decorator("onExit", getStateHookBuilder("onExit")); + router.stateRegistry.decorator("onRetain", getStateHookBuilder("onRetain")); + router.stateRegistry.decorator("onEnter", getStateHookBuilder("onEnter")); + router.viewService._pluginapi._viewConfigFactory('ng1', getNg1ViewConfigFactory()); + var ng1LocationService = router.locationService = router.locationConfig = new Ng1LocationServices($locationProvider); + Ng1LocationServices.monkeyPatchPathParameterType(router); + // backwards compat: also expose router instance as $uiRouterProvider.router + router['router'] = router; + router['$get'] = $get; + $get.$inject = ['$location', '$browser', '$sniffer', '$rootScope', '$http', '$templateCache']; + function $get($location, $browser, $sniffer, $rootScope, $http, $templateCache) { + ng1LocationService._runtimeServices($rootScope, $location, $sniffer, $browser); + delete router['router']; + delete router['$get']; + return router; + } + return router; +} +var getProviderFor = function (serviceName) { return ['$uiRouterProvider', function ($urp) { + var service = $urp.router[serviceName]; + service["$get"] = function () { return service; }; + return service; + }]; }; +// This effectively calls $get() on `$uiRouterProvider` to trigger init (when ng enters runtime) +runBlock.$inject = ['$injector', '$q', '$uiRouter']; +function runBlock($injector, $q, $uiRouter) { + services.$injector = $injector; + services.$q = $q; + // The $injector is now available. + // Find any resolvables that had dependency annotation deferred + $uiRouter.stateRegistry.get() + .map(function (x) { return x.$$state().resolvables; }) + .reduce(unnestR, []) + .filter(function (x) { return x.deps === "deferred"; }) + .forEach(function (resolvable) { return resolvable.deps = $injector.annotate(resolvable.resolveFn, $injector.strictDi); }); +} +// $urlRouter service and $urlRouterProvider +var getUrlRouterProvider = function (uiRouter) { + return uiRouter.urlRouterProvider = new UrlRouterProvider(uiRouter); +}; +// $state service and $stateProvider +// $urlRouter service and $urlRouterProvider +var getStateProvider = function () { + return extend(router.stateProvider, { $get: function () { return router.stateService; } }); +}; +watchDigests.$inject = ['$rootScope']; +function watchDigests($rootScope) { + $rootScope.$watch(function () { trace.approximateDigests++; }); +} +mod_init.provider("$uiRouter", $uiRouter); +mod_rtr.provider('$urlRouter', ['$uiRouterProvider', getUrlRouterProvider]); +mod_util.provider('$urlService', getProviderFor('urlService')); +mod_util.provider('$urlMatcherFactory', ['$uiRouterProvider', function () { return router.urlMatcherFactory; }]); +mod_util.provider('$templateFactory', function () { return new TemplateFactory(); }); +mod_state.provider('$stateRegistry', getProviderFor('stateRegistry')); +mod_state.provider('$uiRouterGlobals', getProviderFor('globals')); +mod_state.provider('$transitions', getProviderFor('transitionService')); +mod_state.provider('$state', ['$uiRouterProvider', getStateProvider]); +mod_state.factory('$stateParams', ['$uiRouter', function ($uiRouter) { return $uiRouter.globals.params; }]); +mod_main.factory('$view', function () { return router.viewService; }); +mod_main.service("$trace", function () { return trace; }); +mod_main.run(watchDigests); +mod_util.run(['$urlMatcherFactory', function ($urlMatcherFactory) { }]); +mod_state.run(['$state', function ($state) { }]); +mod_rtr.run(['$urlRouter', function ($urlRouter) { }]); +mod_init.run(runBlock); +/** @hidden TODO: find a place to move this */ +var getLocals = function (ctx) { + var tokens = ctx.getTokens().filter(isString); + var tuples = tokens.map(function (key) { + var resolvable = ctx.getResolvable(key); + var waitPolicy = ctx.getPolicy(resolvable).async; + return [key, waitPolicy === 'NOWAIT' ? resolvable.promise : resolvable.data]; + }); + return tuples.reduce(applyPairs, {}); +}; + +/** + * # Angular 1 injectable services + * + * This is a list of the objects which can be injected using angular's injector. + * + * There are three different kind of injectable objects: + * + * ## **Provider** objects + * #### injectable into a `.config()` block during configtime + * + * - [[$uiRouterProvider]]: The UI-Router instance + * - [[$stateProvider]]: State registration + * - [[$transitionsProvider]]: Transition hooks + * - [[$urlServiceProvider]]: All URL related public APIs + * + * - [[$uiViewScrollProvider]]: Disable ui-router view scrolling + * - [[$urlRouterProvider]]: (deprecated) Url matching rules + * - [[$urlMatcherFactoryProvider]]: (deprecated) Url parsing config + * + * ## **Service** objects + * #### injectable globally during runtime + * + * - [[$uiRouter]]: The UI-Router instance + * - [[$trace]]: Enable transition trace/debug + * - [[$transitions]]: Transition hooks + * - [[$state]]: Imperative state related APIs + * - [[$stateRegistry]]: State registration + * - [[$urlService]]: All URL related public APIs + * - [[$uiRouterGlobals]]: Global variables + * - [[$uiViewScroll]]: Scroll an element into view + * + * - [[$stateParams]]: (deprecated) Global state param values + * - [[$urlRouter]]: (deprecated) URL synchronization + * - [[$urlMatcherFactory]]: (deprecated) URL parsing config + * + * ## **Per-Transition** objects + * + * - These kind of objects are injectable into: + * - Resolves ([[Ng1StateDeclaration.resolve]]), + * - Transition Hooks ([[TransitionService.onStart]], etc), + * - Routed Controllers ([[Ng1ViewDeclaration.controller]]) + * + * #### Different instances are injected based on the [[Transition]] + * + * - [[$transition$]]: The current Transition object + * - [[$stateParams]]: State param values for pending Transition (deprecated) + * - Any resolve data defined using [[Ng1StateDeclaration.resolve]] + * + * @ng1api + * @preferred + * @module injectables + */ /** */ +/** + * The current (or pending) State Parameters + * + * An injectable global **Service Object** which holds the state parameters for the latest **SUCCESSFUL** transition. + * + * The values are not updated until *after* a `Transition` successfully completes. + * + * **Also:** an injectable **Per-Transition Object** object which holds the pending state parameters for the pending `Transition` currently running. + * + * ### Deprecation warning: + * + * The value injected for `$stateParams` is different depending on where it is injected. + * + * - When injected into an angular service, the object injected is the global **Service Object** with the parameter values for the latest successful `Transition`. + * - When injected into transition hooks, resolves, or view controllers, the object is the **Per-Transition Object** with the parameter values for the running `Transition`. + * + * Because of these confusing details, this service is deprecated. + * + * ### Instead of using the global `$stateParams` service object, + * inject [[$uiRouterGlobals]] and use [[UIRouterGlobals.params]] + * + * ```js + * MyService.$inject = ['$uiRouterGlobals']; + * function MyService($uiRouterGlobals) { + * return { + * paramValues: function () { + * return $uiRouterGlobals.params; + * } + * } + * } + * ``` + * + * ### Instead of using the per-transition `$stateParams` object, + * inject the current `Transition` (as [[$transition$]]) and use [[Transition.params]] + * + * ```js + * MyController.$inject = ['$transition$']; + * function MyController($transition$) { + * var username = $transition$.params().username; + * // .. do something with username + * } + * ``` + * + * --- + * + * This object can be injected into other services. + * + * #### Deprecated Example: + * ```js + * SomeService.$inject = ['$http', '$stateParams']; + * function SomeService($http, $stateParams) { + * return { + * getUser: function() { + * return $http.get('/api/users/' + $stateParams.username); + * } + * } + * }; + * angular.service('SomeService', SomeService); + * ``` + * @deprecated + */ + +/** + * # Angular 1 Directives + * + * These are the directives included in UI-Router for Angular 1. + * These directives are used in templates to create viewports and link/navigate to states. + * + * @ng1api + * @preferred + * @module directives + */ /** for typedoc */ +/** @hidden */ +function parseStateRef(ref) { + var paramsOnly = ref.match(/^\s*({[^}]*})\s*$/), parsed; + if (paramsOnly) + ref = '(' + paramsOnly[1] + ')'; + parsed = ref.replace(/\n/g, " ").match(/^\s*([^(]*?)\s*(\((.*)\))?\s*$/); + if (!parsed || parsed.length !== 4) + throw new Error("Invalid state ref '" + ref + "'"); + return { state: parsed[1] || null, paramExpr: parsed[3] || null }; +} +/** @hidden */ +function stateContext(el) { + var $uiView = el.parent().inheritedData('$uiView'); + var path = parse('$cfg.path')($uiView); + return path ? tail(path).state.name : undefined; +} +/** @hidden */ +function processedDef($state, $element, def) { + var uiState = def.uiState || $state.current.name; + var uiStateOpts = extend(defaultOpts($element, $state), def.uiStateOpts || {}); + var href = $state.href(uiState, def.uiStateParams, uiStateOpts); + return { uiState: uiState, uiStateParams: def.uiStateParams, uiStateOpts: uiStateOpts, href: href }; +} +/** @hidden */ +function getTypeInfo(el) { + // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute. + var isSvg = Object.prototype.toString.call(el.prop('href')) === '[object SVGAnimatedString]'; + var isForm = el[0].nodeName === "FORM"; + return { + attr: isForm ? "action" : (isSvg ? 'xlink:href' : 'href'), + isAnchor: el.prop("tagName").toUpperCase() === "A", + clickable: !isForm + }; +} +/** @hidden */ +function clickHook(el, $state, $timeout, type, getDef) { + return function (e) { + var button = e.which || e.button, target = getDef(); + if (!(button > 1 || e.ctrlKey || e.metaKey || e.shiftKey || el.attr('target'))) { + // HACK: This is to allow ng-clicks to be processed before the transition is initiated: + var transition = $timeout(function () { + $state.go(target.uiState, target.uiStateParams, target.uiStateOpts); + }); + e.preventDefault(); + // if the state has no URL, ignore one preventDefault from the directive. + var ignorePreventDefaultCount = type.isAnchor && !target.href ? 1 : 0; + e.preventDefault = function () { + if (ignorePreventDefaultCount-- <= 0) + $timeout.cancel(transition); + }; + } + }; +} +/** @hidden */ +function defaultOpts(el, $state) { + return { + relative: stateContext(el) || $state.$current, + inherit: true, + source: "sref" + }; +} +/** @hidden */ +function bindEvents(element, scope, hookFn, uiStateOpts) { + var events; + if (uiStateOpts) { + events = uiStateOpts.events; + } + if (!isArray(events)) { + events = ['click']; + } + var on = element.on ? 'on' : 'bind'; + for (var _i = 0, events_1 = events; _i < events_1.length; _i++) { + var event_1 = events_1[_i]; + element[on](event_1, hookFn); + } + scope.$on('$destroy', function () { + var off = element.off ? 'off' : 'unbind'; + for (var _i = 0, events_2 = events; _i < events_2.length; _i++) { + var event_2 = events_2[_i]; + element[off](event_2, hookFn); + } + }); +} +/** + * `ui-sref`: A directive for linking to a state + * + * A directive which links to a state (and optionally, parameters). + * When clicked, this directive activates the linked state with the supplied parameter values. + * + * ### Linked State + * The attribute value of the `ui-sref` is the name of the state to link to. + * + * #### Example: + * This will activate the `home` state when the link is clicked. + * ```html + * Home + * ``` + * + * ### Relative Links + * You can also use relative state paths within `ui-sref`, just like a relative path passed to `$state.go()` ([[StateService.go]]). + * You just need to be aware that the path is relative to the state that *created* the link. + * This allows a state to create a relative `ui-sref` which always targets the same destination. + * + * #### Example: + * Both these links are relative to the parent state, even when a child state is currently active. + * ```html + * child 1 state + * child 2 state + * ``` + * + * This link activates the parent state. + * ```html + * Return + * ``` + * + * ### hrefs + * If the linked state has a URL, the directive will automatically generate and + * update the `href` attribute (using the [[StateService.href]] method). + * + * #### Example: + * Assuming the `users` state has a url of `/users/` + * ```html + * Users + * ``` + * + * ### Parameter Values + * In addition to the state name, a `ui-sref` can include parameter values which are applied when activating the state. + * Param values can be provided in the `ui-sref` value after the state name, enclosed by parentheses. + * The content inside the parentheses is an expression, evaluated to the parameter values. + * + * #### Example: + * This example renders a list of links to users. + * The state's `userId` parameter value comes from each user's `user.id` property. + * ```html + *
  • + * {{ user.displayName }} + *
    • + * ``` + * + * Note: + * The parameter values expression is `$watch`ed for updates. + * + * ### Transition Options + * You can specify [[TransitionOptions]] to pass to [[StateService.go]] by using the `ui-sref-opts` attribute. + * Options are restricted to `location`, `inherit`, and `reload`. + * + * #### Example: + * ```html + * Home + * ``` + * + * ### Other DOM Events + * + * You can also customize which DOM events to respond to (instead of `click`) by + * providing an `events` array in the `ui-sref-opts` attribute. + * + * #### Example: + * ```html + * + * ``` + * + * ### Highlighting the active link + * This directive can be used in conjunction with [[uiSrefActive]] to highlight the active link. + * + * ### Examples + * If you have the following template: + * + * ```html + * Home + * About + * Next page + * + * + * ``` + * + * Then (assuming the current state is `contacts`) the rendered html including hrefs would be: + * + * ```html + * Home + * About + * Next page + * + *
      + *
    • + * Joe + *
      • + *
    • + * Alice + *
      • + *
    • + * Bob + *
      • + *
    + * + * Home + * ``` + * + * ### Notes + * + * - You can use `ui-sref` to change **only the parameter values** by omitting the state name and parentheses. + * #### Example: + * Sets the `lang` parameter to `en` and remains on the same state. + * + * ```html + * English + * ``` + * + * - A middle-click, right-click, or ctrl-click is handled (natively) by the browser to open the href in a new window, for example. + * + * - Unlike the parameter values expression, the state name is not `$watch`ed (for performance reasons). + * If you need to dynamically update the state being linked to, use the fully dynamic [[uiState]] directive. + */ +var uiSref; +uiSref = ['$uiRouter', '$timeout', + function $StateRefDirective($uiRouter, $timeout) { + var $state = $uiRouter.stateService; + return { + restrict: 'A', + require: ['?^uiSrefActive', '?^uiSrefActiveEq'], + link: function (scope, element, attrs, uiSrefActive) { + var type = getTypeInfo(element); + var active = uiSrefActive[1] || uiSrefActive[0]; + var unlinkInfoFn = null; + var hookFn; + var rawDef = {}; + var getDef = function () { return processedDef($state, element, rawDef); }; + var ref = parseStateRef(attrs.uiSref); + rawDef.uiState = ref.state; + rawDef.uiStateOpts = attrs.uiSrefOpts ? scope.$eval(attrs.uiSrefOpts) : {}; + function update() { + var def = getDef(); + if (unlinkInfoFn) + unlinkInfoFn(); + if (active) + unlinkInfoFn = active.$$addStateInfo(def.uiState, def.uiStateParams); + if (def.href != null) + attrs.$set(type.attr, def.href); + } + if (ref.paramExpr) { + scope.$watch(ref.paramExpr, function (val) { + rawDef.uiStateParams = extend({}, val); + update(); + }, true); + rawDef.uiStateParams = extend({}, scope.$eval(ref.paramExpr)); + } + update(); + scope.$on('$destroy', $uiRouter.stateRegistry.onStatesChanged(update)); + scope.$on('$destroy', $uiRouter.transitionService.onSuccess({}, update)); + if (!type.clickable) + return; + hookFn = clickHook(element, $state, $timeout, type, getDef); + bindEvents(element, scope, hookFn, rawDef.uiStateOpts); + } + }; + }]; +/** + * `ui-state`: A fully dynamic directive for linking to a state + * + * A directive which links to a state (and optionally, parameters). + * When clicked, this directive activates the linked state with the supplied parameter values. + * + * **This directive is very similar to [[uiSref]], but it `$observe`s and `$watch`es/evaluates all its inputs.** + * + * A directive which links to a state (and optionally, parameters). + * When clicked, this directive activates the linked state with the supplied parameter values. + * + * ### Linked State + * The attribute value of `ui-state` is an expression which is `$watch`ed and evaluated as the state to link to. + * **This is in contrast with `ui-sref`, which takes a state name as a string literal.** + * + * #### Example: + * Create a list of links. + * ```html + *
  • + * {{ link.displayName }} + *
    • + * ``` + * + * ### Relative Links + * If the expression evaluates to a relative path, it is processed like [[uiSref]]. + * You just need to be aware that the path is relative to the state that *created* the link. + * This allows a state to create relative `ui-state` which always targets the same destination. + * + * ### hrefs + * If the linked state has a URL, the directive will automatically generate and + * update the `href` attribute (using the [[StateService.href]] method). + * + * ### Parameter Values + * In addition to the state name expression, a `ui-state` can include parameter values which are applied when activating the state. + * Param values should be provided using the `ui-state-params` attribute. + * The `ui-state-params` attribute value is `$watch`ed and evaluated as an expression. + * + * #### Example: + * This example renders a list of links with param values. + * The state's `userId` parameter value comes from each user's `user.id` property. + * ```html + *
  • + * {{ link.displayName }} + *
    • + * ``` + * + * ### Transition Options + * You can specify [[TransitionOptions]] to pass to [[StateService.go]] by using the `ui-state-opts` attribute. + * Options are restricted to `location`, `inherit`, and `reload`. + * The value of the `ui-state-opts` is `$watch`ed and evaluated as an expression. + * + * #### Example: + * ```html + * Home + * ``` + * + * ### Other DOM Events + * + * You can also customize which DOM events to respond to (instead of `click`) by + * providing an `events` array in the `ui-state-opts` attribute. + * + * #### Example: + * ```html + * + * ``` + * + * ### Highlighting the active link + * This directive can be used in conjunction with [[uiSrefActive]] to highlight the active link. + * + * ### Notes + * + * - You can use `ui-params` to change **only the parameter values** by omitting the state name and supplying only `ui-state-params`. + * However, it might be simpler to use [[uiSref]] parameter-only links. + * + * #### Example: + * Sets the `lang` parameter to `en` and remains on the same state. + * + * ```html + * English + * ``` + * + * - A middle-click, right-click, or ctrl-click is handled (natively) by the browser to open the href in a new window, for example. + * ``` + */ +var uiState; +uiState = ['$uiRouter', '$timeout', + function $StateRefDynamicDirective($uiRouter, $timeout) { + var $state = $uiRouter.stateService; + return { + restrict: 'A', + require: ['?^uiSrefActive', '?^uiSrefActiveEq'], + link: function (scope, element, attrs, uiSrefActive) { + var type = getTypeInfo(element); + var active = uiSrefActive[1] || uiSrefActive[0]; + var unlinkInfoFn = null; + var hookFn; + var rawDef = {}; + var getDef = function () { return processedDef($state, element, rawDef); }; + var inputAttrs = ['uiState', 'uiStateParams', 'uiStateOpts']; + var watchDeregFns = inputAttrs.reduce(function (acc, attr) { return (acc[attr] = noop$1, acc); }, {}); + function update() { + var def = getDef(); + if (unlinkInfoFn) + unlinkInfoFn(); + if (active) + unlinkInfoFn = active.$$addStateInfo(def.uiState, def.uiStateParams); + if (def.href != null) + attrs.$set(type.attr, def.href); + } + inputAttrs.forEach(function (field) { + rawDef[field] = attrs[field] ? scope.$eval(attrs[field]) : null; + attrs.$observe(field, function (expr) { + watchDeregFns[field](); + watchDeregFns[field] = scope.$watch(expr, function (newval) { + rawDef[field] = newval; + update(); + }, true); + }); + }); + update(); + scope.$on('$destroy', $uiRouter.stateRegistry.onStatesChanged(update)); + scope.$on('$destroy', $uiRouter.transitionService.onSuccess({}, update)); + if (!type.clickable) + return; + hookFn = clickHook(element, $state, $timeout, type, getDef); + bindEvents(element, scope, hookFn, rawDef.uiStateOpts); + } + }; + }]; +/** + * `ui-sref-active` and `ui-sref-active-eq`: A directive that adds a CSS class when a `ui-sref` is active + * + * A directive working alongside [[uiSref]] and [[uiState]] to add classes to an element when the + * related directive's state is active (and remove them when it is inactive). + * + * The primary use-case is to highlight the active link in navigation menus, + * distinguishing it from the inactive menu items. + * + * ### Linking to a `ui-sref` or `ui-state` + * `ui-sref-active` can live on the same element as `ui-sref`/`ui-state`, or it can be on a parent element. + * If a `ui-sref-active` is a parent to more than one `ui-sref`/`ui-state`, it will apply the CSS class when **any of the links are active**. + * + * ### Matching + * + * The `ui-sref-active` directive applies the CSS class when the `ui-sref`/`ui-state`'s target state **or any child state is active**. + * This is a "fuzzy match" which uses [[StateService.includes]]. + * + * The `ui-sref-active-eq` directive applies the CSS class when the `ui-sref`/`ui-state`'s target state is directly active (not when child states are active). + * This is an "exact match" which uses [[StateService.is]]. + * + * ### Parameter values + * If the `ui-sref`/`ui-state` includes parameter values, the current parameter values must match the link's values for the link to be highlighted. + * This allows a list of links to the same state with different parameters to be rendered, and the correct one highlighted. + * + * #### Example: + * ```html + *
  • + * {{ user.lastName }} + *
    • + * ``` + * + * ### Examples + * + * Given the following template: + * #### Example: + * ```html + * + * ``` + * + * When the app state is `app.user` (or any child state), + * and contains the state parameter "user" with value "bilbobaggins", + * the resulting HTML will appear as (note the 'active' class): + * + * ```html + * + * ``` + * + * ### Glob mode + * + * It is possible to pass `ui-sref-active` an expression that evaluates to an object. + * The objects keys represent active class names and values represent the respective state names/globs. + * `ui-sref-active` will match if the current active state **includes** any of + * the specified state names/globs, even the abstract ones. + * + * #### Example: + * Given the following template, with "admin" being an abstract state: + * ```html + *
    + * Roles + *
    + * ``` + * + * When the current state is "admin.roles" the "active" class will be applied to both the
    and elements. + * It is important to note that the state names/globs passed to `ui-sref-active` override any state provided by a linked `ui-sref`. + * + * ### Notes: + * + * - The class name is interpolated **once** during the directives link time (any further changes to the + * interpolated value are ignored). + * + * - Multiple classes may be specified in a space-separated format: `ui-sref-active='class1 class2 class3'` + */ +var uiSrefActive; +uiSrefActive = ['$state', '$stateParams', '$interpolate', '$uiRouter', + function $StateRefActiveDirective($state, $stateParams, $interpolate, $uiRouter) { + return { + restrict: "A", + controller: ['$scope', '$element', '$attrs', + function ($scope, $element, $attrs) { + var states = [], activeEqClass, uiSrefActive; + // There probably isn't much point in $observing this + // uiSrefActive and uiSrefActiveEq share the same directive object with some + // slight difference in logic routing + activeEqClass = $interpolate($attrs.uiSrefActiveEq || '', false)($scope); + try { + uiSrefActive = $scope.$eval($attrs.uiSrefActive); + } + catch (e) { + // Do nothing. uiSrefActive is not a valid expression. + // Fall back to using $interpolate below + } + uiSrefActive = uiSrefActive || $interpolate($attrs.uiSrefActive || '', false)($scope); + if (isObject(uiSrefActive)) { + forEach(uiSrefActive, function (stateOrName, activeClass) { + if (isString(stateOrName)) { + var ref = parseStateRef(stateOrName); + addState(ref.state, $scope.$eval(ref.paramExpr), activeClass); + } + }); + } + // Allow uiSref to communicate with uiSrefActive[Equals] + this.$$addStateInfo = function (newState, newParams) { + // we already got an explicit state provided by ui-sref-active, so we + // shadow the one that comes from ui-sref + if (isObject(uiSrefActive) && states.length > 0) { + return; + } + var deregister = addState(newState, newParams, uiSrefActive); + update(); + return deregister; + }; + function updateAfterTransition(trans) { + trans.promise.then(update, noop$1); + } + $scope.$on('$stateChangeSuccess', update); + $scope.$on('$destroy', $uiRouter.transitionService.onStart({}, updateAfterTransition)); + if ($uiRouter.globals.transition) { + updateAfterTransition($uiRouter.globals.transition); + } + function addState(stateName, stateParams, activeClass) { + var state = $state.get(stateName, stateContext($element)); + var stateInfo = { + state: state || { name: stateName }, + params: stateParams, + activeClass: activeClass + }; + states.push(stateInfo); + return function removeState() { + removeFrom(states)(stateInfo); + }; + } + // Update route state + function update() { + var splitClasses = function (str) { + return str.split(/\s/).filter(identity); + }; + var getClasses = function (stateList) { + return stateList.map(function (x) { return x.activeClass; }).map(splitClasses).reduce(unnestR, []); + }; + var allClasses = getClasses(states).concat(splitClasses(activeEqClass)).reduce(uniqR, []); + var fuzzyClasses = getClasses(states.filter(function (x) { return $state.includes(x.state.name, x.params); })); + var exactlyMatchesAny = !!states.filter(function (x) { return $state.is(x.state.name, x.params); }).length; + var exactClasses = exactlyMatchesAny ? splitClasses(activeEqClass) : []; + var addClasses = fuzzyClasses.concat(exactClasses).reduce(uniqR, []); + var removeClasses = allClasses.filter(function (cls) { return !inArray(addClasses, cls); }); + $scope.$evalAsync(function () { + addClasses.forEach(function (className) { return $element.addClass(className); }); + removeClasses.forEach(function (className) { return $element.removeClass(className); }); + }); + } + update(); + }] + }; + }]; +ng.module('ui.router.state') + .directive('uiSref', uiSref) + .directive('uiSrefActive', uiSrefActive) + .directive('uiSrefActiveEq', uiSrefActive) + .directive('uiState', uiState); + +/** @module ng1 */ /** for typedoc */ +/** + * `isState` Filter: truthy if the current state is the parameter + * + * Translates to [[StateService.is]] `$state.is("stateName")`. + * + * #### Example: + * ```html + *
    show if state is 'stateName'
    + * ``` + */ +$IsStateFilter.$inject = ['$state']; +function $IsStateFilter($state) { + var isFilter = function (state, params, options) { + return $state.is(state, params, options); + }; + isFilter.$stateful = true; + return isFilter; +} +/** + * `includedByState` Filter: truthy if the current state includes the parameter + * + * Translates to [[StateService.includes]]` $state.is("fullOrPartialStateName")`. + * + * #### Example: + * ```html + *
    show if state includes 'fullOrPartialStateName'
    + * ``` + */ +$IncludedByStateFilter.$inject = ['$state']; +function $IncludedByStateFilter($state) { + var includesFilter = function (state, params, options) { + return $state.includes(state, params, options); + }; + includesFilter.$stateful = true; + return includesFilter; +} +ng.module('ui.router.state') + .filter('isState', $IsStateFilter) + .filter('includedByState', $IncludedByStateFilter); + +/** + * @ng1api + * @module directives + */ /** for typedoc */ +/** + * `ui-view`: A viewport directive which is filled in by a view from the active state. + * + * ### Attributes + * + * - `name`: (Optional) A view name. + * The name should be unique amongst the other views in the same state. + * You can have views of the same name that live in different states. + * The ui-view can be targeted in a View using the name ([[Ng1StateDeclaration.views]]). + * + * - `autoscroll`: an expression. When it evaluates to true, the `ui-view` will be scrolled into view when it is activated. + * Uses [[$uiViewScroll]] to do the scrolling. + * + * - `onload`: Expression to evaluate whenever the view updates. + * + * #### Example: + * A view can be unnamed or named. + * ```html + * + *
    + * + * + *
    + * + * + * + * ``` + * + * You can only have one unnamed view within any template (or root html). If you are only using a + * single view and it is unnamed then you can populate it like so: + * + * ```html + *
    + * $stateProvider.state("home", { + * template: "

    HELLO!

    " + * }) + * ``` + * + * The above is a convenient shortcut equivalent to specifying your view explicitly with the + * [[Ng1StateDeclaration.views]] config property, by name, in this case an empty name: + * + * ```js + * $stateProvider.state("home", { + * views: { + * "": { + * template: "

    HELLO!

    " + * } + * } + * }) + * ``` + * + * But typically you'll only use the views property if you name your view or have more than one view + * in the same template. There's not really a compelling reason to name a view if its the only one, + * but you could if you wanted, like so: + * + * ```html + *
    + * ``` + * + * ```js + * $stateProvider.state("home", { + * views: { + * "main": { + * template: "

    HELLO!

    " + * } + * } + * }) + * ``` + * + * Really though, you'll use views to set up multiple views: + * + * ```html + *
    + *
    + *
    + * ``` + * + * ```js + * $stateProvider.state("home", { + * views: { + * "": { + * template: "

    HELLO!

    " + * }, + * "chart": { + * template: "" + * }, + * "data": { + * template: "" + * } + * } + * }) + * ``` + * + * #### Examples for `autoscroll`: + * ```html + * + * + * + * + * + * + * + * ``` + * + * Resolve data: + * + * The resolved data from the state's `resolve` block is placed on the scope as `$resolve` (this + * can be customized using [[Ng1ViewDeclaration.resolveAs]]). This can be then accessed from the template. + * + * Note that when `controllerAs` is being used, `$resolve` is set on the controller instance *after* the + * controller is instantiated. The `$onInit()` hook can be used to perform initialization code which + * depends on `$resolve` data. + * + * #### Example: + * ```js + * $stateProvider.state('home', { + * template: '', + * resolve: { + * user: function(UserService) { return UserService.fetchUser(); } + * } + * }); + * ``` + */ +var uiView; +uiView = ['$view', '$animate', '$uiViewScroll', '$interpolate', '$q', + function $ViewDirective($view, $animate, $uiViewScroll, $interpolate, $q) { + function getRenderer(attrs, scope) { + return { + enter: function (element, target, cb) { + if (ng.version.minor > 2) { + $animate.enter(element, null, target).then(cb); + } + else { + $animate.enter(element, null, target, cb); + } + }, + leave: function (element, cb) { + if (ng.version.minor > 2) { + $animate.leave(element).then(cb); + } + else { + $animate.leave(element, cb); + } + } + }; + } + function configsEqual(config1, config2) { + return config1 === config2; + } + var rootData = { + $cfg: { viewDecl: { $context: $view._pluginapi._rootViewContext() } }, + $uiView: {} + }; + var directive = { + count: 0, + restrict: 'ECA', + terminal: true, + priority: 400, + transclude: 'element', + compile: function (tElement, tAttrs, $transclude) { + return function (scope, $element, attrs) { + var previousEl, currentEl, currentScope, unregister, onloadExp = attrs['onload'] || '', autoScrollExp = attrs['autoscroll'], renderer = getRenderer(attrs, scope), viewConfig = undefined, inherited = $element.inheritedData('$uiView') || rootData, name = $interpolate(attrs['uiView'] || attrs['name'] || '')(scope) || '$default'; + var activeUIView = { + $type: 'ng1', + id: directive.count++, + name: name, + fqn: inherited.$uiView.fqn ? inherited.$uiView.fqn + "." + name : name, + config: null, + configUpdated: configUpdatedCallback, + get creationContext() { + var fromParentTagConfig = parse('$cfg.viewDecl.$context')(inherited); + // Allow + // See https://github.com/angular-ui/ui-router/issues/3355 + var fromParentTag = parse('$uiView.creationContext')(inherited); + return fromParentTagConfig || fromParentTag; + } + }; + trace.traceUIViewEvent("Linking", activeUIView); + function configUpdatedCallback(config) { + if (config && !(config instanceof Ng1ViewConfig)) + return; + if (configsEqual(viewConfig, config)) + return; + trace.traceUIViewConfigUpdated(activeUIView, config && config.viewDecl && config.viewDecl.$context); + viewConfig = config; + updateView(config); + } + $element.data('$uiView', { $uiView: activeUIView }); + updateView(); + unregister = $view.registerUIView(activeUIView); + scope.$on("$destroy", function () { + trace.traceUIViewEvent("Destroying/Unregistering", activeUIView); + unregister(); + }); + function cleanupLastView() { + if (previousEl) { + trace.traceUIViewEvent("Removing (previous) el", previousEl.data('$uiView')); + previousEl.remove(); + previousEl = null; + } + if (currentScope) { + trace.traceUIViewEvent("Destroying scope", activeUIView); + currentScope.$destroy(); + currentScope = null; + } + if (currentEl) { + var _viewData_1 = currentEl.data('$uiViewAnim'); + trace.traceUIViewEvent("Animate out", _viewData_1); + renderer.leave(currentEl, function () { + _viewData_1.$$animLeave.resolve(); + previousEl = null; + }); + previousEl = currentEl; + currentEl = null; + } + } + function updateView(config) { + var newScope = scope.$new(); + var animEnter = $q.defer(), animLeave = $q.defer(); + var $uiViewData = { + $cfg: config, + $uiView: activeUIView, + }; + var $uiViewAnim = { + $animEnter: animEnter.promise, + $animLeave: animLeave.promise, + $$animLeave: animLeave + }; + /** + * @ngdoc event + * @name ui.router.state.directive:ui-view#$viewContentLoading + * @eventOf ui.router.state.directive:ui-view + * @eventType emits on ui-view directive scope + * @description + * + * Fired once the view **begins loading**, *before* the DOM is rendered. + * + * @param {Object} event Event object. + * @param {string} viewName Name of the view. + */ + newScope.$emit('$viewContentLoading', name); + var cloned = $transclude(newScope, function (clone) { + clone.data('$uiViewAnim', $uiViewAnim); + clone.data('$uiView', $uiViewData); + renderer.enter(clone, $element, function onUIViewEnter() { + animEnter.resolve(); + if (currentScope) + currentScope.$emit('$viewContentAnimationEnded'); + if (isDefined(autoScrollExp) && !autoScrollExp || scope.$eval(autoScrollExp)) { + $uiViewScroll(clone); + } + }); + cleanupLastView(); + }); + currentEl = cloned; + currentScope = newScope; + /** + * @ngdoc event + * @name ui.router.state.directive:ui-view#$viewContentLoaded + * @eventOf ui.router.state.directive:ui-view + * @eventType emits on ui-view directive scope + * @description * + * Fired once the view is **loaded**, *after* the DOM is rendered. + * + * @param {Object} event Event object. + */ + currentScope.$emit('$viewContentLoaded', config || viewConfig); + currentScope.$eval(onloadExp); + } + }; + } + }; + return directive; + }]; +$ViewDirectiveFill.$inject = ['$compile', '$controller', '$transitions', '$view', '$q', '$timeout']; +/** @hidden */ +function $ViewDirectiveFill($compile, $controller, $transitions, $view, $q, $timeout) { + var getControllerAs = parse('viewDecl.controllerAs'); + var getResolveAs = parse('viewDecl.resolveAs'); + return { + restrict: 'ECA', + priority: -400, + compile: function (tElement) { + var initial = tElement.html(); + tElement.empty(); + return function (scope, $element) { + var data = $element.data('$uiView'); + if (!data) { + $element.html(initial); + $compile($element.contents())(scope); + return; + } + var cfg = data.$cfg || { viewDecl: {}, getTemplate: ng_from_import.noop }; + var resolveCtx = cfg.path && new ResolveContext(cfg.path); + $element.html(cfg.getTemplate($element, resolveCtx) || initial); + trace.traceUIViewFill(data.$uiView, $element.html()); + var link = $compile($element.contents()); + var controller = cfg.controller; + var controllerAs = getControllerAs(cfg); + var resolveAs = getResolveAs(cfg); + var locals = resolveCtx && getLocals(resolveCtx); + scope[resolveAs] = locals; + if (controller) { + var controllerInstance = $controller(controller, extend({}, locals, { $scope: scope, $element: $element })); + if (controllerAs) { + scope[controllerAs] = controllerInstance; + scope[controllerAs][resolveAs] = locals; + } + // TODO: Use $view service as a central point for registering component-level hooks + // Then, when a component is created, tell the $view service, so it can invoke hooks + // $view.componentLoaded(controllerInstance, { $scope: scope, $element: $element }); + // scope.$on('$destroy', () => $view.componentUnloaded(controllerInstance, { $scope: scope, $element: $element })); + $element.data('$ngControllerController', controllerInstance); + $element.children().data('$ngControllerController', controllerInstance); + registerControllerCallbacks($q, $transitions, controllerInstance, scope, cfg); + } + // Wait for the component to appear in the DOM + if (isString(cfg.viewDecl.component)) { + var cmp_1 = cfg.viewDecl.component; + var kebobName = kebobString(cmp_1); + var tagRegexp_1 = new RegExp("^(x-|data-)?" + kebobName + "$", "i"); + var getComponentController = function () { + var directiveEl = [].slice.call($element[0].children) + .filter(function (el) { return el && el.tagName && tagRegexp_1.exec(el.tagName); }); + return directiveEl && ng.element(directiveEl).data("$" + cmp_1 + "Controller"); + }; + var deregisterWatch_1 = scope.$watch(getComponentController, function (ctrlInstance) { + if (!ctrlInstance) + return; + registerControllerCallbacks($q, $transitions, ctrlInstance, scope, cfg); + deregisterWatch_1(); + }); + } + link(scope); + }; + } + }; +} +/** @hidden */ +var hasComponentImpl = typeof ng.module('ui.router')['component'] === 'function'; +/** @hidden incrementing id */ +var _uiCanExitId = 0; +/** @hidden TODO: move these callbacks to $view and/or `/hooks/components.ts` or something */ +function registerControllerCallbacks($q, $transitions, controllerInstance, $scope, cfg) { + // Call $onInit() ASAP + if (isFunction(controllerInstance.$onInit) && !(cfg.viewDecl.component && hasComponentImpl)) { + controllerInstance.$onInit(); + } + var viewState = tail(cfg.path).state.self; + var hookOptions = { bind: controllerInstance }; + // Add component-level hook for onParamsChange + if (isFunction(controllerInstance.uiOnParamsChanged)) { + var resolveContext = new ResolveContext(cfg.path); + var viewCreationTrans_1 = resolveContext.getResolvable('$transition$').data; + // Fire callback on any successful transition + var paramsUpdated = function ($transition$) { + // Exit early if the $transition$ is the same as the view was created within. + // Exit early if the $transition$ will exit the state the view is for. + if ($transition$ === viewCreationTrans_1 || $transition$.exiting().indexOf(viewState) !== -1) + return; + var toParams = $transition$.params("to"); + var fromParams = $transition$.params("from"); + var toSchema = $transition$.treeChanges().to.map(function (node) { return node.paramSchema; }).reduce(unnestR, []); + var fromSchema = $transition$.treeChanges().from.map(function (node) { return node.paramSchema; }).reduce(unnestR, []); + // Find the to params that have different values than the from params + var changedToParams = toSchema.filter(function (param) { + var idx = fromSchema.indexOf(param); + return idx === -1 || !fromSchema[idx].type.equals(toParams[param.id], fromParams[param.id]); + }); + // Only trigger callback if a to param has changed or is new + if (changedToParams.length) { + var changedKeys_1 = changedToParams.map(function (x) { return x.id; }); + // Filter the params to only changed/new to params. `$transition$.params()` may be used to get all params. + var newValues = filter(toParams, function (val, key) { return changedKeys_1.indexOf(key) !== -1; }); + controllerInstance.uiOnParamsChanged(newValues, $transition$); + } + }; + $scope.$on('$destroy', $transitions.onSuccess({}, paramsUpdated, hookOptions)); + } + // Add component-level hook for uiCanExit + if (isFunction(controllerInstance.uiCanExit)) { + var id_1 = _uiCanExitId++; + var cacheProp_1 = '_uiCanExitIds'; + // Returns true if a redirect transition already answered truthy + var prevTruthyAnswer_1 = function (trans) { + return !!trans && (trans[cacheProp_1] && trans[cacheProp_1][id_1] === true || prevTruthyAnswer_1(trans.redirectedFrom())); + }; + // If a user answered yes, but the transition was later redirected, don't also ask for the new redirect transition + var wrappedHook = function (trans) { + var promise, ids = trans[cacheProp_1] = trans[cacheProp_1] || {}; + if (!prevTruthyAnswer_1(trans)) { + promise = $q.when(controllerInstance.uiCanExit(trans)); + promise.then(function (val) { return ids[id_1] = (val !== false); }); + } + return promise; + }; + var criteria = { exiting: viewState.name }; + $scope.$on('$destroy', $transitions.onBefore(criteria, wrappedHook, hookOptions)); + } +} +ng.module('ui.router.state').directive('uiView', uiView); +ng.module('ui.router.state').directive('uiView', $ViewDirectiveFill); + +/** @module ng1 */ /** */ +/** @hidden */ +function $ViewScrollProvider() { + var useAnchorScroll = false; + this.useAnchorScroll = function () { + useAnchorScroll = true; + }; + this.$get = ['$anchorScroll', '$timeout', function ($anchorScroll, $timeout) { + if (useAnchorScroll) { + return $anchorScroll; + } + return function ($element) { + return $timeout(function () { + $element[0].scrollIntoView(); + }, 0, false); + }; + }]; +} +ng.module('ui.router.state').provider('$uiViewScroll', $ViewScrollProvider); + +/** + * Main entry point for angular 1.x build + * @module ng1 + */ /** */ +var index = "ui.router"; + +exports['default'] = index; +exports.core = index$1; +exports.watchDigests = watchDigests; +exports.getLocals = getLocals; +exports.getNg1ViewConfigFactory = getNg1ViewConfigFactory; +exports.ng1ViewsBuilder = ng1ViewsBuilder; +exports.Ng1ViewConfig = Ng1ViewConfig; +exports.StateProvider = StateProvider; +exports.UrlRouterProvider = UrlRouterProvider; +exports.root = root; +exports.fromJson = fromJson; +exports.toJson = toJson; +exports.forEach = forEach; +exports.extend = extend; +exports.equals = equals; +exports.identity = identity; +exports.noop = noop$1; +exports.createProxyFunctions = createProxyFunctions; +exports.inherit = inherit; +exports.inArray = inArray; +exports._inArray = _inArray; +exports.removeFrom = removeFrom; +exports._removeFrom = _removeFrom; +exports.pushTo = pushTo; +exports._pushTo = _pushTo; +exports.deregAll = deregAll; +exports.defaults = defaults; +exports.mergeR = mergeR; +exports.ancestors = ancestors; +exports.pick = pick; +exports.omit = omit; +exports.pluck = pluck; +exports.filter = filter; +exports.find = find; +exports.mapObj = mapObj; +exports.map = map; +exports.values = values; +exports.allTrueR = allTrueR; +exports.anyTrueR = anyTrueR; +exports.unnestR = unnestR; +exports.flattenR = flattenR; +exports.pushR = pushR; +exports.uniqR = uniqR; +exports.unnest = unnest; +exports.flatten = flatten; +exports.assertPredicate = assertPredicate; +exports.assertMap = assertMap; +exports.assertFn = assertFn; +exports.pairs = pairs; +exports.arrayTuples = arrayTuples; +exports.applyPairs = applyPairs; +exports.tail = tail; +exports.copy = copy; +exports._extend = _extend; +exports.silenceUncaughtInPromise = silenceUncaughtInPromise; +exports.silentRejection = silentRejection; +exports.notImplemented = notImplemented; +exports.services = services; +exports.Glob = Glob; +exports.curry = curry; +exports.compose = compose; +exports.pipe = pipe; +exports.prop = prop; +exports.propEq = propEq; +exports.parse = parse; +exports.not = not; +exports.and = and; +exports.or = or; +exports.all = all; +exports.any = any; +exports.is = is; +exports.eq = eq; +exports.val = val; +exports.invoke = invoke; +exports.pattern = pattern; +exports.isUndefined = isUndefined; +exports.isDefined = isDefined; +exports.isNull = isNull; +exports.isNullOrUndefined = isNullOrUndefined; +exports.isFunction = isFunction; +exports.isNumber = isNumber; +exports.isString = isString; +exports.isObject = isObject; +exports.isArray = isArray; +exports.isDate = isDate; +exports.isRegExp = isRegExp; +exports.isState = isState; +exports.isInjectable = isInjectable; +exports.isPromise = isPromise; +exports.Queue = Queue; +exports.maxLength = maxLength; +exports.padString = padString; +exports.kebobString = kebobString; +exports.functionToString = functionToString; +exports.fnToString = fnToString; +exports.stringify = stringify; +exports.beforeAfterSubstr = beforeAfterSubstr; +exports.hostRegex = hostRegex; +exports.stripFile = stripFile; +exports.splitHash = splitHash; +exports.splitQuery = splitQuery; +exports.splitEqual = splitEqual; +exports.trimHashVal = trimHashVal; +exports.splitOnDelim = splitOnDelim; +exports.joinNeighborsR = joinNeighborsR; +exports.Trace = Trace; +exports.trace = trace; +exports.Param = Param; +exports.ParamTypes = ParamTypes; +exports.StateParams = StateParams; +exports.ParamType = ParamType; +exports.PathNode = PathNode; +exports.PathUtils = PathUtils; +exports.resolvePolicies = resolvePolicies; +exports.defaultResolvePolicy = defaultResolvePolicy; +exports.Resolvable = Resolvable; +exports.NATIVE_INJECTOR_TOKEN = NATIVE_INJECTOR_TOKEN; +exports.ResolveContext = ResolveContext; +exports.resolvablesBuilder = resolvablesBuilder; +exports.StateBuilder = StateBuilder; +exports.StateObject = StateObject; +exports.StateMatcher = StateMatcher; +exports.StateQueueManager = StateQueueManager; +exports.StateRegistry = StateRegistry; +exports.StateService = StateService; +exports.TargetState = TargetState; +exports.HookBuilder = HookBuilder; +exports.matchState = matchState; +exports.RegisteredHook = RegisteredHook; +exports.makeEvent = makeEvent; +exports.Rejection = Rejection; +exports.Transition = Transition; +exports.TransitionHook = TransitionHook; +exports.TransitionEventType = TransitionEventType; +exports.defaultTransOpts = defaultTransOpts; +exports.TransitionService = TransitionService; +exports.UrlMatcher = UrlMatcher; +exports.UrlMatcherFactory = UrlMatcherFactory; +exports.UrlRouter = UrlRouter; +exports.UrlRuleFactory = UrlRuleFactory; +exports.BaseUrlRule = BaseUrlRule; +exports.UrlService = UrlService; +exports.ViewService = ViewService; +exports.UIRouterGlobals = UIRouterGlobals; +exports.UIRouter = UIRouter; +exports.$q = $q; +exports.$injector = $injector; +exports.BaseLocationServices = BaseLocationServices; +exports.HashLocationService = HashLocationService; +exports.MemoryLocationService = MemoryLocationService; +exports.PushStateLocationService = PushStateLocationService; +exports.MemoryLocationConfig = MemoryLocationConfig; +exports.BrowserLocationConfig = BrowserLocationConfig; +exports.keyValsToObjectR = keyValsToObjectR; +exports.getParams = getParams; +exports.parseUrl = parseUrl$1; +exports.buildUrl = buildUrl; +exports.locationPluginFactory = locationPluginFactory; +exports.servicesPlugin = servicesPlugin; +exports.hashLocationPlugin = hashLocationPlugin; +exports.pushStateLocationPlugin = pushStateLocationPlugin; +exports.memoryLocationPlugin = memoryLocationPlugin; +exports.UIRouterPluginBase = UIRouterPluginBase; + +Object.defineProperty(exports, '__esModule', { value: true }); + +}))); +//# sourceMappingURL=angular-ui-router.js.map diff --git a/feature-toggles/main/main.html b/feature-toggles/main/main.html new file mode 100644 index 000000000..d95a86e36 --- /dev/null +++ b/feature-toggles/main/main.html @@ -0,0 +1,3 @@ +
    +
    +
    \ No newline at end of file diff --git a/feature-toggles/main/mainControler.js b/feature-toggles/main/mainControler.js new file mode 100644 index 000000000..c94cb7b40 --- /dev/null +++ b/feature-toggles/main/mainControler.js @@ -0,0 +1,10 @@ +(function() { + 'use strict'; + const app = angular.module('app'); + + app.controller('MainController', function() { + const mainCtrl = this; + + + }); +})(); \ No newline at end of file diff --git a/feature-toggles/manage/manage-toggles.html b/feature-toggles/manage/manage-toggles.html new file mode 100644 index 000000000..b71f4b9a8 --- /dev/null +++ b/feature-toggles/manage/manage-toggles.html @@ -0,0 +1 @@ +
    fkhjsdlhfkjlsdakjflhskdhflkha
    \ No newline at end of file diff --git a/feature-toggles/manage/manageToggles.js b/feature-toggles/manage/manageToggles.js new file mode 100644 index 000000000..b286ed157 --- /dev/null +++ b/feature-toggles/manage/manageToggles.js @@ -0,0 +1,9 @@ +(function() { + 'use strict'; + + const app = angular.module('app'); + + app.controller('ManageTogglesController', function() { + const ManageTogglesCtrl = this; + }); +})(); \ No newline at end of file From 49a84efe010e3ea74f613737e0ca3c69c4ac477f Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 8 Jan 2019 15:34:18 -0300 Subject: [PATCH 029/606] Create manage toggles layout --- feature-toggles/app.js | 14 ++++++------ feature-toggles/images/logo.png | Bin 0 -> 18003 bytes feature-toggles/index.html | 4 ++-- feature-toggles/main/main.html | 3 --- feature-toggles/manage/manage-toggles.html | 20 +++++++++++++++++- feature-toggles/signin/signin.html | 3 +++ .../signinController.js} | 4 ++-- 7 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 feature-toggles/images/logo.png delete mode 100644 feature-toggles/main/main.html create mode 100644 feature-toggles/signin/signin.html rename feature-toggles/{main/mainControler.js => signin/signinController.js} (50%) diff --git a/feature-toggles/app.js b/feature-toggles/app.js index 4d6b3020b..25609e70c 100644 --- a/feature-toggles/app.js +++ b/feature-toggles/app.js @@ -20,19 +20,20 @@ $urlMatcherFactoryProvider.caseInsensitive(true); $stateProvider - .state("main", { - abstract: true, + .state("signin", { + url: "/signin", views: { main: { - templateUrl: "app/main/main.html", - controller: "MainController as mainCtrl" + templateUrl: "app/signin/signin.html", + controller: "SigninController as signinCtrl" } } }).state("manage-features", { url: "/", views: { - content: { - templateUrl: "app/manage/manage-toggles.html" + main: { + templateUrl: "app/manage/manage-toggles.html", + constroller: "ManageTogglesController as ManageTogglesCtrl" } } }); @@ -40,5 +41,6 @@ $urlRouterProvider.otherwise("/"); $locationProvider.html5Mode(true); + }); })(); \ No newline at end of file diff --git a/feature-toggles/images/logo.png b/feature-toggles/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..24e5bcf1ff32bcd3f07cafbbf339d17f5573caeb GIT binary patch literal 18003 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 literal 0 HcmV?d00001 diff --git a/feature-toggles/index.html b/feature-toggles/index.html index bebb9401d..6f10f7cbf 100644 --- a/feature-toggles/index.html +++ b/feature-toggles/index.html @@ -17,7 +17,7 @@ -
    +
    @@ -40,7 +40,7 @@ - + \ No newline at end of file diff --git a/feature-toggles/main/main.html b/feature-toggles/main/main.html deleted file mode 100644 index d95a86e36..000000000 --- a/feature-toggles/main/main.html +++ /dev/null @@ -1,3 +0,0 @@ -
    -
    -
    \ No newline at end of file diff --git a/feature-toggles/manage/manage-toggles.html b/feature-toggles/manage/manage-toggles.html index b71f4b9a8..199436966 100644 --- a/feature-toggles/manage/manage-toggles.html +++ b/feature-toggles/manage/manage-toggles.html @@ -1 +1,19 @@ -
    fkhjsdlhfkjlsdakjflhskdhflkha
    \ No newline at end of file +
    + +
    +
    +
    + + Gerenciar instituição + + + ALL + ADMIN + SUPER USER + +
    +
    \ No newline at end of file diff --git a/feature-toggles/signin/signin.html b/feature-toggles/signin/signin.html new file mode 100644 index 000000000..6518a910b --- /dev/null +++ b/feature-toggles/signin/signin.html @@ -0,0 +1,3 @@ +
    + fsdlkhjfkl +
    \ No newline at end of file diff --git a/feature-toggles/main/mainControler.js b/feature-toggles/signin/signinController.js similarity index 50% rename from feature-toggles/main/mainControler.js rename to feature-toggles/signin/signinController.js index c94cb7b40..ee1475993 100644 --- a/feature-toggles/main/mainControler.js +++ b/feature-toggles/signin/signinController.js @@ -2,8 +2,8 @@ 'use strict'; const app = angular.module('app'); - app.controller('MainController', function() { - const mainCtrl = this; + app.controller('SigninController', function() { + const signinCtrl = this; }); From 4a4ac539c1486f82fc7d7c20da1406f7441e10fe Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 8 Jan 2019 16:37:30 -0300 Subject: [PATCH 030/606] Create manageToggleService --- feature-toggles/index.html | 2 ++ feature-toggles/manage/manage-toggles.css | 18 ++++++++++++++++++ feature-toggles/manage/manage-toggles.html | 12 ++++-------- feature-toggles/manage/manageTogglesService.js | 16 ++++++++++++++++ feature-toggles/signin/signin.html | 2 +- feature-toggles/signin/signinController.js | 2 -- 6 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 feature-toggles/manage/manage-toggles.css create mode 100644 feature-toggles/manage/manageTogglesService.js diff --git a/feature-toggles/index.html b/feature-toggles/index.html index 6f10f7cbf..58329e445 100644 --- a/feature-toggles/index.html +++ b/feature-toggles/index.html @@ -15,6 +15,8 @@ + +
    diff --git a/feature-toggles/manage/manage-toggles.css b/feature-toggles/manage/manage-toggles.css new file mode 100644 index 000000000..f4fd234c4 --- /dev/null +++ b/feature-toggles/manage/manage-toggles.css @@ -0,0 +1,18 @@ +.content { + padding: 16px; +} + +.content > img { + height: 35px; +} + +.toggle-content { + display: grid; + grid-template-columns: auto auto; + justify-content: center; + grid-gap: 10px; +} + +.toggle-content > md-select { + margin: 16px 0; +} \ No newline at end of file diff --git a/feature-toggles/manage/manage-toggles.html b/feature-toggles/manage/manage-toggles.html index 199436966..8a7ecb7da 100644 --- a/feature-toggles/manage/manage-toggles.html +++ b/feature-toggles/manage/manage-toggles.html @@ -1,16 +1,12 @@ -
    - +
    +
    -
    +
    Gerenciar instituição - + ALL ADMIN SUPER USER diff --git a/feature-toggles/manage/manageTogglesService.js b/feature-toggles/manage/manageTogglesService.js new file mode 100644 index 000000000..014ea0a21 --- /dev/null +++ b/feature-toggles/manage/manageTogglesService.js @@ -0,0 +1,16 @@ +(function() { + 'use strict'; + + const app = angular.module('app'); + + app.service('ManageTogglesService', function($http) { + const service = this; + const uri = 'api/feature-toggles'; + + service.getFeatureToggles = function() { + return $http.get(uri).then(function(response) { + return response.data; + }); + }; + }); +})(); \ No newline at end of file diff --git a/feature-toggles/signin/signin.html b/feature-toggles/signin/signin.html index 6518a910b..d0cbe3325 100644 --- a/feature-toggles/signin/signin.html +++ b/feature-toggles/signin/signin.html @@ -1,3 +1,3 @@
    - fsdlkhjfkl + signin
    \ No newline at end of file diff --git a/feature-toggles/signin/signinController.js b/feature-toggles/signin/signinController.js index ee1475993..634560ca3 100644 --- a/feature-toggles/signin/signinController.js +++ b/feature-toggles/signin/signinController.js @@ -4,7 +4,5 @@ app.controller('SigninController', function() { const signinCtrl = this; - - }); })(); \ No newline at end of file From 1719e2df72d671e6e064fd5269ac5e9cdb9f1d11 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 8 Jan 2019 16:55:42 -0300 Subject: [PATCH 031/606] Fix issues --- ecis | 6 +++--- feature-toggles/manage/manageTogglesService.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ecis b/ecis index fe869d50f..da6192337 100755 --- a/ecis +++ b/ecis @@ -227,7 +227,7 @@ case "$1" in set_landingpage_url local $LANDINGPAGE_LOCAL set_support_url local $SUPPORT_LOCAL set_frontend_url local $FRONTEND_LOCAL - set_feature_url local $FRONTEND_LOCAL + set_feature_url local $FEATURE_LOCAL if [[ -n $2 ]] && [ $2 = "--enable_datastore_emulator" ] ; then gcloud beta emulators datastore start --host-port=0.0.0.0:8586 & @@ -311,14 +311,14 @@ case "$1" in APP_NAME="development-cis" SUPPORT_DOMAIN="support-dot-$APP_NAME.appspot.com" FRONTEND_DOMAIN="frontend-dot-$APP_NAME.appspot.com" - FEATURE_DOMAIN="frontend-dot-$APP_NAME.appspot.com" + FEATURE_DOMAIN="feature-dot-$APP_NAME.appspot.com" break ;; "eciis-splab") APP_NAME="eciis-splab" SUPPORT_DOMAIN="support.plataformacis.org" FRONTEND_DOMAIN="frontend.plataformacis.org" - FEATURE_DOMAIN="frontend.plataformacis.org" + FEATURE_DOMAIN="feature.plataformacis.org" break ;; "Other") diff --git a/feature-toggles/manage/manageTogglesService.js b/feature-toggles/manage/manageTogglesService.js index 014ea0a21..eff6433ac 100644 --- a/feature-toggles/manage/manageTogglesService.js +++ b/feature-toggles/manage/manageTogglesService.js @@ -7,7 +7,7 @@ const service = this; const uri = 'api/feature-toggles'; - service.getFeatureToggles = function() { + service.getAllFeatureToggles = function() { return $http.get(uri).then(function(response) { return response.data; }); From a8d074861160dc8fe784028ac4e90135b98c404c Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 8 Jan 2019 17:03:22 -0300 Subject: [PATCH 032/606] Fix issues --- feature-toggles/manage/manageToggles.js | 2 +- feature-toggles/manage/manageTogglesService.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/feature-toggles/manage/manageToggles.js b/feature-toggles/manage/manageToggles.js index b286ed157..15e8eb2ea 100644 --- a/feature-toggles/manage/manageToggles.js +++ b/feature-toggles/manage/manageToggles.js @@ -4,6 +4,6 @@ const app = angular.module('app'); app.controller('ManageTogglesController', function() { - const ManageTogglesCtrl = this; + const manageTogglesCtrl = this; }); })(); \ No newline at end of file diff --git a/feature-toggles/manage/manageTogglesService.js b/feature-toggles/manage/manageTogglesService.js index eff6433ac..a0a005a5c 100644 --- a/feature-toggles/manage/manageTogglesService.js +++ b/feature-toggles/manage/manageTogglesService.js @@ -5,10 +5,10 @@ app.service('ManageTogglesService', function($http) { const service = this; - const uri = 'api/feature-toggles'; + const URI = 'api/feature-toggles'; service.getAllFeatureToggles = function() { - return $http.get(uri).then(function(response) { + return $http.get(URI).then(function(response) { return response.data; }); }; From a8777381cf6f420a66ed47bf6c0cfa46fdf0e64a Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 9 Jan 2019 08:26:30 -0300 Subject: [PATCH 033/606] Create login page --- feature-toggles/app.js | 4 +- feature-toggles/auth/login.css | 117 ++++++++++++++++++ feature-toggles/auth/login.html | 48 +++++++ .../loginController.js} | 4 +- feature-toggles/firebase-config.js | 8 ++ feature-toggles/icons/google-icon.svg | 72 +++++++++++ feature-toggles/images/logowithname.png | Bin 0 -> 82243 bytes feature-toggles/index.html | 13 +- feature-toggles/signin/signin.html | 3 - 9 files changed, 258 insertions(+), 11 deletions(-) create mode 100644 feature-toggles/auth/login.css create mode 100644 feature-toggles/auth/login.html rename feature-toggles/{signin/signinController.js => auth/loginController.js} (50%) create mode 100644 feature-toggles/firebase-config.js create mode 100644 feature-toggles/icons/google-icon.svg create mode 100644 feature-toggles/images/logowithname.png delete mode 100644 feature-toggles/signin/signin.html diff --git a/feature-toggles/app.js b/feature-toggles/app.js index 25609e70c..ace4cc808 100644 --- a/feature-toggles/app.js +++ b/feature-toggles/app.js @@ -24,8 +24,8 @@ url: "/signin", views: { main: { - templateUrl: "app/signin/signin.html", - controller: "SigninController as signinCtrl" + templateUrl: "app/auth/login.html", + controller: "LoginController as loginCtrl" } } }).state("manage-features", { diff --git a/feature-toggles/auth/login.css b/feature-toggles/auth/login.css new file mode 100644 index 000000000..9f0d00d2f --- /dev/null +++ b/feature-toggles/auth/login.css @@ -0,0 +1,117 @@ +.login-btn { + margin: 0 0 1em auto; + width: 100%; +} + +.login-btn md-icon { + color: white; + margin-right: 0.5em; + text-align: center; +} + +#login-invite-icon { + font-size: 1.3em; + line-height: 24px; + margin-left: 0.3em; +} + +#login-google-icon { + margin-left: 0.5em; +} + +#login-google-icon svg { + height: auto; + width: 1.3em; + line-height: auto; + margin: 0.155em 0.2em; +} + +.login-text { + margin-top: 4px; + text-align: justify; +} + +.login-form { + width: 100%; + margin: 1em 0; +} + +.login-card { + box-shadow: 0 1px 3px 0 rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 2px 1px -1px rgba(0,0,0,.12); + background-color: white; +} + +.login-card-content { + display: grid; + justify-items: center; + margin: 0; + width: 100%; +} + +.login-card-footer { + background-color: #E6E6E6; +} + +.login-content { + height: 100%; + width: 100%; + display: grid; + overflow: auto; +} + +#login-container { + display: grid; + padding: 8px; + justify-content: center; + align-content: center; + color: black; +} + +#form-content { + padding: 0 35px; +} + +.custom-card-logo { + margin: 1em; + width: 90%; +} + +.custom-card-back-btn { + margin: 0 -2.5em 0 0; +} + +@media screen and (max-width: 599px) { + #login-logo { + width: 50%; + margin: 1em 1em 7px 1em; + } + + #login-container { + grid-template-columns: 100%; + } + + #form-content { + padding: 0 16px; + } +} + +@media screen and (min-width: 600px) and (max-width: 1024px) { + #login-container { + grid-template-columns: 29px 65%; + align-items: center; + } +} + +@media screen and (min-width: 1025px) and (max-width: 1366px) { + #login-container { + grid-template-columns: 29px 35%; + align-items: center; + } +} + +@media screen and (min-width: 1367px) { + #login-container { + grid-template-columns: 29px 30%; + align-items: center; + } +} diff --git a/feature-toggles/auth/login.html b/feature-toggles/auth/login.html new file mode 100644 index 000000000..48974549a --- /dev/null +++ b/feature-toggles/auth/login.html @@ -0,0 +1,48 @@ + \ No newline at end of file diff --git a/feature-toggles/signin/signinController.js b/feature-toggles/auth/loginController.js similarity index 50% rename from feature-toggles/signin/signinController.js rename to feature-toggles/auth/loginController.js index 634560ca3..a6ce88298 100644 --- a/feature-toggles/signin/signinController.js +++ b/feature-toggles/auth/loginController.js @@ -2,7 +2,7 @@ 'use strict'; const app = angular.module('app'); - app.controller('SigninController', function() { - const signinCtrl = this; + app.controller('LoginController', function() { + const loginCtrl = this; }); })(); \ No newline at end of file diff --git a/feature-toggles/firebase-config.js b/feature-toggles/firebase-config.js new file mode 100644 index 000000000..b96d245b5 --- /dev/null +++ b/feature-toggles/firebase-config.js @@ -0,0 +1,8 @@ +var FIREBASE_CONFIG = { + apiKey: "AIzaSyBlpZudOyqMsSDIkZcPMmLCBxY5DWkoz14", + authDomain: "development-cis.firebaseapp.com", + databaseURL: "https://development-cis.firebaseio.com", + projectId: "development-cis", + storageBucket: "development-cis.appspot.com", + messagingSenderId: "531467954503" +}; diff --git a/feature-toggles/icons/google-icon.svg b/feature-toggles/icons/google-icon.svg new file mode 100644 index 000000000..800402771 --- /dev/null +++ b/feature-toggles/icons/google-icon.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/feature-toggles/images/logowithname.png b/feature-toggles/images/logowithname.png new file mode 100644 index 0000000000000000000000000000000000000000..f27b230718ac9cc754154cddd71fb71a6f06fd7c GIT binary patch literal 82243 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 `G&Zr(sY`4DrBh6xy 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 + -
    +
    @@ -35,14 +36,18 @@ - + - + - + \ No newline at end of file diff --git a/feature-toggles/signin/signin.html b/feature-toggles/signin/signin.html deleted file mode 100644 index d0cbe3325..000000000 --- a/feature-toggles/signin/signin.html +++ /dev/null @@ -1,3 +0,0 @@ -
    - signin -
    \ No newline at end of file From d522e0c899af8583b7bfc79155c42c7db9716d3e Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 9 Jan 2019 08:28:28 -0300 Subject: [PATCH 034/606] fix identation --- feature-toggles/auth/login.html | 88 ++++++++++++++++----------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/feature-toggles/auth/login.html b/feature-toggles/auth/login.html index 48974549a..37010e5f3 100644 --- a/feature-toggles/auth/login.html +++ b/feature-toggles/auth/login.html @@ -1,48 +1,48 @@
    - -
    \ No newline at end of file diff --git a/feature-toggles/auth/loginController.js b/feature-toggles/auth/loginController.js index 47ed91a8a..82f9d7e71 100644 --- a/feature-toggles/auth/loginController.js +++ b/feature-toggles/auth/loginController.js @@ -3,7 +3,7 @@ const app = angular.module('app'); app.controller('LoginController', function(AuthService, $state, - $stateParams, $window) { + $stateParams, $window, $mdToast) { const loginCtrl = this; loginCtrl.user = {}; @@ -51,10 +51,6 @@ redirectTo(redirectPath); }; - loginCtrl.resetPassword = function resetPassword(ev) { - $state.go(STATES.RESET_PASSWORD); - }; - loginCtrl.goToLandingPage = function goToLandingPage() { $window.open(Config.LANDINGPAGE_URL, '_self'); }; diff --git a/feature-toggles/index.html b/feature-toggles/index.html index 58c9a2a46..7b1ececd8 100644 --- a/feature-toggles/index.html +++ b/feature-toggles/index.html @@ -46,7 +46,9 @@ + + diff --git a/feature-toggles/user/user.js b/feature-toggles/user/user.js index 7b30b8518..f7f8fe2b9 100644 --- a/feature-toggles/user/user.js +++ b/feature-toggles/user/user.js @@ -31,22 +31,6 @@ User.prototype.isMember = function isMember(institutionKey){ return _.includes(_.map(this.institutions, getKeyObj), institutionKey); }; -User.prototype.isValid = function isValid() { - if (_.isUndefined(this.name) || _.isEmpty(this.name)) { - return false; - } - - if (_.isUndefined(this.email) || _.isEmpty(this.email)) { - return false; - } - - var cpfNotNull = this.cpf !== null; - if (cpfNotNull && (_.isUndefined(this.cpf) || _.isEmpty(this.cpf))) { - return false; - } - return true; -}; - User.prototype.isInactive = function isInactive() { var notActive = this.state != 'active'; return notActive; diff --git a/feature-toggles/utils/httpService.js b/feature-toggles/utils/httpService.js index 97868ab87..c5ea2b1bf 100644 --- a/feature-toggles/utils/httpService.js +++ b/feature-toggles/utils/httpService.js @@ -3,20 +3,9 @@ var app = angular.module('app'); - app.service('HttpService', function HttpService($http, $q) { + app.service('HttpService', function HttpService($http) { var service = this; - service.showToast = function showToast(message) { - $mdToast.show( - $mdToast.simple() - .textContent(message) - .action('FECHAR') - .highlightAction(true) - .hideDelay(5000) - .position('bottom right') - ); - }; - var POST = 'POST'; var GET = 'GET'; var PUT = 'PUT'; @@ -44,20 +33,11 @@ }; function request(method, url, data) { - var deferred = $q.defer(); - - $http({ - method: method, - url: url, - data: data - }).then(function success(response) { - deferred.resolve(response.data); - }, function error(response) { - service.showToast(response.data.msg); - deferred.reject(response); - }); - - return deferred.promise; + return $http({ + method, + url, + data + }).then(response => response.data); } }); })(); \ No newline at end of file diff --git a/feature-toggles/utils/utils.js b/feature-toggles/utils/utils.js new file mode 100644 index 000000000..271decafe --- /dev/null +++ b/feature-toggles/utils/utils.js @@ -0,0 +1,15 @@ +'use strict'; + +var Utils = { + /** + * Replaces the original backend domain by the local one + * @param {object} config configutarion object + */ + updateBackendUrl : function updateBackendUrl(config) { + var restApiUrl = Config.BACKEND_URL; + + var restApiRegex = new RegExp('^.*?/api/(.*)$'); + + config.url = config.url.replace(restApiRegex, restApiUrl + '/api/$1'); + } +}; \ No newline at end of file From f835c645951b1f97c1af3d9c480bc0e6037f51c0 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 9 Jan 2019 10:39:11 -0300 Subject: [PATCH 038/606] Refact index.html --- feature-toggles/index.html | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/feature-toggles/index.html b/feature-toggles/index.html index 7b1ececd8..1d2f98f5e 100644 --- a/feature-toggles/index.html +++ b/feature-toggles/index.html @@ -45,15 +45,25 @@ firebase.initializeApp(firebaseConfig); - + + + + + + - - + + + + + + + \ No newline at end of file From 805978e1cf7b0892faeff7ea3ea2b676b1103208 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 9 Jan 2019 10:41:28 -0300 Subject: [PATCH 039/606] Remove unnecessary methods --- feature-toggles/user/userService.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/feature-toggles/user/userService.js b/feature-toggles/user/userService.js index bf87f286c..009e9074f 100644 --- a/feature-toggles/user/userService.js +++ b/feature-toggles/user/userService.js @@ -5,13 +5,8 @@ app.service("UserService", function UserService(HttpService) { var service = this; - var USER_URI = "/api/user"; - service.getUser = function getUser(userKey) { - return HttpService.get(USER_URI + "/" + userKey + "/profile"); - }; - service.load = function load() { return HttpService.get(USER_URI); }; From 03911ad00749561ee184c1c20faf165b59e37ee5 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 14 Jan 2019 09:22:06 -0300 Subject: [PATCH 040/606] fix issues --- feature-toggles/auth/authService.js | 21 ++++++++------------- feature-toggles/auth/loginController.js | 8 ++------ feature-toggles/utils/httpService.js | 14 +++++++------- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/feature-toggles/auth/authService.js b/feature-toggles/auth/authService.js index 651ca6d08..c80b693f8 100644 --- a/feature-toggles/auth/authService.js +++ b/feature-toggles/auth/authService.js @@ -1,13 +1,13 @@ (function() { 'use strict'; - var app = angular.module("app"); + const app = angular.module("app"); app.service("AuthService", function AuthService($state, $window, UserService) { - var service = this; + const service = this; - var authObj = firebase.auth(); - var userInfo; + const authObj = firebase.auth(); + let userInfo; let tokenLoaded = false; service.resolveTokenPromise; let loadTokenPromise; @@ -101,16 +101,11 @@ return response.user; }); }).then(function(user) { - if (user.emailVerified) { - return user.getIdToken(true).then(function(idToken) { - return service.setupUser(idToken, user.emailVerified).then(function success(userInfo) { - return userInfo; - }); + return user.getIdToken(true).then(function(idToken) { + return service.setupUser(idToken, user.emailVerified).then(function success(userInfo) { + return userInfo; }); - } else { - service.sendEmailVerification(user); - throw "Error! Email not verified."; - } + }); }); } diff --git a/feature-toggles/auth/loginController.js b/feature-toggles/auth/loginController.js index 82f9d7e71..31fcbc706 100644 --- a/feature-toggles/auth/loginController.js +++ b/feature-toggles/auth/loginController.js @@ -33,10 +33,6 @@ return promise; }; - loginCtrl.limpar = function limpar() { - loginCtrl.user = {}; - }; - loginCtrl.loginWithEmailPassword = function loginWithEmailPassword() { AuthService.loginWithEmailAndPassword(loginCtrl.user.email, loginCtrl.user.password).then( function success() { @@ -67,10 +63,10 @@ } } - (function main() { + loginCtrl.$onInit = function main() { if (AuthService.isLoggedIn()) { $state.go("manage-features"); } - })(); + }; }); })(); \ No newline at end of file diff --git a/feature-toggles/utils/httpService.js b/feature-toggles/utils/httpService.js index c5ea2b1bf..9b1e472ef 100644 --- a/feature-toggles/utils/httpService.js +++ b/feature-toggles/utils/httpService.js @@ -1,16 +1,16 @@ (function () { 'use strict'; - var app = angular.module('app'); + const app = angular.module('app'); app.service('HttpService', function HttpService($http) { - var service = this; + const service = this; - var POST = 'POST'; - var GET = 'GET'; - var PUT = 'PUT'; - var DELETE = 'DELETE'; - var PATCH = 'PATCH'; + const POST = 'POST'; + const GET = 'GET'; + const PUT = 'PUT'; + const DELETE = 'DELETE'; + const PATCH = 'PATCH'; service.get = function getMethod(url) { return request(GET, url); From 563c2df752b0fc52273d6942aa3f3d5a81db10da Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 14 Jan 2019 09:36:52 -0300 Subject: [PATCH 041/606] Change var to const/let --- feature-toggles/app.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/feature-toggles/app.js b/feature-toggles/app.js index c46c021b6..5def0869f 100644 --- a/feature-toggles/app.js +++ b/feature-toggles/app.js @@ -22,8 +22,8 @@ $urlMatcherFactoryProvider.caseInsensitive(true); $stateProvider - .state("signin", { - url: "/signin", + .state("singin", { + url: "/singin", views: { main: { templateUrl: "app/auth/login.html", @@ -50,15 +50,15 @@ app.factory('BearerAuthInterceptor', function ($injector, $q, $state) { return { request: function(config) { - var AuthService = $injector.get('AuthService'); + const AuthService = $injector.get('AuthService'); config.headers = config.headers || {}; if (AuthService.isLoggedIn()) { return AuthService.getUserToken().then(token => { config.headers.Authorization = 'Bearer ' + token; - var API_URL = "/api/"; - var FIRST_POSITION = 0; - var requestToApi = config.url.indexOf(API_URL) == FIRST_POSITION; + const API_URL = "/api/"; + const FIRST_POSITION = 0; + const requestToApi = config.url.indexOf(API_URL) == FIRST_POSITION; if (!_.isEmpty(AuthService.getCurrentUser().institutions) && requestToApi) { config.headers['Institution-Authorization'] = AuthService.getCurrentUser().current_institution.key; @@ -73,13 +73,13 @@ return config || $q.when(config); }, responseError: function(rejection) { - var AuthService = $injector.get('AuthService'); + const AuthService = $injector.get('AuthService'); if (rejection.status === 401) { if (AuthService.isLoggedIn()) { AuthService.logout(); rejection.data.msg = "Sua sessão expirou!"; } else { - $state.go("signin"); + $state.go("singin"); } } else if(rejection.status === 403) { rejection.data.msg = "Você não tem permissão para realizar esta operação!"; From 262f28adc7cf87849d6b1d55f70eb0c73ddfd0f3 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 14 Jan 2019 10:37:40 -0300 Subject: [PATCH 042/606] Create user factory --- feature-toggles/auth/authService.js | 6 +-- feature-toggles/index.html | 6 +-- feature-toggles/user/user.js | 58 ------------------------ feature-toggles/user/userFactory.js | 69 +++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 64 deletions(-) delete mode 100644 feature-toggles/user/user.js create mode 100644 feature-toggles/user/userFactory.js diff --git a/feature-toggles/auth/authService.js b/feature-toggles/auth/authService.js index c80b693f8..6cdb91b2b 100644 --- a/feature-toggles/auth/authService.js +++ b/feature-toggles/auth/authService.js @@ -3,7 +3,7 @@ const app = angular.module("app"); - app.service("AuthService", function AuthService($state, $window, UserService) { + app.service("AuthService", function AuthService($state, $window, UserService, UserFactory) { const service = this; const authObj = firebase.auth(); @@ -158,7 +158,7 @@ } function configUser(userLoaded, firebaseUser) { - userInfo = new User(userLoaded); + userInfo = new UserFactory.user(userLoaded); _.extend(userInfo, firebaseUser); $window.localStorage.userInfo = JSON.stringify(userInfo); } @@ -166,7 +166,7 @@ function init() { if ($window.localStorage.userInfo) { var parse = JSON.parse($window.localStorage.userInfo); - userInfo = new User(parse); + userInfo = new UserFactory.user(parse); } } diff --git a/feature-toggles/index.html b/feature-toggles/index.html index 1d2f98f5e..617129481 100644 --- a/feature-toggles/index.html +++ b/feature-toggles/index.html @@ -45,13 +45,13 @@ firebase.initializeApp(firebaseConfig); - - - + + + diff --git a/feature-toggles/user/user.js b/feature-toggles/user/user.js deleted file mode 100644 index f7f8fe2b9..000000000 --- a/feature-toggles/user/user.js +++ /dev/null @@ -1,58 +0,0 @@ -"use strict"; - -function User(data) { - data = data || {}; - _.extend(this, data); - - if (!this.current_institution) { - this.changeInstitution(); - } -} - -User.prototype.changeInstitution = function changeInstitution(institution) { - if (this.institutions && this.institutions.length > 0) { - institution = institution || this.institutions[0]; - this.current_institution = _.find(this.institutions, {'key': institution.key}); - window.localStorage.userInfo = JSON.stringify(this); - } -}; - -User.prototype.isAdmin = function isAdmin(keyInstitution) { - var managed_institution = _.find(this.institutions_admin, function(institution) { - return getKey(institution) == keyInstitution; }); - return managed_institution; -}; - -User.prototype.isAdminOfCurrentInst = function isAdminOfCurrentInst() { - return this.institutions_admin.map(getKey).includes(this.current_institution.key); -}; - -User.prototype.isMember = function isMember(institutionKey){ - return _.includes(_.map(this.institutions, getKeyObj), institutionKey); -}; - -User.prototype.isInactive = function isInactive() { - var notActive = this.state != 'active'; - return notActive; -}; - -User.prototype.hasPermission = function hasPermission(permissionType, entityKey) { - var key = entityKey || this.current_institution.key; - if (this.permissions[permissionType]) { - return this.permissions[permissionType][key]; - } - return false; -}; - -function getKeyObj(obj) { - if(obj.key){ - return obj.key; - } -} - -function getKey(obj){ - var key = obj.split("/"); - key = key[key.length -1]; - - return key; -} \ No newline at end of file diff --git a/feature-toggles/user/userFactory.js b/feature-toggles/user/userFactory.js new file mode 100644 index 000000000..bc6c3539a --- /dev/null +++ b/feature-toggles/user/userFactory.js @@ -0,0 +1,69 @@ +(function() { + 'use strict'; + + const app = angular.module('app'); + + app.factory('UserFactory', function() { + + function User(data) { + data = data || {}; + _.extend(this, data); + + if (!this.current_institution) { + this.changeInstitution(); + } + } + + User.prototype.changeInstitution = function changeInstitution(institution) { + if (this.institutions && this.institutions.length > 0) { + institution = institution || this.institutions[0]; + this.current_institution = _.find(this.institutions, {'key': institution.key}); + window.localStorage.userInfo = JSON.stringify(this); + } + }; + + User.prototype.isAdmin = function isAdmin(keyInstitution) { + var managed_institution = _.find(this.institutions_admin, function(institution) { + return getKey(institution) == keyInstitution; }); + return managed_institution; + }; + + User.prototype.isAdminOfCurrentInst = function isAdminOfCurrentInst() { + return this.institutions_admin.map(getKey).includes(this.current_institution.key); + }; + + User.prototype.isMember = function isMember(institutionKey){ + return _.includes(_.map(this.institutions, getKeyObj), institutionKey); + }; + + User.prototype.isInactive = function isInactive() { + var notActive = this.state != 'active'; + return notActive; + }; + + User.prototype.hasPermission = function hasPermission(permissionType, entityKey) { + var key = entityKey || this.current_institution.key; + if (this.permissions[permissionType]) { + return this.permissions[permissionType][key]; + } + return false; + }; + + function getKeyObj(obj) { + if(obj.key){ + return obj.key; + } + } + + function getKey(obj){ + var key = obj.split("/"); + key = key[key.length -1]; + + return key; + } + + return { + user: User + }; + }); +})(); \ No newline at end of file From f9b138cc4a2630f5f5c48ccc73a6b20bfee367d9 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 14 Jan 2019 10:40:25 -0300 Subject: [PATCH 043/606] Change user factory function to arrow function --- feature-toggles/user/userFactory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature-toggles/user/userFactory.js b/feature-toggles/user/userFactory.js index bc6c3539a..ad723a231 100644 --- a/feature-toggles/user/userFactory.js +++ b/feature-toggles/user/userFactory.js @@ -3,7 +3,7 @@ const app = angular.module('app'); - app.factory('UserFactory', function() { + app.factory('UserFactory', () => { function User(data) { data = data || {}; From dea227e27287987b3ce8e474a907906a0eeed937 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 14 Jan 2019 14:20:34 -0300 Subject: [PATCH 044/606] Add loadCricle in login.html --- feature-toggles/auth/authService.js | 3 +++ feature-toggles/auth/login.html | 3 ++- feature-toggles/auth/loginController.js | 9 +++++++ feature-toggles/index.html | 1 + feature-toggles/utils/loadCircleDirective.js | 26 ++++++++++++++++++++ 5 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 feature-toggles/utils/loadCircleDirective.js diff --git a/feature-toggles/auth/authService.js b/feature-toggles/auth/authService.js index 6cdb91b2b..412c99514 100644 --- a/feature-toggles/auth/authService.js +++ b/feature-toggles/auth/authService.js @@ -96,6 +96,7 @@ }; function login(loginMethodPromisse) { + service.isLoadingUser = true; return authObj.setPersistence(firebase.auth.Auth.Persistence.LOCAL).then(function() { return loginMethodPromisse.then(function(response) { return response.user; @@ -106,6 +107,8 @@ return userInfo; }); }); + }).finally(() => { + service.isLoadingUser = false; }); } diff --git a/feature-toggles/auth/login.html b/feature-toggles/auth/login.html index 5a83bff3d..78bc20069 100644 --- a/feature-toggles/auth/login.html +++ b/feature-toggles/auth/login.html @@ -21,11 +21,12 @@ -
    +
    Acessar
    +
    -
    +
    - Gerenciar instituição + {{feature.name}} - + + DISABLED + ALL + ADMIN + SUPER USER + + + DISABLED ALL ADMIN SUPER USER
    + {{manageTogglesCtrl.features}}
    \ No newline at end of file diff --git a/feature-toggles/manage/manageToggles.js b/feature-toggles/manage/manageToggles.js deleted file mode 100644 index 15e8eb2ea..000000000 --- a/feature-toggles/manage/manageToggles.js +++ /dev/null @@ -1,9 +0,0 @@ -(function() { - 'use strict'; - - const app = angular.module('app'); - - app.controller('ManageTogglesController', function() { - const manageTogglesCtrl = this; - }); -})(); \ No newline at end of file diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js new file mode 100644 index 000000000..c3ec818b8 --- /dev/null +++ b/feature-toggles/manage/manageTogglesController.js @@ -0,0 +1,16 @@ +(function() { + 'use strict'; + + const app = angular.module('app'); + + app.controller('ManageTogglesController', function(ManageTogglesService) { + const manageTogglesCtrl = this; + manageTogglesCtrl.features = []; + + manageTogglesCtrl.$onInit = function() { + ManageTogglesService.getAllFeatureToggles().then(function(features) { + manageTogglesCtrl.features = features; + }); + }; + }); +})(); \ No newline at end of file diff --git a/feature-toggles/manage/manageTogglesService.js b/feature-toggles/manage/manageTogglesService.js index a0a005a5c..10026b687 100644 --- a/feature-toggles/manage/manageTogglesService.js +++ b/feature-toggles/manage/manageTogglesService.js @@ -5,7 +5,7 @@ app.service('ManageTogglesService', function($http) { const service = this; - const URI = 'api/feature-toggles'; + const URI = '/api/feature-toggles'; service.getAllFeatureToggles = function() { return $http.get(URI).then(function(response) { From fad8a81ed1ec212709e2a9e13b566c7f4f80cf5a Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 16 Jan 2019 09:04:46 -0300 Subject: [PATCH 046/606] change feature toggles page layout --- feature-toggles/auth/authService.js | 2 +- feature-toggles/manage/manage-toggles.css | 14 ++++- feature-toggles/manage/manage-toggles.html | 54 +++++++++++-------- .../manage/manageTogglesController.js | 20 ++++++- 4 files changed, 64 insertions(+), 26 deletions(-) diff --git a/feature-toggles/auth/authService.js b/feature-toggles/auth/authService.js index 412c99514..a0c131067 100644 --- a/feature-toggles/auth/authService.js +++ b/feature-toggles/auth/authService.js @@ -128,7 +128,7 @@ executeLogoutListeners(); - $state.go("signin"); + $state.go("singin"); }; service.getCurrentUser = function getCurrentUser() { diff --git a/feature-toggles/manage/manage-toggles.css b/feature-toggles/manage/manage-toggles.css index dc0988154..2060ca896 100644 --- a/feature-toggles/manage/manage-toggles.css +++ b/feature-toggles/manage/manage-toggles.css @@ -1,16 +1,26 @@ .content { + display: grid; padding: 16px; + grid-template-columns: auto auto; + justify-content: space-between; } .content > img { height: 35px; } +.content > button { + border-radius: 50%; + border: none; + background-color: transparent; + color: white; +} + .toggle-content { display: grid; - grid-template-columns: auto auto auto; - justify-content: center; + grid-template-columns: auto 154px 154px; grid-gap: 10px; + align-items: center; } .toggle-content > md-select { diff --git a/feature-toggles/manage/manage-toggles.html b/feature-toggles/manage/manage-toggles.html index 69110374a..98ecb52c7 100644 --- a/feature-toggles/manage/manage-toggles.html +++ b/feature-toggles/manage/manage-toggles.html @@ -1,23 +1,35 @@ -
    - -
    -
    -
    - - {{feature.name}} - - - DISABLED - ALL - ADMIN - SUPER USER - - - DISABLED - ALL - ADMIN - SUPER USER - +
    +
    + + +
    +
    +

    Gerenciar features do sistema

    +
    +
    + + {{feature.name}} + + + + + DESABILITADO + TODOS + TESTE + SUPER USÁRIO + + + + + + DESABILITADO + TODOS + TESTE + SUPER USÁRIO + + +
    + SALVAR +
    - {{manageTogglesCtrl.features}}
    \ No newline at end of file diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js index c3ec818b8..280ad6559 100644 --- a/feature-toggles/manage/manageTogglesController.js +++ b/feature-toggles/manage/manageTogglesController.js @@ -3,13 +3,29 @@ const app = angular.module('app'); - app.controller('ManageTogglesController', function(ManageTogglesService) { + app.controller('ManageTogglesController', function(ManageTogglesService, AuthService) { const manageTogglesCtrl = this; manageTogglesCtrl.features = []; + manageTogglesCtrl.modifiedFeatures = []; + + manageTogglesCtrl.logout = function() { + AuthService.logout(); + }; + + manageTogglesCtrl.addModifiedFeature = function(feature) { + const featureFound = _.find(manageTogglesCtrl.modifiedFeatures, element => element.name === feature.name); + + if (!featureFound) { + manageTogglesCtrl.modifiedFeatures.push(feature); + } + + console.log(manageTogglesCtrl.modifiedFeatures); + }; manageTogglesCtrl.$onInit = function() { - ManageTogglesService.getAllFeatureToggles().then(function(features) { + return ManageTogglesService.getAllFeatureToggles().then(function(features) { manageTogglesCtrl.features = features; + return features; }); }; }); From 6c59a87fdf44a0ebeec09a8d93653cae30cbd65a Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 16 Jan 2019 09:41:47 -0300 Subject: [PATCH 047/606] Create method to save changes of feature toggles --- feature-toggles/auth/authService.js | 3 +++ feature-toggles/manage/manage-toggles.html | 7 ++++--- feature-toggles/manage/manageTogglesController.js | 6 +++++- feature-toggles/manage/manageTogglesService.js | 12 +++++++----- feature-toggles/user/userFactory.js | 8 ++------ 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/feature-toggles/auth/authService.js b/feature-toggles/auth/authService.js index a0c131067..aaab660bf 100644 --- a/feature-toggles/auth/authService.js +++ b/feature-toggles/auth/authService.js @@ -109,6 +109,9 @@ }); }).finally(() => { service.isLoadingUser = false; + if (!userInfo.hasPermission('analyze_request_inst')) { + service.logout(); + } }); } diff --git a/feature-toggles/manage/manage-toggles.html b/feature-toggles/manage/manage-toggles.html index 98ecb52c7..30f254985 100644 --- a/feature-toggles/manage/manage-toggles.html +++ b/feature-toggles/manage/manage-toggles.html @@ -16,7 +16,7 @@

    Gerenciar features do sistema

    DESABILITADO TODOS TESTE - SUPER USÁRIO + SUPER USÁRIO @@ -25,11 +25,12 @@

    Gerenciar features do sistema

    DESABILITADO TODOS TESTE - SUPER USÁRIO + SUPER USÁRIO
    - SALVAR + SALVAR
    \ No newline at end of file diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js index 280ad6559..0d21a51e1 100644 --- a/feature-toggles/manage/manageTogglesController.js +++ b/feature-toggles/manage/manageTogglesController.js @@ -18,8 +18,12 @@ if (!featureFound) { manageTogglesCtrl.modifiedFeatures.push(feature); } + }; - console.log(manageTogglesCtrl.modifiedFeatures); + manageTogglesCtrl.save = function save() { + const promise = ManageTogglesService.saveFeatures(manageTogglesCtrl.modifiedFeatures); + manageTogglesCtrl.modifiedFeatures = []; + return promise; }; manageTogglesCtrl.$onInit = function() { diff --git a/feature-toggles/manage/manageTogglesService.js b/feature-toggles/manage/manageTogglesService.js index 10026b687..3c5b7bfab 100644 --- a/feature-toggles/manage/manageTogglesService.js +++ b/feature-toggles/manage/manageTogglesService.js @@ -3,14 +3,16 @@ const app = angular.module('app'); - app.service('ManageTogglesService', function($http) { + app.service('ManageTogglesService', function(HttpService) { const service = this; const URI = '/api/feature-toggles'; - service.getAllFeatureToggles = function() { - return $http.get(URI).then(function(response) { - return response.data; - }); + service.getAllFeatureToggles = function getAllFeatureToggles() { + return HttpService.get(URI); + }; + + service.saveFeatures = function saveFeatures(features) { + HttpService.put(URI, features); }; }); })(); \ No newline at end of file diff --git a/feature-toggles/user/userFactory.js b/feature-toggles/user/userFactory.js index ad723a231..2d6827c47 100644 --- a/feature-toggles/user/userFactory.js +++ b/feature-toggles/user/userFactory.js @@ -41,12 +41,8 @@ return notActive; }; - User.prototype.hasPermission = function hasPermission(permissionType, entityKey) { - var key = entityKey || this.current_institution.key; - if (this.permissions[permissionType]) { - return this.permissions[permissionType][key]; - } - return false; + User.prototype.hasPermission = function hasPermission(permissionType) { + return permissionType in this.permissions; }; function getKeyObj(obj) { From 21e5b7ad1d99392f38170df091cc1b8d53134bd8 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 16 Jan 2019 10:22:54 -0300 Subject: [PATCH 048/606] Create message service --- feature-toggles/auth/authService.js | 3 ++- feature-toggles/auth/loginController.js | 17 +++------------- feature-toggles/index.html | 1 + .../manage/manageTogglesController.js | 6 ++++-- feature-toggles/utils/messageService.js | 20 +++++++++++++++++++ 5 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 feature-toggles/utils/messageService.js diff --git a/feature-toggles/auth/authService.js b/feature-toggles/auth/authService.js index aaab660bf..795b81bce 100644 --- a/feature-toggles/auth/authService.js +++ b/feature-toggles/auth/authService.js @@ -3,7 +3,7 @@ const app = angular.module("app"); - app.service("AuthService", function AuthService($state, $window, UserService, UserFactory) { + app.service("AuthService", function AuthService($state, $window, UserService, UserFactory, MessageService) { const service = this; const authObj = firebase.auth(); @@ -111,6 +111,7 @@ service.isLoadingUser = false; if (!userInfo.hasPermission('analyze_request_inst')) { service.logout(); + MessageService.showToast("Você não possui permissão para acessar esta página."); } }); } diff --git a/feature-toggles/auth/loginController.js b/feature-toggles/auth/loginController.js index 98397524a..661365fe9 100644 --- a/feature-toggles/auth/loginController.js +++ b/feature-toggles/auth/loginController.js @@ -3,7 +3,7 @@ const app = angular.module('app'); app.controller('LoginController', function(AuthService, $state, - $stateParams, $window, $mdToast) { + $stateParams, $window, MessageService) { const loginCtrl = this; loginCtrl.user = {}; @@ -12,23 +12,12 @@ var redirectPath = $stateParams.redirect; - loginCtrl.showToast = function showToast(message) { - $mdToast.show( - $mdToast.simple() - .textContent(message) - .action('FECHAR') - .highlightAction(true) - .hideDelay(5000) - .position('bottom right') - ); - }; - loginCtrl.loginWithGoogle = function loginWithGoogle() { var promise = AuthService.loginWithGoogle(); promise.then(function success() { redirectTo(redirectPath); }).catch(function(error) { - loginCtrl.showToast(error); + MessageService.showToast(error); }); return promise; }; @@ -48,7 +37,7 @@ redirectTo(redirectPath); } ).catch(function(error) { - loginCtrl.showToast(error); + MessageService.showToast(error); }); }; diff --git a/feature-toggles/index.html b/feature-toggles/index.html index 73fe9063d..1d9747d21 100644 --- a/feature-toggles/index.html +++ b/feature-toggles/index.html @@ -56,6 +56,7 @@ + diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js index 0d21a51e1..b771dcae3 100644 --- a/feature-toggles/manage/manageTogglesController.js +++ b/feature-toggles/manage/manageTogglesController.js @@ -3,7 +3,7 @@ const app = angular.module('app'); - app.controller('ManageTogglesController', function(ManageTogglesService, AuthService) { + app.controller('ManageTogglesController', function(ManageTogglesService, AuthService, MessageService) { const manageTogglesCtrl = this; manageTogglesCtrl.features = []; manageTogglesCtrl.modifiedFeatures = []; @@ -21,7 +21,9 @@ }; manageTogglesCtrl.save = function save() { - const promise = ManageTogglesService.saveFeatures(manageTogglesCtrl.modifiedFeatures); + const promise = ManageTogglesService.saveFeatures(manageTogglesCtrl.modifiedFeatures).catch(response => { + MessageService.showToast(response.msg); + }); manageTogglesCtrl.modifiedFeatures = []; return promise; }; diff --git a/feature-toggles/utils/messageService.js b/feature-toggles/utils/messageService.js new file mode 100644 index 000000000..6a26686b9 --- /dev/null +++ b/feature-toggles/utils/messageService.js @@ -0,0 +1,20 @@ +(function() { + 'use strict'; + + const app = angular.module('app'); + + app.service('MessageService', function($mdToast) { + const service = this; + + service.showToast = function showToast(message) { + $mdToast.show( + $mdToast.simple() + .textContent(message) + .action('FECHAR') + .highlightAction(true) + .hideDelay(5000) + .position('bottom right') + ); + }; + }); +})(); \ No newline at end of file From 753502d898e22ce853d4d59edb4dcf97d2b4e2e9 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 16 Jan 2019 10:32:03 -0300 Subject: [PATCH 049/606] add load circle when save changes --- feature-toggles/manage/manage-toggles.html | 6 ++++-- feature-toggles/manage/manageTogglesController.js | 14 +++++++++++--- feature-toggles/manage/manageTogglesService.js | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/feature-toggles/manage/manage-toggles.html b/feature-toggles/manage/manage-toggles.html index 30f254985..e96dc1fe8 100644 --- a/feature-toggles/manage/manage-toggles.html +++ b/feature-toggles/manage/manage-toggles.html @@ -29,8 +29,10 @@

    Gerenciar features do sistema

    - SALVAR + SALVAR + \ No newline at end of file diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js index b771dcae3..3fd7b26be 100644 --- a/feature-toggles/manage/manageTogglesController.js +++ b/feature-toggles/manage/manageTogglesController.js @@ -5,6 +5,7 @@ app.controller('ManageTogglesController', function(ManageTogglesService, AuthService, MessageService) { const manageTogglesCtrl = this; + manageTogglesCtrl.isLoading = false; manageTogglesCtrl.features = []; manageTogglesCtrl.modifiedFeatures = []; @@ -21,9 +22,16 @@ }; manageTogglesCtrl.save = function save() { - const promise = ManageTogglesService.saveFeatures(manageTogglesCtrl.modifiedFeatures).catch(response => { - MessageService.showToast(response.msg); - }); + manageTogglesCtrl.isLoading = true; + const promise = ManageTogglesService.saveFeatures(manageTogglesCtrl.modifiedFeatures) + .then(response => { + MessageService.showToast("Alterações salvas com sucesso."); + return response; + }).catch(response => { + MessageService.showToast(response.msg); + }).finally(function() { + manageTogglesCtrl.isLoading = false; + }); manageTogglesCtrl.modifiedFeatures = []; return promise; }; diff --git a/feature-toggles/manage/manageTogglesService.js b/feature-toggles/manage/manageTogglesService.js index 3c5b7bfab..f6d0eae08 100644 --- a/feature-toggles/manage/manageTogglesService.js +++ b/feature-toggles/manage/manageTogglesService.js @@ -12,7 +12,7 @@ }; service.saveFeatures = function saveFeatures(features) { - HttpService.put(URI, features); + return HttpService.put(URI, features); }; }); })(); \ No newline at end of file From 7f31013640c24ef0c649e63321f97b9b8482185c Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 16 Jan 2019 10:35:14 -0300 Subject: [PATCH 050/606] Remove unnecessary functions --- feature-toggles/user/userFactory.js | 30 ----------------------------- 1 file changed, 30 deletions(-) diff --git a/feature-toggles/user/userFactory.js b/feature-toggles/user/userFactory.js index 2d6827c47..8120b0315 100644 --- a/feature-toggles/user/userFactory.js +++ b/feature-toggles/user/userFactory.js @@ -22,41 +22,11 @@ } }; - User.prototype.isAdmin = function isAdmin(keyInstitution) { - var managed_institution = _.find(this.institutions_admin, function(institution) { - return getKey(institution) == keyInstitution; }); - return managed_institution; - }; - - User.prototype.isAdminOfCurrentInst = function isAdminOfCurrentInst() { - return this.institutions_admin.map(getKey).includes(this.current_institution.key); - }; - - User.prototype.isMember = function isMember(institutionKey){ - return _.includes(_.map(this.institutions, getKeyObj), institutionKey); - }; - - User.prototype.isInactive = function isInactive() { - var notActive = this.state != 'active'; - return notActive; - }; User.prototype.hasPermission = function hasPermission(permissionType) { return permissionType in this.permissions; }; - function getKeyObj(obj) { - if(obj.key){ - return obj.key; - } - } - - function getKey(obj){ - var key = obj.split("/"); - key = key[key.length -1]; - - return key; - } return { user: User From fbe74f08692fefff5e105b79be12fd90bc67ce0f Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 16 Jan 2019 10:58:00 -0300 Subject: [PATCH 051/606] Create translation off features --- backend/admin.py | 5 ++++- backend/handlers/feature_toggle_handler.py | 7 ++++--- backend/models/feature.py | 11 +++++++---- feature-toggles/manage/manage-toggles.html | 2 +- feature-toggles/manage/manageTogglesService.js | 2 +- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/backend/admin.py b/backend/admin.py index ca32d57ee..fd565f48d 100644 --- a/backend/admin.py +++ b/backend/admin.py @@ -42,7 +42,10 @@ { "name": 'manage-inst-edit', "enable_mobile": "DISABLED", - "enable_desktop": "ALL" + "enable_desktop": "ALL", + "translation_dict": { + "pt-br": "Editar informações da instituição" + } } ] diff --git a/backend/handlers/feature_toggle_handler.py b/backend/handlers/feature_toggle_handler.py index 36aa9cdd8..a3ed10283 100644 --- a/backend/handlers/feature_toggle_handler.py +++ b/backend/handlers/feature_toggle_handler.py @@ -11,7 +11,7 @@ __all__ = ['FeatureToggleHandler'] -def to_json(feature_list): +def to_json(feature_list, language=None): """ Method to generate list of feature models in json format object. @@ -19,7 +19,7 @@ def to_json(feature_list): feature_list -- List of features objects """ - features = [feature.make() for feature in feature_list] + features = [feature.make(language) for feature in feature_list] return json.dumps(features) class FeatureToggleHandler(BaseHandler): @@ -33,13 +33,14 @@ def get(self, user): """ feature_name = self.request.get('name') + language = self.request.get('lang') if feature_name: features = [Feature.get_feature(feature_name)] else: features = Feature.get_all_features() - self.response.write(to_json(features)) + self.response.write(to_json(features, language)) @login_required @json_response diff --git a/backend/models/feature.py b/backend/models/feature.py index 127c396a8..ed4aa8aaa 100644 --- a/backend/models/feature.py +++ b/backend/models/feature.py @@ -1,4 +1,5 @@ """Feature model.""" +import json from google.appengine.ext import ndb __all__ = ['Feature'] @@ -13,10 +14,11 @@ class Feature(ndb.Model): choices=set(["SUPER_USER", "ADMIN", "ALL", "DISABLED"])) enable_desktop = ndb.StringProperty( choices=set(["SUPER_USER", "ADMIN", "ALL", "DISABLED"])) + translation = ndb.JsonProperty(default="{}") @staticmethod @ndb.transactional(xg=True) - def create(name, enable_mobile="ALL", enable_desktop="ALL"): + def create(name, translation_dict, enable_mobile="ALL", enable_desktop="ALL"): """ Method to create new feature. @@ -27,6 +29,7 @@ def create(name, enable_mobile="ALL", enable_desktop="ALL"): """ feature = Feature(id=name, name=name, enable_desktop=enable_desktop, enable_mobile=enable_mobile) + feature.translation = json.dumps(translation_dict) feature.put() return feature @@ -80,15 +83,15 @@ def get_feature(feature_name): else: raise Exception("Feature not found!") - def make(self): + def make(self, language="pt-br"): """ Method to make feature. """ - make_obj = { 'name': self.name, 'enable_mobile': self.enable_mobile, - 'enable_desktop': self.enable_desktop + 'enable_desktop': self.enable_desktop, + 'translation': json.loads(self.translation).get(language) } return make_obj diff --git a/feature-toggles/manage/manage-toggles.html b/feature-toggles/manage/manage-toggles.html index e96dc1fe8..a22b7bec4 100644 --- a/feature-toggles/manage/manage-toggles.html +++ b/feature-toggles/manage/manage-toggles.html @@ -8,7 +8,7 @@

    Gerenciar features do sistema

    - {{feature.name}} + {{feature.translation || feature.name}} diff --git a/feature-toggles/manage/manageTogglesService.js b/feature-toggles/manage/manageTogglesService.js index f6d0eae08..1dba95c8a 100644 --- a/feature-toggles/manage/manageTogglesService.js +++ b/feature-toggles/manage/manageTogglesService.js @@ -5,7 +5,7 @@ app.service('ManageTogglesService', function(HttpService) { const service = this; - const URI = '/api/feature-toggles'; + const URI = '/api/feature-toggles?lang=pt-br'; service.getAllFeatureToggles = function getAllFeatureToggles() { return HttpService.get(URI); From fc7cb9d61932f3cd94b562a3857d911524141317 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 16 Jan 2019 11:30:34 -0300 Subject: [PATCH 052/606] Fix backend tests --- backend/handlers/feature_toggle_handler.py | 2 +- .../feature_toggle_handler_test.py | 12 ++++----- backend/test/model_test/feature_test.py | 25 ++++++++++--------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/backend/handlers/feature_toggle_handler.py b/backend/handlers/feature_toggle_handler.py index a3ed10283..95b13c950 100644 --- a/backend/handlers/feature_toggle_handler.py +++ b/backend/handlers/feature_toggle_handler.py @@ -11,7 +11,7 @@ __all__ = ['FeatureToggleHandler'] -def to_json(feature_list, language=None): +def to_json(feature_list, language="pt-br"): """ Method to generate list of feature models in json format object. diff --git a/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py b/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py index 0ead984fb..144014cbd 100644 --- a/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py +++ b/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py @@ -25,15 +25,15 @@ def setUp(cls): ], debug=True) cls.testapp = cls.webtest.TestApp(app) - cls.feature = Feature.create('feature-test') - cls.other_feature = Feature.create('feature-test-other') + cls.feature = Feature.create('feature-test', {'pt-br': 'Feature Teste'}) + cls.other_feature = Feature.create('feature-test-other', {'pt-br': 'Feature Teste'}) @patch('util.login_service.verify_token', return_value=USER) def test_get_all(self, verify_token): """Test get all features.""" - features = self.testapp.get('/api/feature-toggles').json + features = self.testapp.get('/api/feature-toggles?lang=pt-br').json features_make = [self.feature.make(), self.other_feature.make()] self.assertEquals(len(features), 2) @@ -42,14 +42,12 @@ def test_get_all(self, verify_token): @patch('util.login_service.verify_token', return_value=USER) def test_get_by_query(self, verify_token): """Test get feature with query parameter.""" - - feature = self.testapp.get('/api/feature-toggles?name=feature-test').json + feature = self.testapp.get('/api/feature-toggles?name=feature-test&lang=pt-br').json feature_make = [self.feature.make()] self.assertListEqual(feature, feature_make) - - feature = self.testapp.get('/api/feature-toggles?name=feature-test-other').json + feature = self.testapp.get('/api/feature-toggles?name=feature-test-other&lang=pt-br').json feature_make = [self.other_feature.make()] self.assertListEqual(feature, feature_make) diff --git a/backend/test/model_test/feature_test.py b/backend/test/model_test/feature_test.py index 984696066..7573e2425 100644 --- a/backend/test/model_test/feature_test.py +++ b/backend/test/model_test/feature_test.py @@ -19,23 +19,23 @@ def setUp(cls): def test_create(self): """Teste create a new feature.""" - feature = Feature.create('feature-test') + feature = Feature.create('feature-test', {'pt-br': 'Feature Teste'}) self.assertEqual(feature.name, 'feature-test') self.assertEqual(feature.enable_desktop, 'ALL') self.assertEqual(feature.enable_mobile, 'ALL') - feature = Feature.create('feature-test2', 'DISABLED') + feature = Feature.create('feature-test2', {'pt-br': 'Feature Teste'}, 'DISABLED') self.assertEqual(feature.name, 'feature-test2') self.assertEqual(feature.enable_desktop, 'ALL') self.assertEqual(feature.enable_mobile, 'DISABLED') - feature = Feature.create('feature-test3', 'DISABLED', 'DISABLED') + feature = Feature.create('feature-test3', {'pt-br': 'Feature Teste'}, 'DISABLED', 'DISABLED') self.assertEqual(feature.name, 'feature-test3') self.assertEqual(feature.enable_desktop, 'DISABLED') self.assertEqual(feature.enable_mobile, 'DISABLED') with self.assertRaises(Exception) as raises_context: - Feature.create('feature-test', 'asjdkhd') + Feature.create('feature-test', {'pt-br': 'Feature Teste'}, 'asjdkhd') exception_message = raises_context.exception self.assertEquals( @@ -45,7 +45,7 @@ def test_create(self): def test_set_visibility(self): """Test set visibility.""" - Feature.create('feature-test') + Feature.create('feature-test', {'pt-br': 'Feature Teste'}) feature_dict = { 'name': 'feature-test', @@ -62,14 +62,14 @@ def test_set_visibility(self): def test_get_all_features(self): """Test get all features.""" - feature = Feature.create('feature-test') - feature2 = Feature.create('feature-test2') + feature = Feature.create('feature-test', {'pt-br': 'Feature Teste'}) + feature2 = Feature.create('feature-test2', {'pt-br': 'Feature Teste'}) features = Feature.get_all_features() self.assertIn(feature, features) self.assertIn(feature2, features) - feature3 = Feature.create('feature-test3') + feature3 = Feature.create('feature-test3', {'pt-br': 'Feature Teste'}) self.assertNotIn(feature3, features) features = Feature.get_all_features() @@ -77,8 +77,8 @@ def test_get_all_features(self): def test_get_feature(self): """Test get feature.""" - feature = Feature.create('feature-test') - feature2 = Feature.create('feature-test2') + feature = Feature.create('feature-test', {'pt-br': 'Feature Teste'}) + feature2 = Feature.create('feature-test2', {'pt-br': 'Feature Teste'}) self.assertEqual(feature, Feature.get_feature('feature-test')) self.assertEqual(feature2, Feature.get_feature('feature-test2')) @@ -94,11 +94,12 @@ def test_get_feature(self): def test_make(self): """Test make feature.""" - feature = Feature.create('feature-test') + feature = Feature.create('feature-test', {'pt-br': 'Feature Teste'}) make = { 'name': 'feature-test', 'enable_mobile': 'ALL', - 'enable_desktop': 'ALL' + 'enable_desktop': 'ALL', + 'translation': 'Feature Teste' } self.assertEqual(make, feature.make()) From a0898ca77fafda8a8658369a0fa3c321198ee84d Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 16 Jan 2019 11:41:35 -0300 Subject: [PATCH 053/606] fix ecis script --- ecis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecis b/ecis index da6192337..de613930d 100755 --- a/ecis +++ b/ecis @@ -122,7 +122,7 @@ function set_frontend_url { function set_feature_url { url=$(set_service_url $1 $2); service="FEATURE_URL"; - line=7; + line=8; service_name="feature"; set_config_file $line $service $url $service_name; } From befde0fba8e792902d2e0836cbeea05f8eefddcb Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 21 Jan 2019 14:50:07 -0300 Subject: [PATCH 054/606] Fix issues --- feature-toggles/app.js | 5 +- feature-toggles/manage/manage-toggles.html | 14 +--- .../manage/manageTogglesController.js | 77 +++++++++++++------ .../manage/manageTogglesService.js | 8 +- feature-toggles/utils/messageService.js | 8 +- 5 files changed, 74 insertions(+), 38 deletions(-) diff --git a/feature-toggles/app.js b/feature-toggles/app.js index 62f8f23a0..65c7ca210 100644 --- a/feature-toggles/app.js +++ b/feature-toggles/app.js @@ -94,8 +94,11 @@ }; }); + /** + * Auth interceptor to check if the usr is logged in, if not, redirect to login page. + */ app.run(function authInterceptor(AuthService, $transitions) { - var ignored_routes = [ + const ignored_routes = [ "singin" ]; diff --git a/feature-toggles/manage/manage-toggles.html b/feature-toggles/manage/manage-toggles.html index a22b7bec4..08d1b3646 100644 --- a/feature-toggles/manage/manage-toggles.html +++ b/feature-toggles/manage/manage-toggles.html @@ -12,20 +12,14 @@

    Gerenciar features do sistema

    - - DESABILITADO - TODOS - TESTE - SUPER USÁRIO + + {{option.name}} - - DESABILITADO - TODOS - TESTE - SUPER USÁRIO + + {{option.name}}
    diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js index 3fd7b26be..84349b8fb 100644 --- a/feature-toggles/manage/manageTogglesController.js +++ b/feature-toggles/manage/manageTogglesController.js @@ -3,44 +3,75 @@ const app = angular.module('app'); - app.controller('ManageTogglesController', function(ManageTogglesService, AuthService, MessageService) { + /** + * This controller manages the view that displays all features for the user. + */ + app.controller('ManageTogglesController', ['ManageTogglesService' , 'AuthService', 'MessageService' , function(ManageTogglesService, AuthService, + MessageService) { + const manageTogglesCtrl = this; manageTogglesCtrl.isLoading = false; + manageTogglesCtrl.oddFeatures = []; manageTogglesCtrl.features = []; - manageTogglesCtrl.modifiedFeatures = []; + + manageTogglesCtrl.options = [ + { + value: 'DISABLED', + name: 'DESABILITADO' + }, { + value: 'ALL', + name: 'TODOS' + }, { + value: 'ADMIN', + name: 'TESTE' + }, { + value: 'SUPER_USER', + name: 'SUPER USÁRIO' + } + ]; manageTogglesCtrl.logout = function() { AuthService.logout(); }; - manageTogglesCtrl.addModifiedFeature = function(feature) { - const featureFound = _.find(manageTogglesCtrl.modifiedFeatures, element => element.name === feature.name); + function getChangedFeatures() { + return manageTogglesCtrl.features.filter((feature, index) => { + const oddFeature = manageTogglesCtrl.oddFeatures[index]; + const isEqualMobile = oddFeature.enable_mobile === feature.enable_mobile; + const isEqualDesktop = oddFeature.enable_desktop === feature.enable_desktop; + return !isEqualMobile || !isEqualDesktop; + }); + } - if (!featureFound) { - manageTogglesCtrl.modifiedFeatures.push(feature); + manageTogglesCtrl.save = function save() { + const modifiedFeatures = getChangedFeatures(); + if (modifiedFeatures.length !== 0) { + manageTogglesCtrl.isLoading = true; + return ManageTogglesService.saveFeatures(modifiedFeatures) + .then(() => { + return loadFeatures().then(features => { + MessageService.showToast("Alterações salvas com sucesso."); + return features; + }); + }).catch(response => { + MessageService.showToast(response.msg); + }).finally(function() { + manageTogglesCtrl.isLoading = false; + }); } - }; - manageTogglesCtrl.save = function save() { - manageTogglesCtrl.isLoading = true; - const promise = ManageTogglesService.saveFeatures(manageTogglesCtrl.modifiedFeatures) - .then(response => { - MessageService.showToast("Alterações salvas com sucesso."); - return response; - }).catch(response => { - MessageService.showToast(response.msg); - }).finally(function() { - manageTogglesCtrl.isLoading = false; - }); - manageTogglesCtrl.modifiedFeatures = []; - return promise; }; - manageTogglesCtrl.$onInit = function() { + function loadFeatures() { return ManageTogglesService.getAllFeatureToggles().then(function(features) { - manageTogglesCtrl.features = features; + manageTogglesCtrl.oddFeatures = features; + manageTogglesCtrl.features = _.cloneDeep(features); return features; }); + } + + manageTogglesCtrl.$onInit = function() { + return loadFeatures(); }; - }); + }]); })(); \ No newline at end of file diff --git a/feature-toggles/manage/manageTogglesService.js b/feature-toggles/manage/manageTogglesService.js index 1dba95c8a..09d4c8933 100644 --- a/feature-toggles/manage/manageTogglesService.js +++ b/feature-toggles/manage/manageTogglesService.js @@ -3,7 +3,11 @@ const app = angular.module('app'); - app.service('ManageTogglesService', function(HttpService) { + /** + * This service is responsible for loading and changing the + * features through requests to the backend. + */ + app.service('ManageTogglesService', ['HttpService', function(HttpService) { const service = this; const URI = '/api/feature-toggles?lang=pt-br'; @@ -14,5 +18,5 @@ service.saveFeatures = function saveFeatures(features) { return HttpService.put(URI, features); }; - }); + }]); })(); \ No newline at end of file diff --git a/feature-toggles/utils/messageService.js b/feature-toggles/utils/messageService.js index 6a26686b9..219dbd4a7 100644 --- a/feature-toggles/utils/messageService.js +++ b/feature-toggles/utils/messageService.js @@ -3,9 +3,13 @@ const app = angular.module('app'); - app.service('MessageService', function($mdToast) { + app.service('MessageService', ['$mdToast', function($mdToast) { const service = this; + /** + * This function displays a small dialog containing the received message per parameter. + * @param {String} message - Message to show + */ service.showToast = function showToast(message) { $mdToast.show( $mdToast.simple() @@ -16,5 +20,5 @@ .position('bottom right') ); }; - }); + }]); })(); \ No newline at end of file From a5269970e4336c80723cd532476c08da1fc444c3 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 22 Jan 2019 10:02:10 -0300 Subject: [PATCH 055/606] Add button save in toggles --- feature-toggles/manage/manage-toggles.css | 2 +- feature-toggles/manage/manage-toggles.html | 10 +++---- .../manage/manageTogglesController.js | 29 +++++-------------- feature-toggles/manage/permission-select.html | 9 ++++++ 4 files changed, 22 insertions(+), 28 deletions(-) create mode 100644 feature-toggles/manage/permission-select.html diff --git a/feature-toggles/manage/manage-toggles.css b/feature-toggles/manage/manage-toggles.css index 2060ca896..547e1db8b 100644 --- a/feature-toggles/manage/manage-toggles.css +++ b/feature-toggles/manage/manage-toggles.css @@ -18,7 +18,7 @@ .toggle-content { display: grid; - grid-template-columns: auto 154px 154px; + grid-template-columns: auto 154px 154px 105px; grid-gap: 10px; align-items: center; } diff --git a/feature-toggles/manage/manage-toggles.html b/feature-toggles/manage/manage-toggles.html index 08d1b3646..c63fdffe3 100644 --- a/feature-toggles/manage/manage-toggles.html +++ b/feature-toggles/manage/manage-toggles.html @@ -4,7 +4,7 @@
    -

    Gerenciar features do sistema

    +

    Gerenciar funcionalidades do sistema

    @@ -22,11 +22,11 @@

    Gerenciar features do sistema

    {{option.name}} + SALVAR +
    - SALVAR -
    \ No newline at end of file diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js index 84349b8fb..1aaeb63ac 100644 --- a/feature-toggles/manage/manageTogglesController.js +++ b/feature-toggles/manage/manageTogglesController.js @@ -34,32 +34,17 @@ AuthService.logout(); }; - function getChangedFeatures() { - return manageTogglesCtrl.features.filter((feature, index) => { - const oddFeature = manageTogglesCtrl.oddFeatures[index]; - const isEqualMobile = oddFeature.enable_mobile === feature.enable_mobile; - const isEqualDesktop = oddFeature.enable_desktop === feature.enable_desktop; - return !isEqualMobile || !isEqualDesktop; - }); - } - - manageTogglesCtrl.save = function save() { - const modifiedFeatures = getChangedFeatures(); - if (modifiedFeatures.length !== 0) { - manageTogglesCtrl.isLoading = true; - return ManageTogglesService.saveFeatures(modifiedFeatures) - .then(() => { - return loadFeatures().then(features => { - MessageService.showToast("Alterações salvas com sucesso."); - return features; - }); + manageTogglesCtrl.save = function save(feature) { + feature.isLoading = true; + return ManageTogglesService.saveFeatures([feature]) + .then(response => { + MessageService.showToast("Alterações salvas com sucesso."); + return response; }).catch(response => { MessageService.showToast(response.msg); }).finally(function() { - manageTogglesCtrl.isLoading = false; + feature.isLoading = false; }); - } - }; function loadFeatures() { diff --git a/feature-toggles/manage/permission-select.html b/feature-toggles/manage/permission-select.html new file mode 100644 index 000000000..7108bdd88 --- /dev/null +++ b/feature-toggles/manage/permission-select.html @@ -0,0 +1,9 @@ + + + + DESABILITADO + TODOS + TESTE + SUPER USÁRIO + + From b491e585eacab839830a215199e71c674364637b Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 22 Jan 2019 15:02:04 -0300 Subject: [PATCH 056/606] Create permissionSelectComponent --- feature-toggles/index.html | 1 + feature-toggles/manage/manage-toggles.html | 20 +++++--------- .../manage/manageTogglesController.js | 16 ------------ feature-toggles/manage/permission-select.html | 4 +-- .../manage/permissionSelect.component.js | 26 +++++++++++++++++++ 5 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 feature-toggles/manage/permissionSelect.component.js diff --git a/feature-toggles/index.html b/feature-toggles/index.html index 1d9747d21..e8e27d673 100644 --- a/feature-toggles/index.html +++ b/feature-toggles/index.html @@ -68,5 +68,6 @@ + \ No newline at end of file diff --git a/feature-toggles/manage/manage-toggles.html b/feature-toggles/manage/manage-toggles.html index c63fdffe3..6d54efc6d 100644 --- a/feature-toggles/manage/manage-toggles.html +++ b/feature-toggles/manage/manage-toggles.html @@ -10,21 +10,13 @@

    Gerenciar funcionalidades do sistema

    {{feature.translation || feature.name}} - - - - {{option.name}} - - - - - - {{option.name}} - - + + SALVAR + md-colors="{background: 'teal-500'}" + ng-click="manageTogglesCtrl.save(feature)"> + SALVAR + diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js index 1aaeb63ac..eb4f82096 100644 --- a/feature-toggles/manage/manageTogglesController.js +++ b/feature-toggles/manage/manageTogglesController.js @@ -14,22 +14,6 @@ manageTogglesCtrl.oddFeatures = []; manageTogglesCtrl.features = []; - manageTogglesCtrl.options = [ - { - value: 'DISABLED', - name: 'DESABILITADO' - }, { - value: 'ALL', - name: 'TODOS' - }, { - value: 'ADMIN', - name: 'TESTE' - }, { - value: 'SUPER_USER', - name: 'SUPER USÁRIO' - } - ]; - manageTogglesCtrl.logout = function() { AuthService.logout(); }; diff --git a/feature-toggles/manage/permission-select.html b/feature-toggles/manage/permission-select.html index 7108bdd88..d8e12a966 100644 --- a/feature-toggles/manage/permission-select.html +++ b/feature-toggles/manage/permission-select.html @@ -1,6 +1,6 @@ - + - + DESABILITADO TODOS TESTE diff --git a/feature-toggles/manage/permissionSelect.component.js b/feature-toggles/manage/permissionSelect.component.js new file mode 100644 index 000000000..de09739de --- /dev/null +++ b/feature-toggles/manage/permissionSelect.component.js @@ -0,0 +1,26 @@ +(function() { + 'use strict'; + + const app = angular.module('app'); + + app.controller('PermissionSelectController', permissionSelectController) + .component('permissionSelect', { + templateUrl: 'app/manage/permission-select.html', + controller: "PermissionSelectController", + controllerAs: 'permissionSelectCtrl', + bindings: { + label: '@', + feature: '=', + attr: '@' + } + }); + + function permissionSelectController() { + const permissionSelectCtrl = this; + + Object.defineProperty(permissionSelectCtrl, 'enable', { + get: () => permissionSelectCtrl.feature[permissionSelectCtrl.attr], + set: value => permissionSelectCtrl.feature[permissionSelectCtrl.attr] = value + }); + } +})(); \ No newline at end of file From 0080edec6c40d1b10a3498d98bd2e88806aa66d9 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 22 Jan 2019 15:14:14 -0300 Subject: [PATCH 057/606] create states constants --- feature-toggles/app.js | 14 +++++++------- feature-toggles/auth/authService.js | 4 ++-- feature-toggles/auth/loginController.js | 6 +++--- feature-toggles/index.html | 1 + feature-toggles/utils/statesConstants.js | 10 ++++++++++ 5 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 feature-toggles/utils/statesConstants.js diff --git a/feature-toggles/app.js b/feature-toggles/app.js index 65c7ca210..6c67001be 100644 --- a/feature-toggles/app.js +++ b/feature-toggles/app.js @@ -10,7 +10,7 @@ app.config(function($mdIconProvider, $mdThemingProvider, $urlMatcherFactoryProvider, $urlRouterProvider, - $locationProvider, $stateProvider, $httpProvider) { + $locationProvider, $stateProvider, $httpProvider, STATES) { $mdIconProvider.fontSet('md', 'material-icons'); $mdThemingProvider.theme('docs-dark'); @@ -22,15 +22,15 @@ $urlMatcherFactoryProvider.caseInsensitive(true); $stateProvider - .state("singin", { - url: "/singin", + .state(STATES.SIGNIN, { + url: "/signin", views: { main: { templateUrl: "app/auth/login.html", controller: "LoginController as loginCtrl" } } - }).state("manage-features", { + }).state(STATES.MANAGE_FEATURES, { url: "/", views: { main: { @@ -97,9 +97,9 @@ /** * Auth interceptor to check if the usr is logged in, if not, redirect to login page. */ - app.run(function authInterceptor(AuthService, $transitions) { + app.run(function authInterceptor(AuthService, STATES, $transitions) { const ignored_routes = [ - "singin" + STATES.SIGNIN ]; $transitions.onBefore({ @@ -107,7 +107,7 @@ return !(_.includes(ignored_routes, state.name)) && !AuthService.isLoggedIn(); } }, function(transition) { - return transition.router.stateService.target("singin"); + return transition.router.stateService.target(STATES.SIGNIN); }); }); })(); \ No newline at end of file diff --git a/feature-toggles/auth/authService.js b/feature-toggles/auth/authService.js index 795b81bce..a8f55028e 100644 --- a/feature-toggles/auth/authService.js +++ b/feature-toggles/auth/authService.js @@ -3,7 +3,7 @@ const app = angular.module("app"); - app.service("AuthService", function AuthService($state, $window, UserService, UserFactory, MessageService) { + app.service("AuthService", function AuthService($state, $window, UserService, UserFactory, MessageService, STATES) { const service = this; const authObj = firebase.auth(); @@ -132,7 +132,7 @@ executeLogoutListeners(); - $state.go("singin"); + $state.go(STATES.SIGNIN); }; service.getCurrentUser = function getCurrentUser() { diff --git a/feature-toggles/auth/loginController.js b/feature-toggles/auth/loginController.js index 661365fe9..01b96b366 100644 --- a/feature-toggles/auth/loginController.js +++ b/feature-toggles/auth/loginController.js @@ -3,7 +3,7 @@ const app = angular.module('app'); app.controller('LoginController', function(AuthService, $state, - $stateParams, $window, MessageService) { + $stateParams, $window, MessageService, STATES) { const loginCtrl = this; loginCtrl.user = {}; @@ -57,13 +57,13 @@ if (path) { window.location.pathname = path; } else { - $state.go("manage-features"); + $state.go(STATES.MANAGE_FEATURES); } } loginCtrl.$onInit = function main() { if (AuthService.isLoggedIn()) { - $state.go("manage-features"); + $state.go(STATES.MANAGE_FEATURES); } }; }); diff --git a/feature-toggles/index.html b/feature-toggles/index.html index e8e27d673..a991fc740 100644 --- a/feature-toggles/index.html +++ b/feature-toggles/index.html @@ -57,6 +57,7 @@ + diff --git a/feature-toggles/utils/statesConstants.js b/feature-toggles/utils/statesConstants.js new file mode 100644 index 000000000..1360ccd23 --- /dev/null +++ b/feature-toggles/utils/statesConstants.js @@ -0,0 +1,10 @@ +(function() { + 'use strict'; + + const app = angular.module('app'); + + app.constant('STATES', { + MANAGE_FEATURES: "manage-features", + SIGNIN: 'signin' + }); +})(); \ No newline at end of file From d225e85d9a651c640d23cfbe8c5eec569a96816a Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 22 Jan 2019 15:29:27 -0300 Subject: [PATCH 058/606] Move style to css file --- feature-toggles/manage/manage-toggles.css | 17 +++++++++++++++++ feature-toggles/manage/manage-toggles.html | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/feature-toggles/manage/manage-toggles.css b/feature-toggles/manage/manage-toggles.css index 547e1db8b..fd35ccb9f 100644 --- a/feature-toggles/manage/manage-toggles.css +++ b/feature-toggles/manage/manage-toggles.css @@ -1,3 +1,9 @@ +.navbar-content { + height: 100%; + display: grid; + grid-template-rows: auto 1fr; +} + .content { display: grid; padding: 16px; @@ -16,6 +22,17 @@ color: white; } +#toggles-box { + max-height: 100%; + overflow-y: auto; +} + +#toggles-box > div { + display: grid; + justify-content: center; + margin: 16px; +} + .toggle-content { display: grid; grid-template-columns: auto 154px 154px 105px; diff --git a/feature-toggles/manage/manage-toggles.html b/feature-toggles/manage/manage-toggles.html index 6d54efc6d..592f260c6 100644 --- a/feature-toggles/manage/manage-toggles.html +++ b/feature-toggles/manage/manage-toggles.html @@ -1,11 +1,11 @@ -
    +
    -
    +

    Gerenciar funcionalidades do sistema

    -
    +
    {{feature.translation || feature.name}} From 9d7ee97f4ce7ae9e86489ae7349d3f6f98516486 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 22 Jan 2019 15:51:28 -0300 Subject: [PATCH 059/606] add jsdoc of methods --- feature-toggles/manage/manageTogglesController.js | 13 +++++++++++++ feature-toggles/manage/manageTogglesService.js | 7 +++++++ feature-toggles/user/userFactory.js | 13 ++++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js index eb4f82096..dd9eff31f 100644 --- a/feature-toggles/manage/manageTogglesController.js +++ b/feature-toggles/manage/manageTogglesController.js @@ -14,10 +14,17 @@ manageTogglesCtrl.oddFeatures = []; manageTogglesCtrl.features = []; + /** + * Function to sign out of application. + */ manageTogglesCtrl.logout = function() { AuthService.logout(); }; + /** + * This function save the feature modifications. + * @param {Object} feature - Feature to be saved. + */ manageTogglesCtrl.save = function save(feature) { feature.isLoading = true; return ManageTogglesService.saveFeatures([feature]) @@ -31,6 +38,9 @@ }); }; + /** + * Function to get all features from backend. + */ function loadFeatures() { return ManageTogglesService.getAllFeatureToggles().then(function(features) { manageTogglesCtrl.oddFeatures = features; @@ -39,6 +49,9 @@ }); } + /** + * This function initialize the controller by loading all features. + */ manageTogglesCtrl.$onInit = function() { return loadFeatures(); }; diff --git a/feature-toggles/manage/manageTogglesService.js b/feature-toggles/manage/manageTogglesService.js index 09d4c8933..28a941d38 100644 --- a/feature-toggles/manage/manageTogglesService.js +++ b/feature-toggles/manage/manageTogglesService.js @@ -11,10 +11,17 @@ const service = this; const URI = '/api/feature-toggles?lang=pt-br'; + /** + * Function to get all features from backend. + */ service.getAllFeatureToggles = function getAllFeatureToggles() { return HttpService.get(URI); }; + /** + * Function to save one or more features. + * @param {Object} features - list of features to be save. + */ service.saveFeatures = function saveFeatures(features) { return HttpService.put(URI, features); }; diff --git a/feature-toggles/user/userFactory.js b/feature-toggles/user/userFactory.js index 8120b0315..2f2555827 100644 --- a/feature-toggles/user/userFactory.js +++ b/feature-toggles/user/userFactory.js @@ -5,6 +5,10 @@ app.factory('UserFactory', () => { + /** + * User model. + * @param {*} data - data of user. + */ function User(data) { data = data || {}; _.extend(this, data); @@ -14,6 +18,10 @@ } } + /** + * This function modifies the user's current institution. + * @param {Object} institution - institution to be change. + */ User.prototype.changeInstitution = function changeInstitution(institution) { if (this.institutions && this.institutions.length > 0) { institution = institution || this.institutions[0]; @@ -22,7 +30,10 @@ } }; - + /** + * This function checks whether the user has the permission passed by parameter. + * @param {String} permissionType - permission to be checked. + */ User.prototype.hasPermission = function hasPermission(permissionType) { return permissionType in this.permissions; }; From 23a368ff6de7b7ff89e84d3d3615efd036dfce89 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 22 Jan 2019 15:59:43 -0300 Subject: [PATCH 060/606] Add catch in promise to load features --- feature-toggles/manage/manageTogglesController.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js index dd9eff31f..e7d3d44c3 100644 --- a/feature-toggles/manage/manageTogglesController.js +++ b/feature-toggles/manage/manageTogglesController.js @@ -46,6 +46,8 @@ manageTogglesCtrl.oddFeatures = features; manageTogglesCtrl.features = _.cloneDeep(features); return features; + }).catch(response => { + MessageService.showToast(response.data.msg); }); } From d1a87b550a4ef466ea5a29eb7a9f488e42961198 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 22 Jan 2019 16:07:58 -0300 Subject: [PATCH 061/606] Remove unnecessary variable --- feature-toggles/manage/manageTogglesController.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js index e7d3d44c3..371eaa067 100644 --- a/feature-toggles/manage/manageTogglesController.js +++ b/feature-toggles/manage/manageTogglesController.js @@ -11,7 +11,6 @@ const manageTogglesCtrl = this; manageTogglesCtrl.isLoading = false; - manageTogglesCtrl.oddFeatures = []; manageTogglesCtrl.features = []; /** @@ -43,8 +42,7 @@ */ function loadFeatures() { return ManageTogglesService.getAllFeatureToggles().then(function(features) { - manageTogglesCtrl.oddFeatures = features; - manageTogglesCtrl.features = _.cloneDeep(features); + manageTogglesCtrl.features = features; return features; }).catch(response => { MessageService.showToast(response.data.msg); From 62f599bd007f83ec6c9d30547f6201b75bded09c Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 22 Jan 2019 16:29:33 -0300 Subject: [PATCH 062/606] Change the put handler of feature toggles --- backend/handlers/feature_toggle_handler.py | 6 +++--- backend/models/feature.py | 12 +++++++++--- feature-toggles/manage/manageTogglesController.js | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/backend/handlers/feature_toggle_handler.py b/backend/handlers/feature_toggle_handler.py index 95b13c950..2ca87cd10 100644 --- a/backend/handlers/feature_toggle_handler.py +++ b/backend/handlers/feature_toggle_handler.py @@ -57,6 +57,6 @@ def put(self, user): Utils._assert(not (super_user == user.key), "User not allowed to modify features!", NotAuthorizedException) - features_body = json.loads(self.request.body) - features = Feature.set_visibility(features_body) - self.response.write(to_json(features)) + feature_body = json.loads(self.request.body) + feature = Feature.set_visibility(feature_body) + self.response.write(json.dumps(feature.make())) diff --git a/backend/models/feature.py b/backend/models/feature.py index ed4aa8aaa..784221460 100644 --- a/backend/models/feature.py +++ b/backend/models/feature.py @@ -34,7 +34,7 @@ def create(name, translation_dict, enable_mobile="ALL", enable_desktop="ALL"): return feature @staticmethod - def set_visibility(features_list): + def set_visibility(feature_dict): """ Method to enable or disable multiple features. @@ -42,6 +42,7 @@ def set_visibility(features_list): features_list -- list of dictionaries containing the properties of the features model to be modified. """ + """ features_dict = { feature['name']: { 'enable_mobile': feature['enable_mobile'], @@ -55,8 +56,13 @@ def set_visibility(features_list): feature.enable_desktop = features_dict[feature.name]['enable_desktop'] feature.enable_mobile = features_dict[feature.name]['enable_mobile'] - ndb.put_multi(features) - return features + ndb.put_multi(features)""" + + feature = Feature.get_feature(feature_dict.get('name')) + feature.enable_desktop = feature_dict['enable_desktop'] + feature.enable_mobile = feature_dict['enable_mobile'] + feature.put() + return feature @staticmethod def get_all_features(): diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js index 371eaa067..cc501475a 100644 --- a/feature-toggles/manage/manageTogglesController.js +++ b/feature-toggles/manage/manageTogglesController.js @@ -26,12 +26,12 @@ */ manageTogglesCtrl.save = function save(feature) { feature.isLoading = true; - return ManageTogglesService.saveFeatures([feature]) + return ManageTogglesService.saveFeatures(feature) .then(response => { MessageService.showToast("Alterações salvas com sucesso."); return response; }).catch(response => { - MessageService.showToast(response.msg); + MessageService.showToast(response.data.msg); }).finally(function() { feature.isLoading = false; }); From 7b91b1b0e62aa0486992cfd0a676d3d51cc5e5eb Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 22 Jan 2019 16:35:11 -0300 Subject: [PATCH 063/606] fix tests --- .../feature_toggle_handler_test.py | 5 +++-- backend/test/model_test/feature_test.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py b/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py index 144014cbd..ad99120c6 100644 --- a/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py +++ b/backend/test/feature_toggle_handler_tests/feature_toggle_handler_test.py @@ -78,7 +78,8 @@ def test_put(self, verify_token): feature['enable_mobile'] = 'DISABLED' other_feature['enable_desktop'] = 'DISABLED' - self.testapp.put_json('/api/feature-toggles', [feature, other_feature]).json + self.testapp.put_json('/api/feature-toggles', feature) + self.testapp.put_json('/api/feature-toggles', other_feature) self.feature = self.feature.key.get() self.other_feature = self.other_feature.key.get() @@ -91,7 +92,7 @@ def test_put(self, verify_token): verify_token._mock_return_value = {'email': user.email[0]} with self.assertRaises(Exception) as raises_context: - self.testapp.put_json('/api/feature-toggles', [feature, other_feature]).json + self.testapp.put_json('/api/feature-toggles', feature) exception_message = self.get_message_exception(str(raises_context.exception)) diff --git a/backend/test/model_test/feature_test.py b/backend/test/model_test/feature_test.py index 7573e2425..610b814fd 100644 --- a/backend/test/model_test/feature_test.py +++ b/backend/test/model_test/feature_test.py @@ -53,7 +53,7 @@ def test_set_visibility(self): 'enable_desktop': 'ADMIN' } - Feature.set_visibility([feature_dict]) + Feature.set_visibility(feature_dict) feature = Feature.get_feature('feature-test') From d91ea98161ea9f66ab3dfa6d8c4186adcae3f6ed Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 22 Jan 2019 16:50:57 -0300 Subject: [PATCH 064/606] fix docstring and jsdoc --- backend/models/feature.py | 20 ++----------------- .../manage/manageTogglesController.js | 2 +- .../manage/manageTogglesService.js | 8 ++++---- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/backend/models/feature.py b/backend/models/feature.py index 784221460..118b65d52 100644 --- a/backend/models/feature.py +++ b/backend/models/feature.py @@ -36,28 +36,12 @@ def create(name, translation_dict, enable_mobile="ALL", enable_desktop="ALL"): @staticmethod def set_visibility(feature_dict): """ - Method to enable or disable multiple features. + Method to enable or disable feature. Params: - features_list -- list of dictionaries containing the properties of the features model to be modified. + features_dict -- dictionary containing the properties of the feature model to be modified. """ - """ - features_dict = { - feature['name']: { - 'enable_mobile': feature['enable_mobile'], - 'enable_desktop': feature['enable_desktop'] - } for feature in features_list - } - - features = Feature.query(Feature.name.IN(features_dict.keys())).fetch() - - for feature in features: - feature.enable_desktop = features_dict[feature.name]['enable_desktop'] - feature.enable_mobile = features_dict[feature.name]['enable_mobile'] - - ndb.put_multi(features)""" - feature = Feature.get_feature(feature_dict.get('name')) feature.enable_desktop = feature_dict['enable_desktop'] feature.enable_mobile = feature_dict['enable_mobile'] diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js index cc501475a..072509390 100644 --- a/feature-toggles/manage/manageTogglesController.js +++ b/feature-toggles/manage/manageTogglesController.js @@ -26,7 +26,7 @@ */ manageTogglesCtrl.save = function save(feature) { feature.isLoading = true; - return ManageTogglesService.saveFeatures(feature) + return ManageTogglesService.saveFeature(feature) .then(response => { MessageService.showToast("Alterações salvas com sucesso."); return response; diff --git a/feature-toggles/manage/manageTogglesService.js b/feature-toggles/manage/manageTogglesService.js index 28a941d38..876d8d33c 100644 --- a/feature-toggles/manage/manageTogglesService.js +++ b/feature-toggles/manage/manageTogglesService.js @@ -19,11 +19,11 @@ }; /** - * Function to save one or more features. - * @param {Object} features - list of features to be save. + * Function to save feature. + * @param {Object} features - features to be save. */ - service.saveFeatures = function saveFeatures(features) { - return HttpService.put(URI, features); + service.saveFeature = function saveFeature(feature) { + return HttpService.put(URI, feature); }; }]); })(); \ No newline at end of file From 8812476ea3f112dbe4b74a0873fa2b696b62d162 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 22 Jan 2019 16:53:14 -0300 Subject: [PATCH 065/606] fix jsdoc --- feature-toggles/manage/manageTogglesService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature-toggles/manage/manageTogglesService.js b/feature-toggles/manage/manageTogglesService.js index 876d8d33c..a120b1e83 100644 --- a/feature-toggles/manage/manageTogglesService.js +++ b/feature-toggles/manage/manageTogglesService.js @@ -20,7 +20,7 @@ /** * Function to save feature. - * @param {Object} features - features to be save. + * @param {Object} feature - feature to be save. */ service.saveFeature = function saveFeature(feature) { return HttpService.put(URI, feature); From 6276f8a043665114920bd60e22ba166aac163764 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 23 Jan 2019 10:10:55 -0300 Subject: [PATCH 066/606] Add media query to create responsive layout --- feature-toggles/index.html | 1 + feature-toggles/manage/manage-toggles.css | 64 ++++++++++++++++++- feature-toggles/manage/manage-toggles.html | 11 ++-- feature-toggles/manage/permission-select.css | 9 +++ feature-toggles/manage/permission-select.html | 2 +- 5 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 feature-toggles/manage/permission-select.css diff --git a/feature-toggles/index.html b/feature-toggles/index.html index a991fc740..856d9c919 100644 --- a/feature-toggles/index.html +++ b/feature-toggles/index.html @@ -17,6 +17,7 @@ + diff --git a/feature-toggles/manage/manage-toggles.css b/feature-toggles/manage/manage-toggles.css index fd35ccb9f..0fd087d93 100644 --- a/feature-toggles/manage/manage-toggles.css +++ b/feature-toggles/manage/manage-toggles.css @@ -22,6 +22,11 @@ color: white; } +.large-title, .small-title { + text-align: center; + padding: 8px; +} + #toggles-box { max-height: 100%; overflow-y: auto; @@ -36,10 +41,67 @@ .toggle-content { display: grid; grid-template-columns: auto 154px 154px 105px; - grid-gap: 10px; + grid-column-gap: 10px; + grid-template-areas: + "name mobile desktop save"; align-items: center; } .toggle-content > md-select { margin: 16px 0; +} + +#name { + grid-area: name; +} + +#mobile { + grid-area: mobile; +} + +#desktop { + grid-area: desktop; +} + +#save { + grid-area: save; +} + +@media screen and (max-width: 599px) { + + #toggles-box > div { + justify-content: stretch; + } + + .toggle-content { + grid-template-columns: minmax(140px, 1fr) minmax(140px, 1fr); + grid-template-rows: minmax(40px, 1fr); + grid-template-areas: + "name name" + "mobile desktop" + "save save"; + justify-items: center; + } + + #name { + text-align: center; + } + + #save { + justify-self: stretch; + } + + .large-title { + display: none + } + + #title { + text-align: center; + } +} + +@media screen and (min-width: 600px) { + .small-title { + display: none; + } } \ No newline at end of file diff --git a/feature-toggles/manage/manage-toggles.html b/feature-toggles/manage/manage-toggles.html index 592f260c6..7bec9b569 100644 --- a/feature-toggles/manage/manage-toggles.html +++ b/feature-toggles/manage/manage-toggles.html @@ -4,15 +4,16 @@
    -

    Gerenciar funcionalidades do sistema

    +

    Gerenciar funcionalidades do sistema

    +

    Gerenciar funcionalidades do sistema

    - + {{feature.translation || feature.name}} - - - + + SALVAR diff --git a/feature-toggles/manage/permission-select.css b/feature-toggles/manage/permission-select.css new file mode 100644 index 000000000..c994b4218 --- /dev/null +++ b/feature-toggles/manage/permission-select.css @@ -0,0 +1,9 @@ +.select-container { + min-width: 140px; +} + +@media screen and (max-width: 599px) { + .select-container { + margin-bottom: 0; + } +} \ No newline at end of file diff --git a/feature-toggles/manage/permission-select.html b/feature-toggles/manage/permission-select.html index d8e12a966..9af177fa9 100644 --- a/feature-toggles/manage/permission-select.html +++ b/feature-toggles/manage/permission-select.html @@ -1,4 +1,4 @@ - + DESABILITADO From 06da7698aa6b74a2a42df214e55b30716c579b0c Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 23 Jan 2019 11:07:39 -0300 Subject: [PATCH 067/606] Add id save in load-circle --- feature-toggles/manage/manage-toggles.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature-toggles/manage/manage-toggles.html b/feature-toggles/manage/manage-toggles.html index 7bec9b569..46fd48796 100644 --- a/feature-toggles/manage/manage-toggles.html +++ b/feature-toggles/manage/manage-toggles.html @@ -18,7 +18,7 @@

    Gerenciar funcionalidades do sistema

    ng-click="manageTogglesCtrl.save(feature)"> SALVAR     - +
    From 35bdc4f6138a04bbdd279bf49c596d4118a29017 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 23 Jan 2019 11:41:11 -0300 Subject: [PATCH 068/606] fix issues --- feature-toggles/index.html | 2 +- feature-toggles/manage/permission-select.html | 2 +- .../manage/{permission-select.css => permission_select.css} | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) rename feature-toggles/manage/{permission-select.css => permission_select.css} (89%) diff --git a/feature-toggles/index.html b/feature-toggles/index.html index 856d9c919..b0b893bde 100644 --- a/feature-toggles/index.html +++ b/feature-toggles/index.html @@ -17,7 +17,7 @@ - + diff --git a/feature-toggles/manage/permission-select.html b/feature-toggles/manage/permission-select.html index 9af177fa9..72a28dd55 100644 --- a/feature-toggles/manage/permission-select.html +++ b/feature-toggles/manage/permission-select.html @@ -1,4 +1,4 @@ - + DESABILITADO diff --git a/feature-toggles/manage/permission-select.css b/feature-toggles/manage/permission_select.css similarity index 89% rename from feature-toggles/manage/permission-select.css rename to feature-toggles/manage/permission_select.css index c994b4218..917093e55 100644 --- a/feature-toggles/manage/permission-select.css +++ b/feature-toggles/manage/permission_select.css @@ -1,5 +1,6 @@ .select-container { min-width: 140px; + width: 100%; } @media screen and (max-width: 599px) { From 96cde1f3313fc94172183afff598db80fa2fb0c4 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 28 Jan 2019 16:27:19 -0300 Subject: [PATCH 069/606] Create script to generate config file --- generate_config.sh | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 generate_config.sh diff --git a/generate_config.sh b/generate_config.sh new file mode 100755 index 000000000..5a2a7d046 --- /dev/null +++ b/generate_config.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +function create_config { + if [ $# -lt 6 ] ; then + echo "This function requires 6 arguments!"; + exit 1; + fi + + config="\"use strict\"; + +var Config = { + BACKEND_URL: '$1', + LANDINGPAGE_URL: '$2', + SUPPORT_URL: '$3', + FRONTEND_URL: '$4', + FEATURE_URL: '$5', + APP_VERSION: '$6' +};" + + echo "$config" +} + + +function create_local_config { + config_list=( + 'http://localhost:8082' #BACKEND + 'http://localhost:8080' #LANDING + 'http://localhost:8083' #SUPPORT + 'http://localhost:8081' #FRONTEND + 'http://localhost:8084' #FEATURE + 'refact-ecis-script' #APP VERSION + ) + create_config ${config_list[@]} +} +create_local_config From dd0e727488565d0fbfe69cb7d1db9a34f164516e Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 28 Jan 2019 17:48:08 -0300 Subject: [PATCH 070/606] Create configs --- generate_config.sh | 60 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/generate_config.sh b/generate_config.sh index 5a2a7d046..c030112a5 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -1,5 +1,33 @@ #!/bin/bash + +config_local_list=( + "http://localhost:8082" #BACKEND + "http://localhost:8080" #LANDING + "http://localhost:8083" #SUPPORT + "http://localhost:8081" #FRONTEND + "http://localhost:8084" #FEATURE +); + +APP_DOMAIN="development-cis.appspot.com"; +config_development_list=( + "https://backend-dot-$APP_DOMAIN" #BACKEND + "https://$APP_DOMAIN" #LANDING + "https://support-dot-$APP_DOMAIN" #SUPPORT + "https://frontend-dot-$APP_DOMAIN" #FRONTEND + "https://feature-dot-$APP_DOMAIN" #FEATURE +); + +APP_DOMAIN="plataformacis.org"; +config_production_list=( + "https://backend-dot-eciis-splab.appspot.com" #BACKEND + "https://$APP_DOMAIN" #LANDING + "https://support.$APP_DOMAIN" #SUPPORT + "https://frontend.$APP_DOMAIN" #FRONTEND + "https://feature.$APP_DOMAIN" #FEATURE +); + + function create_config { if [ $# -lt 6 ] ; then echo "This function requires 6 arguments!"; @@ -21,15 +49,31 @@ var Config = { } -function create_local_config { +function generate_config { + app_version=$2; + + case $1 in + local) + config_list=${config_local_list[@]}; + ;; + dev) + config_list=${config_development_list[@]}; + ;; + prod) + config_list=${config_production_list[@]}; + ;; + *) + echo "Invalid option!"; + exit 1; + ;; + esac + config_list=( - 'http://localhost:8082' #BACKEND - 'http://localhost:8080' #LANDING - 'http://localhost:8083' #SUPPORT - 'http://localhost:8081' #FRONTEND - 'http://localhost:8084' #FEATURE - 'refact-ecis-script' #APP VERSION + ${config_list[@]} + $app_version ) + create_config ${config_list[@]} } -create_local_config + +generate_config prod "minha-versao" From 524566b1a4f1fdc554c738322ad951e2a4e555d8 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 29 Jan 2019 09:30:17 -0300 Subject: [PATCH 071/606] Create function to generate config file --- generate_config.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/generate_config.sh b/generate_config.sh index c030112a5..694149ebe 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -49,7 +49,7 @@ var Config = { } -function generate_config { +function generate_config_file { app_version=$2; case $1 in @@ -73,7 +73,11 @@ function generate_config { $app_version ) - create_config ${config_list[@]} + config=$(create_config ${config_list[@]}); + + for file in ${@:2} ; do + echo "$config" > $file; + done } -generate_config prod "minha-versao" +generate_config_file dev "minha-versao" a.txt From 6c545c1c59d450604e5930f723edf90a20609090 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 30 Jan 2019 10:04:13 -0300 Subject: [PATCH 072/606] Use function generate_config_file to create file --- ecis | 65 +++++++++++++++++++++++++++++----------------- generate_config.sh | 21 +++++++++++---- 2 files changed, 57 insertions(+), 29 deletions(-) diff --git a/ecis b/ecis index de613930d..36579033a 100755 --- a/ecis +++ b/ecis @@ -7,6 +7,9 @@ green=$(tput setaf 2) reset=$(tput sgr0) # ---------------------------- +# import generate_config_file function +source generate_config.sh + SYS_URL='http://localhost:8080' APP_YAML=app.yaml @@ -190,7 +193,7 @@ case "$1" in run) APP_VERSION=$(git branch | grep "*" | awk '{print $2}') set_cache_suffix_sw $APP_VERSION - set_app_version_config $APP_VERSION + #set_app_version_config $APP_VERSION echo "=========== Cleaning Environment ===========" rm -rf $PY_ENV @@ -223,11 +226,13 @@ case "$1" in setup_firebase_config development - set_backend_url local $BACKEND_LOCAL - set_landingpage_url local $LANDINGPAGE_LOCAL - set_support_url local $SUPPORT_LOCAL - set_frontend_url local $FRONTEND_LOCAL - set_feature_url local $FEATURE_LOCAL + #set_backend_url local $BACKEND_LOCAL + #set_landingpage_url local $LANDINGPAGE_LOCAL + #set_support_url local $SUPPORT_LOCAL + #set_frontend_url local $FRONTEND_LOCAL + #set_feature_url local $FEATURE_LOCAL + + generate_config_file local $APP_VERSION $FRONTEND_CONFIG_FILE $LANDINGPAGE_CONFIG_FILE $SUPPORT_CONFIG_FILE $FEATURE_CONFIG_FILE if [[ -n $2 ]] && [ $2 = "--enable_datastore_emulator" ] ; then gcloud beta emulators datastore start --host-port=0.0.0.0:8586 & @@ -296,11 +301,11 @@ case "$1" in if [ "$NEW_APP_VERSION" != "" ]; then APP_VERSION=$NEW_APP_VERSION fi - git checkout tags/"$APP_VERSION" - catch_error $? "Git checked out to tag $APP_VERSION" + #git checkout tags/"$APP_VERSION" + #catch_error $? "Git checked out to tag $APP_VERSION" set_cache_suffix_sw $APP_VERSION - set_app_version_config $APP_VERSION + #set_app_version_config $APP_VERSION echo "${bold}>> Select the application to deploy:${_bold}" options=("development-cis" "eciis-splab" "Other") @@ -308,6 +313,7 @@ case "$1" in do case $opt in "development-cis") + ENV="dev" APP_NAME="development-cis" SUPPORT_DOMAIN="support-dot-$APP_NAME.appspot.com" FRONTEND_DOMAIN="frontend-dot-$APP_NAME.appspot.com" @@ -315,6 +321,7 @@ case "$1" in break ;; "eciis-splab") + ENV="prod" APP_NAME="eciis-splab" SUPPORT_DOMAIN="support.plataformacis.org" FRONTEND_DOMAIN="frontend.plataformacis.org" @@ -360,32 +367,42 @@ case "$1" in if [ ! -z $2 ]; then version=$2 - url=$version"."$BACKEND_DOMAIN - set_backend_url deploy $url + #url=$version"."$BACKEND_DOMAIN + #set_backend_url deploy $url + + #url=$version"."$DOMAIN + #set_landingpage_url deploy $url - url=$version"."$DOMAIN - set_landingpage_url deploy $url + #url=$version"."$SUPPORT_DOMAIN + #set_support_url deploy $url - url=$version"."$SUPPORT_DOMAIN - set_support_url deploy $url + #url=$version"."$FRONTEND_DOMAIN + #set_frontend_url deploy $url - url=$version"."$FRONTEND_DOMAIN - set_frontend_url deploy $url + #url=$version"."$FEATURE_DOMAIN + #set_frontend_url deploy $url - url=$version"."$FEATURE_DOMAIN - set_frontend_url deploy $url + urls=( + $version"."$BACKEND_DOMAIN + $version"."$DOMAIN + $version"."$SUPPORT_DOMAIN + $version"."$FRONTEND_DOMAIN + $version"."$FEATURE_DOMAIN + ) + generate_config_file_with_urls $APP_VERSION ${urls[@]} $FRONTEND_CONFIG_FILE $LANDINGPAGE_CONFIG_FILE $SUPPORT_CONFIG_FILE $FEATURE_CONFIG_FILE if [ ! -z $3 ]; then # Especified one or more yaml configuration files gcloud app deploy --version $version --no-promote $3 else gcloud app deploy --version $version --no-promote $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $FEATURE_YAML $WORKER_YAML queue.yaml fi else - set_backend_url deploy $BACKEND_DOMAIN - set_landingpage_url deploy $DOMAIN - set_support_url deploy $SUPPORT_DOMAIN - set_frontend_url deploy $FRONTEND_DOMAIN - set_frontend_url deploy $FEATURE_DOMAIN + #set_backend_url deploy $BACKEND_DOMAIN + #set_landingpage_url deploy $DOMAIN + #set_support_url deploy $SUPPORT_DOMAIN + #set_frontend_url deploy $FRONTEND_DOMAIN + #set_frontend_url deploy $FEATURE_DOMAIN + generate_config_file $ENV $APP_VERSION $FRONTEND_CONFIG_FILE $LANDINGPAGE_CONFIG_FILE $SUPPORT_CONFIG_FILE $FEATURE_CONFIG_FILE gcloud app deploy $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $FEATURE_YAML $WORKER_YAML fi diff --git a/generate_config.sh b/generate_config.sh index 694149ebe..3a43e93d9 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -51,7 +51,8 @@ var Config = { function generate_config_file { app_version=$2; - + config_list=(); + case $1 in local) config_list=${config_local_list[@]}; @@ -71,13 +72,23 @@ function generate_config_file { config_list=( ${config_list[@]} $app_version - ) - + ); + echo "${config_list[@]}" config=$(create_config ${config_list[@]}); - for file in ${@:2} ; do + for file in ${@:3} ; do echo "$config" > $file; done } -generate_config_file dev "minha-versao" a.txt +function generate_config_file_with_urls { + app_version=$1; + config_list=(${@:2:5} $app_version); + config=$(create_config ${config_list[@]}); + files=${@:7}; + + echo ${config_list[@]} + for file in ${files[@]} ; do + echo "$config" > $file; + done +} From 5938c946a8b6d4751cbc6eaf51c6f15c9ab3daea Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 30 Jan 2019 10:10:55 -0300 Subject: [PATCH 073/606] Remove unnecessary lines --- ecis | 113 ++--------------------------------------------------------- 1 file changed, 3 insertions(+), 110 deletions(-) diff --git a/ecis b/ecis index 36579033a..bc3948420 100755 --- a/ecis +++ b/ecis @@ -7,7 +7,7 @@ green=$(tput setaf 2) reset=$(tput sgr0) # ---------------------------- -# import generate_config_file function +# import generate_config_file and generate_config_file_with_urls functions source generate_config.sh SYS_URL='http://localhost:8080' @@ -62,85 +62,6 @@ function setup_app_version { catch_error $? "Setup APP VERSION with success" } -function set_service_url { - case "$1" in - local) - echo "http://$2"; - ;; - deploy) - echo "https://$2" - ;; - *) echo "inválid option"; exit 1; - ;; - esac -} - -function set_config_file { - line=$1; - service=$2; - url=$3; - service_name=$4; - - sed -i "$line s|.*| $service: '$url',|" $FRONTEND_CONFIG_FILE - sed -i "$line s|.*| $service: '$url',|" $SUPPORT_CONFIG_FILE - sed -i "$line s|.*| $service: '$url',|" $LANDINGPAGE_CONFIG_FILE - sed -i "$line s|.*| $service: '$url',|" $FEATURE_CONFIG_FILE - - catch_error $? "Frontend will use ${bold}$url${_bold} as $service_name." - catch_error $? "Support will use ${bold}$url${_bold} as $service_name." -} - -function set_backend_url { - url=$(set_service_url $1 $2); - service="BACKEND_URL"; - line=4; - service_name="backend"; - set_config_file $line $service $url $service_name; -} - -function set_landingpage_url { - url=$(set_service_url $1 $2); - service="LANDINGPAGE_URL"; - line=5; - service_name="landing page"; - set_config_file $line $service $url $service_name; -} - -function set_support_url { - url=$(set_service_url $1 $2); - service="SUPPORT_URL"; - line=6; - service_name="support"; - set_config_file $line $service $url $service_name; -} - -function set_frontend_url { - url=$(set_service_url $1 $2); - service="FRONTEND_URL"; - line=7; - service_name="frontend"; - set_config_file $line $service $url $service_name; -} - -function set_feature_url { - url=$(set_service_url $1 $2); - service="FEATURE_URL"; - line=8; - service_name="feature"; - set_config_file $line $service $url $service_name; -} - -function set_app_version_config { - sed -i "9s|.*| APP_VERSION: '$1'|" $FRONTEND_CONFIG_FILE - catch_error $? "APP VERSION on Frontend $1" - sed -i "9s|.*| APP_VERSION: '$1'|" $SUPPORT_CONFIG_FILE - catch_error $? "APP VERSION on Support $1" - sed -i "9s|.*| APP_VERSION: '$1'|" $LANDINGPAGE_CONFIG_FILE - catch_error $? "APP VERSION on LandingPage $1" - sed -i "9s|.*| APP_VERSION: '$1'|" $FEATURE_CONFIG_FILE - catch_error $? "APP VERSION on Feature $1" -} - function set_cache_suffix_sw { sed -i "10s|.*| const CACHE_SUFIX = '$1';|" $SW_FILE catch_error $? "CACHE_SUFIX on SW $1" @@ -193,7 +114,6 @@ case "$1" in run) APP_VERSION=$(git branch | grep "*" | awk '{print $2}') set_cache_suffix_sw $APP_VERSION - #set_app_version_config $APP_VERSION echo "=========== Cleaning Environment ===========" rm -rf $PY_ENV @@ -226,12 +146,6 @@ case "$1" in setup_firebase_config development - #set_backend_url local $BACKEND_LOCAL - #set_landingpage_url local $LANDINGPAGE_LOCAL - #set_support_url local $SUPPORT_LOCAL - #set_frontend_url local $FRONTEND_LOCAL - #set_feature_url local $FEATURE_LOCAL - generate_config_file local $APP_VERSION $FRONTEND_CONFIG_FILE $LANDINGPAGE_CONFIG_FILE $SUPPORT_CONFIG_FILE $FEATURE_CONFIG_FILE if [[ -n $2 ]] && [ $2 = "--enable_datastore_emulator" ] ; then @@ -301,11 +215,10 @@ case "$1" in if [ "$NEW_APP_VERSION" != "" ]; then APP_VERSION=$NEW_APP_VERSION fi - #git checkout tags/"$APP_VERSION" - #catch_error $? "Git checked out to tag $APP_VERSION" + git checkout tags/"$APP_VERSION" + catch_error $? "Git checked out to tag $APP_VERSION" set_cache_suffix_sw $APP_VERSION - #set_app_version_config $APP_VERSION echo "${bold}>> Select the application to deploy:${_bold}" options=("development-cis" "eciis-splab" "Other") @@ -367,21 +280,6 @@ case "$1" in if [ ! -z $2 ]; then version=$2 - #url=$version"."$BACKEND_DOMAIN - #set_backend_url deploy $url - - #url=$version"."$DOMAIN - #set_landingpage_url deploy $url - - #url=$version"."$SUPPORT_DOMAIN - #set_support_url deploy $url - - #url=$version"."$FRONTEND_DOMAIN - #set_frontend_url deploy $url - - #url=$version"."$FEATURE_DOMAIN - #set_frontend_url deploy $url - urls=( $version"."$BACKEND_DOMAIN $version"."$DOMAIN @@ -397,11 +295,6 @@ case "$1" in gcloud app deploy --version $version --no-promote $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $FEATURE_YAML $WORKER_YAML queue.yaml fi else - #set_backend_url deploy $BACKEND_DOMAIN - #set_landingpage_url deploy $DOMAIN - #set_support_url deploy $SUPPORT_DOMAIN - #set_frontend_url deploy $FRONTEND_DOMAIN - #set_frontend_url deploy $FEATURE_DOMAIN generate_config_file $ENV $APP_VERSION $FRONTEND_CONFIG_FILE $LANDINGPAGE_CONFIG_FILE $SUPPORT_CONFIG_FILE $FEATURE_CONFIG_FILE gcloud app deploy $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $FEATURE_YAML $WORKER_YAML fi From fc75255ba0c5cd4cba364f44f1e60d21786aa616 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 30 Jan 2019 10:27:18 -0300 Subject: [PATCH 074/606] Create config file list --- ecis | 24 ++++++++++-------------- generate_config.sh | 1 - 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/ecis b/ecis index bc3948420..b7a75f3b7 100755 --- a/ecis +++ b/ecis @@ -19,20 +19,16 @@ WORKER_YAML=backend/worker.yaml SUPPORT_YAML=support/support.yaml FEATURE_YAML=feature-toggles/feature.yaml -LANDINGPAGE_LOCAL="localhost:8080" -FRONTEND_LOCAL="localhost:8081" -BACKEND_LOCAL="localhost:8082" -SUPPORT_LOCAL="localhost:8083" -FEATURE_LOCAL="localhost:8084" +config_files=( + "frontend/config.js" + "support/config.js" + "landing/config.js" + "feature-toggles/config.js" +); - -FRONTEND_CONFIG_FILE="frontend/config.js" -SUPPORT_CONFIG_FILE="support/config.js" -LANDINGPAGE_CONFIG_FILE="landing/config.js" -FEATURE_CONFIG_FILE="feature-toggles/config.js" SW_FILE="frontend/sw.js" -git update-index --skip-worktree $FRONTEND_CONFIG_FILE $SUPPORT_CONFIG_FILE $LANDINGPAGE_CONFIG_FILE $FEATURE_CONFIG_FILE +git update-index --skip-worktree ${config_files[@]} PY_ENV=backend/py_env @@ -146,7 +142,7 @@ case "$1" in setup_firebase_config development - generate_config_file local $APP_VERSION $FRONTEND_CONFIG_FILE $LANDINGPAGE_CONFIG_FILE $SUPPORT_CONFIG_FILE $FEATURE_CONFIG_FILE + generate_config_file local $APP_VERSION ${config_files[@]} if [[ -n $2 ]] && [ $2 = "--enable_datastore_emulator" ] ; then gcloud beta emulators datastore start --host-port=0.0.0.0:8586 & @@ -288,14 +284,14 @@ case "$1" in $version"."$FEATURE_DOMAIN ) - generate_config_file_with_urls $APP_VERSION ${urls[@]} $FRONTEND_CONFIG_FILE $LANDINGPAGE_CONFIG_FILE $SUPPORT_CONFIG_FILE $FEATURE_CONFIG_FILE + generate_config_file_with_urls $APP_VERSION ${urls[@]} ${config_files[@]} if [ ! -z $3 ]; then # Especified one or more yaml configuration files gcloud app deploy --version $version --no-promote $3 else gcloud app deploy --version $version --no-promote $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $FEATURE_YAML $WORKER_YAML queue.yaml fi else - generate_config_file $ENV $APP_VERSION $FRONTEND_CONFIG_FILE $LANDINGPAGE_CONFIG_FILE $SUPPORT_CONFIG_FILE $FEATURE_CONFIG_FILE + generate_config_file $ENV $APP_VERSION ${config_files[@]} gcloud app deploy $APP_YAML $FRONTEND_YAML $BACKEND_YAML $SUPPORT_YAML $FEATURE_YAML $WORKER_YAML fi diff --git a/generate_config.sh b/generate_config.sh index 3a43e93d9..653489fd8 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -73,7 +73,6 @@ function generate_config_file { ${config_list[@]} $app_version ); - echo "${config_list[@]}" config=$(create_config ${config_list[@]}); for file in ${@:3} ; do From 4e6ad7275dd0162b5dbc7f4ab76e3e10a7ebbae2 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 30 Jan 2019 10:28:44 -0300 Subject: [PATCH 075/606] Remove unnecessary echo --- generate_config.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/generate_config.sh b/generate_config.sh index 653489fd8..52f9c3f94 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -86,7 +86,6 @@ function generate_config_file_with_urls { config=$(create_config ${config_list[@]}); files=${@:7}; - echo ${config_list[@]} for file in ${files[@]} ; do echo "$config" > $file; done From 1860813759926f7271198500aa295700a42b72ad Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 30 Jan 2019 16:06:15 -0200 Subject: [PATCH 076/606] created component to list all the user profiles --- frontend/images/edit.png | Bin 0 -> 1461 bytes frontend/index.html | 2 + .../configProfile/config_profile_mobile.css | 65 ++++-------------- .../configProfile/config_profile_mobile.html | 40 +++++------ .../userProfiles/userProfiles.component.js | 34 +++++++++ .../userProfiles/user_profiles.css | 46 +++++++++++++ .../userProfiles/user_profiles.html | 14 ++++ 7 files changed, 124 insertions(+), 77 deletions(-) create mode 100644 frontend/images/edit.png create mode 100644 frontend/user/configProfile/userProfiles/userProfiles.component.js create mode 100644 frontend/user/configProfile/userProfiles/user_profiles.css create mode 100644 frontend/user/configProfile/userProfiles/user_profiles.html diff --git a/frontend/images/edit.png b/frontend/images/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..a275fe7226cce8dbfef258a09207ffab25ba8ae1 GIT binary patch literal 1461 zcmV;m1xosfP)e41`AHy0n%AO4*8{L5*S% zf)as*g0!HK@?Z+IfcRjL7mSGkB4BN~h|z4zMTn`=L?6T(5`xq!NV^NY?B(;J6lmGD zJJZ?4-^=bf-qhQ^H9k^NCyT1>A*11Yao|V{zSNpashYv z*xDIKzH_R+^yJ`@(@zhOmQbFGED*>Bk}M@qy{IAwjf4;8dybqDLG5a>Wn{;R*#kq7 zlue+E1##Og-hrP5-p-#{e!z|)OGbA1=JyLrWIeDFNVQrl78I(Di4?B!9RAwMaWNYy zt;+ML>V84etjn{5eiTsu@}jKDrdURIYeW?(J>lIT5!r;`>bXEm{9u%4^0Uf+?QUR~ zMv717_D>3%Pe5{<(`F3?zZzY<&Qo!)t8twgDXsKAu5dt*Ay==DLp-Rs0tesC(Sw{jA?FkZ|&IM{*1J^wg~b-!c^Hr zkfl3(^M~EtciYJJQ{J(NEKIyC8wjp2;mvn<-8K>l%C^KS>H#7POMJQG+L{KS#5XS! zVfOt~We>qs+V=m}88MlO6fi!04$G&0%=FK6oRFS_XT&SE^9ed1z!=PY zkRH7$#zN-EB}^EUOZBBPs(#eGmJ3ZYhzxZs z<1Ho*_A+DmqNuTk<~sJCE97R&b;s&OLK)5StBI_UOQXj8&Hu3XTp@wxt4@{# z)kXuk`J8uF2sWqUE7#W|Q)2#^y?oOQ$sWsxj85y6R!>mrG8aG=0jk5`m z)-xhKGBPf0)_pYr;KEgF6wcaB@KDOb%pS8MYOFC>&%T=VTyMN$TVO1xa(;DI*>#hW z8a%2Hb*-p7T#`hzrLjbrXhq8a%&N)98bt9qm9{AqU|-F8uHC%sRLU+fP$q*|~Pw(Ti=(+eY4;_E{b9-hB~e8EuFp$-8&= zv|DLRNeymC^{>Q=vVl@uFumM=cULqkiZCxPgBK%JKLK zvqVtUEa>W^XqOK_Riw1iTPz|4&TEUAKf-S26ihEa-_@X)p5!G}^Ik;F9)V)74Ve5Q6#b5K`qU#icjYDcZW=Yh^!(` zTR4Do#^~yNPeqlLgKVvqZaI~g?h5Hfg;$;0RHNvRM&zx0PkBY$H`R2+iET~@hfod$ zGAq7`^)iZvW9!##8_!f3D?)FDJ}A8rdV{opHlX-1_(k~}SLC>p8_)g R`T05WG P00000NkvXXu0mjf03gMj literal 0 HcmV?d00001 diff --git a/frontend/index.html b/frontend/index.html index 3e88e0193..1ae4d8e31 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -62,6 +62,7 @@ + @@ -175,6 +176,7 @@ + diff --git a/frontend/user/configProfile/config_profile_mobile.css b/frontend/user/configProfile/config_profile_mobile.css index f77b1f3b4..27c3c5897 100644 --- a/frontend/user/configProfile/config_profile_mobile.css +++ b/frontend/user/configProfile/config_profile_mobile.css @@ -1,47 +1,47 @@ -.user-profile__container { +.config-profile__container { display: grid; grid-template-rows: 17em min-content auto; overflow-x: hidden; } -.user-profile__header { +.config-profile__header { display: grid; grid-template-columns: 1fr; grid-template-rows: 2fr 1fr; } -.user-profile__header--shadow { +.config-profile__header--shadow { background-image: linear-gradient(#02554dd2, #009688); } -.user-profile__header--background { +.config-profile__header--background { background-color: #009688; height: 100%; } -.user-profile__back__icon { +.config-profile__back__icon { color: white; } -.user-profile__avatar--position { +.config-profile__avatar--position { justify-self: center; position: absolute; top: 7em; } -.user-profile__avatar { +.config-profile__avatar { border-radius: 50%; height: 8em; width: 8em; } -.user-profile__info { +.config-profile__info { display: grid; grid-template-columns: 1fr; grid-template-rows: auto; } -.user-profile__info--name { +.config-profile__info--name { margin: 0 1em; text-align: center; font-size: 1.4em; @@ -50,61 +50,20 @@ text-transform: uppercase; } -.user-profile__info--data { +.config-profile__info--data { font-size: 0.8em; margin: 1em 0 1em 2.5em; } -.user-profile__info--data > span { +.config-profile__info--data > span { color: #009688; text-transform: uppercase; font-weight: 700; } -.user-profile__info--divider { +.config-profile__info--divider { border: none; background-color: #84C45E; height: 4px; width: 35%; } - -.user-profile__section__title { - margin: 0.5em auto; - text-transform: uppercase; - color: #004D41; - font-weight: 500; -} - -.user-profile__content { - display: grid; - grid-row-gap: 1em; - margin-top: 1em; -} - -.user-profile__data { - display: grid; - grid-template-columns: 20% auto; - grid-template-rows: 1fr 10%; -} - -.user-profile__data > img { - height: 3em; - width: 3em; - justify-self: center -} - -.user-profile__data > div { - min-width: 0; - max-width: 95%; -} - -.user-profile__data > div > p { - margin: 0; - font-weight: 500; - text-transform: uppercase; - font-size: 0.9em; -} - -.user-profile__data > md-divider { - grid-column: 1/3; -} \ No newline at end of file diff --git a/frontend/user/configProfile/config_profile_mobile.html b/frontend/user/configProfile/config_profile_mobile.html index 15aa3caf0..a926f55bf 100644 --- a/frontend/user/configProfile/config_profile_mobile.html +++ b/frontend/user/configProfile/config_profile_mobile.html @@ -1,40 +1,32 @@ - \ No newline at end of file From fdd3c7a965b120f2657dae627f80f9757faff4b9 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 5 Feb 2019 13:48:16 -0300 Subject: [PATCH 098/606] Create manageTogglesControllerSpec --- .../manage/manageTogglesControllerSpec.js | 121 ++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 feature-toggles/test/specs/manage/manageTogglesControllerSpec.js diff --git a/feature-toggles/test/specs/manage/manageTogglesControllerSpec.js b/feature-toggles/test/specs/manage/manageTogglesControllerSpec.js new file mode 100644 index 000000000..0350c8661 --- /dev/null +++ b/feature-toggles/test/specs/manage/manageTogglesControllerSpec.js @@ -0,0 +1,121 @@ +(describe('ManageTogglesConstoller Tests', function() { + beforeEach(module('app')); + + let authService, messageService, manageTogglesServices, manageTogglesCtrl, q, scope; + + const feature = { + 'name': 'edit-inst' + }; + + const otherFature = { + 'name': 'edit-user' + }; + + + beforeEach(inject(function(AuthService, MessageService, ManageTogglesService, $controller, $q, $rootScope) { + authService = AuthService; + manageTogglesServices = ManageTogglesService; + messageService = MessageService; + q = $q; + scope = $rootScope.$new(); + + manageTogglesCtrl = $controller('ManageTogglesController', { + AuthService, + MessageService, + ManageTogglesService + }); + })); + + describe('Test $onInit', function() { + + it('Should be get all features', function(done) { + spyOn(manageTogglesServices, 'getAllFeatureToggles').and.callFake(function() { + return q.when([feature, otherFature]); + }); + + manageTogglesCtrl.$onInit().then(function(response) { + expect(manageTogglesServices.getAllFeatureToggles).toHaveBeenCalled(); + expect(response).toEqual([feature, otherFature]); + done(); + }); + + scope.$apply(); + }); + + it('Should be show error message', function(done) { + spyOn(messageService, 'showToast'); + spyOn(manageTogglesServices, 'getAllFeatureToggles').and.callFake(function() { + return q.reject({ + data: { + msg: 'Request fail' + } + }); + }); + + manageTogglesCtrl.$onInit().then(function() { + expect(messageService.showToast).toHaveBeenCalledWith('Request fail'); + done(); + }); + + scope.$apply(); + }); + }); + + describe('Test logout', function() { + + it('Should be call AuthService.logout', function() { + spyOn(authService, 'logout'); + manageTogglesCtrl.logout(); + expect(authService.logout).toHaveBeenCalled(); + }); + }); + + describe('Test save', function() { + beforeEach(function() { + spyOn(messageService, 'showToast'); + }); + + it('Should be call messageService.saveFeature', function(done) { + spyOn(manageTogglesServices, 'saveFeature').and.callFake(function(feature) { + return q.when(feature); + }); + + + const promise = manageTogglesCtrl.save(feature); + + expect(feature.isLoading).toBeTruthy(); + + promise.then(function(response) { + expect(messageService.showToast).toHaveBeenCalledWith("Alterações salvas com sucesso."); + expect(manageTogglesServices.saveFeature).toHaveBeenCalledWith(feature); + expect(response).toEqual(feature); + expect(manageTogglesCtrl.isLoading).toBeFalsy(); + done(); + }); + + scope.$apply(); + }); + + it('Should be call messageService with error message', function(done) { + spyOn(manageTogglesServices, 'saveFeature').and.callFake(function(feature) { + return q.reject({ + data: { + msg: 'Feature not found' + } + }); + }); + + const promise = manageTogglesCtrl.save(feature); + + expect(feature.isLoading).toBeTruthy(); + + promise.then(function() { + expect(messageService.showToast).toHaveBeenCalledWith("Feature not found"); + expect(manageTogglesCtrl.isLoading).toBeFalsy(); + done(); + }); + + scope.$apply(); + }); + }); +})); \ No newline at end of file From e994883f3b9de9e0f8b8115bd2a7474cc721684c Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 6 Feb 2019 09:56:00 -0300 Subject: [PATCH 099/606] Remove unnecessary dependency --- feature-toggles/test/karma.conf.js | 5 ----- feature-toggles/test/package.json | 12 +---------- feature-toggles/test/yarn.lock | 32 +----------------------------- 3 files changed, 2 insertions(+), 47 deletions(-) diff --git a/feature-toggles/test/karma.conf.js b/feature-toggles/test/karma.conf.js index 69be615c9..cd2ab39e1 100644 --- a/feature-toggles/test/karma.conf.js +++ b/feature-toggles/test/karma.conf.js @@ -20,16 +20,11 @@ module.exports = function (config) { 'node_modules/angular-messages/angular-messages.js', 'node_modules/angular-material/angular-material.js', 'node_modules/@uirouter/angularjs/release/angular-ui-router.js', - 'node_modules/angular-sanitize/angular-sanitize.js', - 'node_modules/crypto-js/crypto-js.js', 'node_modules/lodash/lodash.js', 'node_modules/angular-mocks/angular-mocks.js', 'node_modules/firebase/firebase.js', 'node_modules/angularfire/dist/angularfire.js', "node_modules/mockfirebase/browser/mockfirebase.js", - "node_modules/moment/min/moment.min.js", - "node_modules/angular-moment/angular-moment.js", - "bower_components/ngMask/dist/ngMask.js", '../*.js', '../*/*.js', '../*/*/*.js', diff --git a/feature-toggles/test/package.json b/feature-toggles/test/package.json index c7408979a..3efe9a86c 100644 --- a/feature-toggles/test/package.json +++ b/feature-toggles/test/package.json @@ -7,10 +7,7 @@ "angular-material": "1.1.5", "angular-messages": "1.6.4", "angular-mocks": "1.6.4", - "angular-moment": "1.0.1", - "angular-sanitize": "1.6.4", "angularfire": "^2.3.0", - "crypto-js": "^3.1.9-1", "jasmine": "2.99.0", "karma": "^1.7.0", "karma-chai-plugins": "^0.9.0", @@ -20,19 +17,12 @@ "karma-jasmine-html-reporter": "0.2.2", "karma-spec-reporter": "0.0.31", "lodash": "^4.17.4", - "mockfirebase": "^0.12.0", - "moment-js": "^1.1.15" + "mockfirebase": "^0.12.0" }, "dependencies": { - "@bower_components/moment": "moment/moment#^2.18.1", - "@bower_components/ngMask": "candreoliveira/ngMask#^3.1.1", - "moment": "^2.18.1", "package.json": "^2.0.1" }, "engines": { "yarn": ">= 1.0.0" - }, - "scripts": { - "postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'bower_components', 'junction') } catch (e) { }\"" } } diff --git a/feature-toggles/test/yarn.lock b/feature-toggles/test/yarn.lock index 4030cc58d..66db9ea31 100644 --- a/feature-toggles/test/yarn.lock +++ b/feature-toggles/test/yarn.lock @@ -2,14 +2,6 @@ # yarn lockfile v1 -"@bower_components/moment@moment/moment#^2.18.1": - version "2.24.0" - resolved "https://codeload.github.com/moment/moment/tar.gz/96d0d6791ab495859d09a868803d31a55c917de1" - -"@bower_components/ngMask@candreoliveira/ngMask#^3.1.1": - version "3.1.0" - resolved "https://codeload.github.com/candreoliveira/ngMask/tar.gz/ec2bb5d05eed979ce18c4034d3cc882668517f21" - "@uirouter/angularjs@^1.0.5": version "1.0.22" resolved "https://registry.yarnpkg.com/@uirouter/angularjs/-/angularjs-1.0.22.tgz#581ab38794a2d7c2790851087072c4066b2b6c46" @@ -150,18 +142,6 @@ angular-mocks@1.6.4: resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.6.4.tgz#47fdf50921cf24fb489f100a8cf2ad99d0538f40" integrity sha1-R/31CSHPJPtInxAKjPKtmdBTj0A= -angular-moment@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/angular-moment/-/angular-moment-1.0.1.tgz#509d3326aea23f78221cfddb2b62bfede6841d31" - integrity sha1-UJ0zJq6iP3giHP3bK2K/7eaEHTE= - dependencies: - moment ">=2.8.0 <3.0.0" - -angular-sanitize@1.6.4: - version "1.6.4" - resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.6.4.tgz#60a37ea96fb0d4a322a3ccb64ee4a5cf3b154f0c" - integrity sha1-YKN+qW+w1KMio8y2TuSlzzsVTww= - angular@1.6.4: version "1.6.4" resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.4.tgz#03b7b15c01a0802d7e2cf593240e604054dc77fb" @@ -935,11 +915,6 @@ crypto-browserify@^3.0.0: randombytes "^2.0.0" randomfill "^1.0.3" -crypto-js@^3.1.9-1: - version "3.1.9-1" - resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8" - integrity sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg= - custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" @@ -2590,12 +2565,7 @@ module-deps@^3.5.0: through2 "^1.0.0" xtend "^4.0.0" -moment-js@^1.1.15: - version "1.1.15" - resolved "https://registry.yarnpkg.com/moment-js/-/moment-js-1.1.15.tgz#28da79be3bf2bc4a3dffd2b8368c28e863caa9d5" - integrity sha1-KNp5vjvyvEo9/9K4Nowo6GPKqdU= - -moment@2.x.x, "moment@>=2.8.0 <3.0.0", moment@^2.18.1: +moment@2.x.x: version "2.24.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== From 7756bc823f98dd4812cc5accf3fd5e8a85469c70 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 6 Feb 2019 09:59:39 -0300 Subject: [PATCH 100/606] Fix issues --- ecis | 2 +- setup_frontend_tests | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ecis b/ecis index 15a284b34..a81d88556 100755 --- a/ecis +++ b/ecis @@ -213,7 +213,7 @@ case "$1" in fi if [ ! -e node_modules ]; then - yarn add package.json + yarn catch_error $? "Node modules installed with success" else log_message "Node modules already installed" diff --git a/setup_frontend_tests b/setup_frontend_tests index e5e368065..13cffdb87 100755 --- a/setup_frontend_tests +++ b/setup_frontend_tests @@ -36,7 +36,7 @@ cd feature-toggles/test rm -rf node_modules bower_components if [ ! -e node_modules ]; then - yarn add package.json + yarn catch_error $? "Node modules installed with success" else log_message "Node modules already installed" @@ -49,7 +49,7 @@ cd frontend/test rm -rf node_modules bower_components if [ ! -e node_modules ]; then - yarn add package.json + yarn catch_error $? "Node modules installed with success" else log_message "Node modules already installed" From 72a5326fe3dd784353e9442856b3f6ecaf8a859c Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 6 Feb 2019 10:25:44 -0300 Subject: [PATCH 101/606] added toolbar --- .../user/configProfile/config_profile.html | 2 +- .../configProfile/config_profile_mobile.css | 44 ++++++++++++++++++- .../configProfile/config_profile_mobile.html | 32 +++++++++++++- 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/frontend/user/configProfile/config_profile.html b/frontend/user/configProfile/config_profile.html index bf935746f..6d5dff575 100644 --- a/frontend/user/configProfile/config_profile.html +++ b/frontend/user/configProfile/config_profile.html @@ -14,7 +14,7 @@

    - + md-input-container > label { + color: #009688 !important; +} + +.config-profile__form > md-input-container > input { + border-color: #009688; +} + +.config-profile__form { + margin: 0 2em; +} + diff --git a/frontend/user/configProfile/config_profile_mobile.html b/frontend/user/configProfile/config_profile_mobile.html index 2658486b6..33f5a7b76 100644 --- a/frontend/user/configProfile/config_profile_mobile.html +++ b/frontend/user/configProfile/config_profile_mobile.html @@ -1,7 +1,19 @@ + +
    + + close + + MEU PERFIL + + SALVAR + +
    +     +
    -
    +
    arrow_back @@ -19,7 +31,7 @@
    -
    +

    {{ configProfileCtrl.showProperty(configProfileCtrl.user.name) }}

    @@ -34,6 +46,22 @@
    +
    + + + + + + + + + + + + +
    + From 798c9f7a454be6b2f6e1ed6e9369468ae23a21aa Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 6 Feb 2019 10:39:33 -0300 Subject: [PATCH 102/606] increased the avatar image size --- .../configProfile/config_profile_mobile.css | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/frontend/user/configProfile/config_profile_mobile.css b/frontend/user/configProfile/config_profile_mobile.css index b54f8a472..712d4c6c2 100644 --- a/frontend/user/configProfile/config_profile_mobile.css +++ b/frontend/user/configProfile/config_profile_mobile.css @@ -45,16 +45,16 @@ color: white; } +.config-profile__avatar { + border-radius: 50%; + height: 9em; + width: 9em; +} + .config-profile__avatar--position { justify-self: center; position: absolute; - top: 7em; -} - -.config-profile__avatar { - border-radius: 50%; - height: 8em; - width: 8em; + top: 6.5em; } .config-profile__info { @@ -93,9 +93,9 @@ #config-profile__camera__button { justify-self: center; - margin-top: -5em; - width: 9.2em; - height: 9.2em; + margin-top: -5.5em; + width: 10.3em; + height: 10.3em; background-color: teal; opacity: 0.5; } @@ -103,7 +103,7 @@ #config-profile__photo__icon { color: #ffffff; font-size: 3em; - margin: -0.2em 0 0 0.85em; + margin: -0.4em 0 0 1em; } .config-profile__container md-input-container { From fe827b703dd434fcb4ebb84b28c3986213484186 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 6 Feb 2019 11:12:31 -0300 Subject: [PATCH 103/606] change var to let/const --- .../test/specs/auth/authServiceSpec.js | 16 ++++++++-------- .../test/specs/auth/loginControllerSpec.js | 16 ++-------------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/feature-toggles/test/specs/auth/authServiceSpec.js b/feature-toggles/test/specs/auth/authServiceSpec.js index 1e1c65a82..e5b80d580 100644 --- a/feature-toggles/test/specs/auth/authServiceSpec.js +++ b/feature-toggles/test/specs/auth/authServiceSpec.js @@ -12,7 +12,7 @@ let firebaseUser = { accessToken: 'ruioewyuirywieuryiuweyr876324875632487yiue', getIdToken: async () => firebaseUser.accessToken - } + }; beforeEach(module('app')); @@ -38,8 +38,8 @@ spyOn(userService, 'load').and.callThrough(); authService.setupUser(userTest.accessToken, userTest.emailVerified); - var user = authService.getCurrentUser(); - var new_user = new userFactory.user(userTest); + const user = authService.getCurrentUser(); + const new_user = new userFactory.user(userTest); expect(userService.load).toHaveBeenCalled(); expect(user).toEqual(new_user); @@ -54,8 +54,8 @@ it('should authService.getCurrentUser()', function() { spyOn(userService, 'load').and.callThrough(); authService.setupUser(userTest.accessToken, userTest.emailVerified); - var user = authService.getCurrentUser(); - var new_user = new userFactory.user(userTest); + const user = authService.getCurrentUser(); + const new_user = new userFactory.user(userTest); expect(user).toEqual(new_user); }); @@ -69,7 +69,7 @@ }); it('should authService.isLoggedIn()', function() { - var isLoggedIn = authService.isLoggedIn(); + const isLoggedIn = authService.isLoggedIn(); expect(isLoggedIn).toEqual(true); }); @@ -79,8 +79,8 @@ window.localStorage.userInfo = null; authService.save(); - var userCache = window.localStorage.userInfo; - var new_user = JSON.stringify(userTest); + const userCache = window.localStorage.userInfo; + const new_user = JSON.stringify(userTest); expect(userCache).toEqual(new_user); }); diff --git a/feature-toggles/test/specs/auth/loginControllerSpec.js b/feature-toggles/test/specs/auth/loginControllerSpec.js index 274bcf895..88850447c 100644 --- a/feature-toggles/test/specs/auth/loginControllerSpec.js +++ b/feature-toggles/test/specs/auth/loginControllerSpec.js @@ -2,25 +2,13 @@ (describe('Test LoginController', function() { - var logginCtrl, httpBackend, scope, createCtrl, state, authService, states; + let logginCtrl, httpBackend, scope, createCtrl, state, authService, states; - var user = { + const user = { name: 'Tiago', state: 'active' }; - var institutions = [{ - name: 'Certbio', - key: '123456789' - }]; - - var posts = [{ - author: 'Mayza Nunes', - author_key: "111111", - title: 'Post de Mayza', - text: 'Lorem ipsum' - }]; - beforeEach(module('app')); beforeEach(inject(function($controller, $httpBackend, $rootScope, STATES, $state, AuthService) { From 0c7685a6d0601e83fcd19355a6e9064ce1dc6319 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 6 Feb 2019 11:16:24 -0300 Subject: [PATCH 104/606] refact config profile controller --- .../configProfile/configProfileController.js | 70 ++++++++++--------- .../user/configProfile/config_profile.html | 2 +- .../configProfile/config_profile_mobile.html | 3 +- 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index 9082b6358..5c2f9fd04 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -86,37 +86,45 @@ configProfileCtrl.finish = function finish() { configProfileCtrl.loadingSubmission = true; - if (configProfileCtrl.photo_user) { - configProfileCtrl.canEdit = false; - ImageService.saveImage(configProfileCtrl.photo_user) - .then(function (data) { - configProfileCtrl.user.photo_url = data.url; - configProfileCtrl.user.uploaded_images.push(data.url); - saveUser(); - configProfileCtrl.canEdit = true; - configProfileCtrl.loadingSubmission = false; - }); - } else { - return saveUser(); - } + saveImage().then(_ => { + saveUser() + .finally(_ => { + configProfileCtrl.loadingSubmission = false; + }); + }) }; - function saveUser() { - const deffered = $q.defer(); - if (configProfileCtrl.newUser.isValid()) { - updateUser(); - const patch = ObserverRecorderService.generate(observer); - UserService.save(patch).then(function success() { - AuthService.save(); - configProfileCtrl.loadingSubmission = false; - MessageService.showToast("Edição concluída com sucesso"); - deffered.resolve(); - }); - } else { - MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); - deffered.reject(); - } - return deffered.promise; + const saveImage = () => { + return new Promise((resolve) => { + if(configProfileCtrl.photo_user) { + ImageService.saveImage(configProfileCtrl.photo_user) + .then(function (data) { + configProfileCtrl.user.photo_url = data.url; + configProfileCtrl.user.uploaded_images.push(data.url); + resolve(); + }) + } else { + resolve(); + } + }) + } + + const saveUser = () => { + return new Promise((resolve) => { + if (configProfileCtrl.newUser.isValid()) { + updateUser(); + const patch = ObserverRecorderService.generate(observer); + UserService.save(patch) + .then(() => { + AuthService.save(); + MessageService.showToast("Edição concluída com sucesso"); + resolve(); + }); + } else { + MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); + resolve(); + } + }); } function updateUser() { @@ -126,10 +134,6 @@ }); }; - configProfileCtrl.showButton = function () { - return configProfileCtrl.canEdit; - }; - configProfileCtrl.removeInstitution = function removeInstitution(event, institution) { if (!isAdmin(institution.key)) { const confirm = $mdDialog.confirm(); diff --git a/frontend/user/configProfile/config_profile.html b/frontend/user/configProfile/config_profile.html index 6d5dff575..f24bb86b3 100644 --- a/frontend/user/configProfile/config_profile.html +++ b/frontend/user/configProfile/config_profile.html @@ -15,7 +15,7 @@

    - diff --git a/frontend/user/configProfile/config_profile_mobile.html b/frontend/user/configProfile/config_profile_mobile.html index 33f5a7b76..bc368eefe 100644 --- a/frontend/user/configProfile/config_profile_mobile.html +++ b/frontend/user/configProfile/config_profile_mobile.html @@ -4,7 +4,8 @@ close MEU PERFIL - + SALVAR
    From 8a23baab7e57abba6477f230504ffc9af4a489aa Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 6 Feb 2019 11:27:35 -0300 Subject: [PATCH 105/606] set config profile state to hide navbar --- frontend/utils/hideNavbar.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/utils/hideNavbar.js b/frontend/utils/hideNavbar.js index 4191b9006..6bdb8177b 100644 --- a/frontend/utils/hideNavbar.js +++ b/frontend/utils/hideNavbar.js @@ -11,7 +11,8 @@ scope.bottomToolbar = document.getElementById('navbar-bottom'); scope.INSTITUTION_STATES = [ STATES.INST_TIMELINE, STATES.INST_FOLLOWERS, STATES.INST_EVENTS, - STATES.INST_MEMBERS, STATES.INST_REGISTRATION_DATA, STATES.INST_LINKS + STATES.INST_MEMBERS, STATES.INST_REGISTRATION_DATA, STATES.INST_LINKS, + STATES.CONFIG_PROFILE ]; scope.STATES_WITHOUT_BOTTOM_TOOLBAR = [ STATES.CREATE_EVENT From 3bde02a680b8adfb11f309fd32dcaacdbce07da5 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 6 Feb 2019 14:18:26 -0300 Subject: [PATCH 106/606] refact editProfileController --- frontend/index.html | 1 + .../configProfile/configProfileController.js | 8 ++--- .../user/configProfile/config_profile.html | 16 ++++----- .../userProfiles/userProfiles.component.js | 22 ++++++++----- .../userProfiles/user_profiles.html | 2 +- frontend/user/editProfileController.js | 33 +++++++++---------- frontend/user/edit_profile.html | 9 +++-- frontend/utils/utils.js | 9 ++++- 8 files changed, 54 insertions(+), 46 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index aba796daf..7cb25ee40 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -63,6 +63,7 @@ + diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index 5c2f9fd04..332edbbb9 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -157,15 +157,13 @@ } }; - configProfileCtrl.editProfile = function editProfile(inst, ev) { + configProfileCtrl.editProfile = function editProfile(profile, event) { $mdDialog.show({ templateUrl: 'app/user/edit_profile.html', controller: 'EditProfileController', controllerAs: "editProfileCtrl", - locals: { - institution: inst - }, - targetEvent: ev, + locals: { profile }, + targetEvent: event, clickOutsideToClose: false }); }; diff --git a/frontend/user/configProfile/config_profile.html b/frontend/user/configProfile/config_profile.html index f24bb86b3..4885a7f35 100644 --- a/frontend/user/configProfile/config_profile.html +++ b/frontend/user/configProfile/config_profile.html @@ -59,23 +59,23 @@

    Seus vínculos institucionais: - - + +
    - - {{ institution.acronym }} + + {{ profile.institution.acronym }} - - {{ institution.name }} + + {{ profile.institution.name }}
    + ng-click="configProfileCtrl.editProfile(profile, $event)" md-colors="{background: 'light-green'}"> edit + ng-click="configProfileCtrl.removeInstitution($event, profile.institution)" md-colors="{background: 'light-green'}"> delete
    diff --git a/frontend/user/configProfile/userProfiles/userProfiles.component.js b/frontend/user/configProfile/userProfiles/userProfiles.component.js index 2b62da56c..ff76deda3 100644 --- a/frontend/user/configProfile/userProfiles/userProfiles.component.js +++ b/frontend/user/configProfile/userProfiles/userProfiles.component.js @@ -13,22 +13,26 @@ } }) - function userProfileController(AuthService) { + function userProfileController($mdDialog) { const userProfileCtrl = this; - // userProfileCtrl.user = AuthService.getCurrentUser(); - userProfileCtrl.getImage = profile => { const editImagePath = 'app/images/edit.png'; return userProfileCtrl.editMode ? editImagePath : profile.institution.photo_url; } - userProfileCtrl.edit = profile => { - if(userProfileCtrl.editMode) { - console.log('edit'); - } - + userProfileCtrl.openEditDialog = (profile, event) => { + const dialogData = { + templateUrl: 'app/user/edit_profile.html', + controller: 'EditProfileController', + controllerAs: "editProfileCtrl", + locals: { profile }, + targetEvent: event, + clickOutsideToClose: false + }; + if(userProfileCtrl.editMode) $mdDialog.show(dialogData); }; - } + + })(); \ No newline at end of file diff --git a/frontend/user/configProfile/userProfiles/user_profiles.html b/frontend/user/configProfile/userProfiles/user_profiles.html index f2a813c99..e7920b71f 100644 --- a/frontend/user/configProfile/userProfiles/user_profiles.html +++ b/frontend/user/configProfile/userProfiles/user_profiles.html @@ -3,7 +3,7 @@
    + ng-click="userProfileCtrl.openEditDialog(profile, $event)"/>

    {{profile.institution.name}}

    diff --git a/frontend/user/editProfileController.js b/frontend/user/editProfileController.js index 588fbe022..10a092078 100644 --- a/frontend/user/editProfileController.js +++ b/frontend/user/editProfileController.js @@ -3,23 +3,30 @@ (function () { const app = angular.module("app"); - app.controller("EditProfileController", function EditProfileController(institution, ProfileService, + app.controller("EditProfileController", function EditProfileController(profile, ProfileService, AuthService, $mdDialog, MessageService, ObserverRecorderService) { - var editProfileCtrl = this; - editProfileCtrl.phoneRegex = "[0-9]{2}[\\s][0-9]{4,5}[-][0-9]{4,5}"; - editProfileCtrl.user = AuthService.getCurrentUser(); - editProfileCtrl.institution = institution; + const editProfileCtrl = this; + + editProfileCtrl.phoneRegex = Utils.getRegex("phone"); let profileObserver = {}; let oldProfile; + + editProfileCtrl.$onInit = () => { + editProfileCtrl.user = AuthService.getCurrentUser(); + editProfileCtrl.profile = profile; + oldProfile = _.clone(editProfileCtrl.profile); + profileObserver = ObserverRecorderService.register(editProfileCtrl.user); + }; editProfileCtrl.edit = function edit() { if (isValidProfile()) { var patch = ObserverRecorderService.generate(profileObserver); if (!_.isEmpty(patch)) { - ProfileService.editProfile(patch).then(function success() { - MessageService.showToast('Perfil editado com sucesso'); - AuthService.save(); - }); + ProfileService.editProfile(patch) + .then(() => { + MessageService.showToast('Perfil editado com sucesso'); + AuthService.save(); + }); } $mdDialog.hide(); } else { @@ -36,13 +43,5 @@ function isValidProfile() { return !_.isEmpty(editProfileCtrl.profile.office); } - - (function main() { - editProfileCtrl.profile = editProfileCtrl.user.institution_profiles - .filter(profile => profile.institution_key === editProfileCtrl.institution.key) - .reduce(profile => profile); - oldProfile = _.clone(editProfileCtrl.profile); - profileObserver = ObserverRecorderService.register(editProfileCtrl.user); - })(); }); })(); \ No newline at end of file diff --git a/frontend/user/edit_profile.html b/frontend/user/edit_profile.html index d58f6a4b9..c1d7d0685 100644 --- a/frontend/user/edit_profile.html +++ b/frontend/user/edit_profile.html @@ -8,12 +8,12 @@
    - Foto do Perfil + Foto do Perfil
    -

    {{editProfileCtrl.institution.name}}

    +

    {{editProfileCtrl.profile.institution.name}}

    @@ -31,8 +31,7 @@

    {{editProfileCtrl.institution.name}}

     - +
    diff --git a/frontend/utils/utils.js b/frontend/utils/utils.js index c370fa58e..64593ecdb 100644 --- a/frontend/utils/utils.js +++ b/frontend/utils/utils.js @@ -265,5 +265,12 @@ var Utils = { * Returns the input property if it is defined, * otherwise a default value is returned */ - showProperty: property => property || 'Não informado' + showProperty: property => property || 'Não informado', + + getRegex: type => { + const regexes = { + phone: "[0-9]{2}[\\s][0-9]{4,5}[-][0-9]{4,5}" + }; + return regexes[type]; + } }; From 5e896ba92f296d8a1b4b5d95abcea7d53d5229f8 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 6 Feb 2019 14:28:58 -0300 Subject: [PATCH 107/606] added the acronym field to the profile institution --- backend/models/user.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/models/user.py b/backend/models/user.py index 20a199627..791ef5b7c 100644 --- a/backend/models/user.py +++ b/backend/models/user.py @@ -37,7 +37,8 @@ def make(self): profile['branch_line'] = self.branch_line profile['institution'] = { 'name': institution.name, - 'photo_url': institution.photo_url + 'photo_url': institution.photo_url, + 'acronym': institution.acronym } profile['color'] = self.color or 'teal' From f6fd16756739d85d36cfc797e93e16e41586c747 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 6 Feb 2019 15:08:18 -0300 Subject: [PATCH 108/606] created subfolder to edit profile files --- frontend/index.html | 8 ++++---- frontend/user/configProfile/configProfileController.js | 3 +-- frontend/user/{ => editProfile}/editProfileController.js | 2 +- frontend/user/{ => editProfile}/edit_profile.css | 0 frontend/user/{ => editProfile}/edit_profile.html | 0 .../userProfiles/userProfiles.component.js | 4 ++-- .../{configProfile => }/userProfiles/user_profiles.css | 0 .../{configProfile => }/userProfiles/user_profiles.html | 0 frontend/utils/utils.js | 6 ------ 9 files changed, 8 insertions(+), 15 deletions(-) rename frontend/user/{ => editProfile}/editProfileController.js (95%) rename frontend/user/{ => editProfile}/edit_profile.css (100%) rename frontend/user/{ => editProfile}/edit_profile.html (100%) rename frontend/user/{configProfile => }/userProfiles/userProfiles.component.js (87%) rename frontend/user/{configProfile => }/userProfiles/user_profiles.css (100%) rename frontend/user/{configProfile => }/userProfiles/user_profiles.html (100%) diff --git a/frontend/index.html b/frontend/index.html index 7cb25ee40..29b0e078b 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -62,8 +62,8 @@ - - + + @@ -176,9 +176,9 @@ - + - + diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index 332edbbb9..1a7713b68 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -53,7 +53,6 @@ return user.photo_url; } - configProfileCtrl.addImage = function(image) { const newSize = 800; @@ -159,7 +158,7 @@ configProfileCtrl.editProfile = function editProfile(profile, event) { $mdDialog.show({ - templateUrl: 'app/user/edit_profile.html', + templateUrl: 'app/user/editProfile/edit_profile.html', controller: 'EditProfileController', controllerAs: "editProfileCtrl", locals: { profile }, diff --git a/frontend/user/editProfileController.js b/frontend/user/editProfile/editProfileController.js similarity index 95% rename from frontend/user/editProfileController.js rename to frontend/user/editProfile/editProfileController.js index 10a092078..715a368b0 100644 --- a/frontend/user/editProfileController.js +++ b/frontend/user/editProfile/editProfileController.js @@ -7,7 +7,7 @@ AuthService, $mdDialog, MessageService, ObserverRecorderService) { const editProfileCtrl = this; - editProfileCtrl.phoneRegex = Utils.getRegex("phone"); + editProfileCtrl.phoneRegex = "[0-9]{2}[\\s][0-9]{4,5}[-][0-9]{4,5}"; let profileObserver = {}; let oldProfile; diff --git a/frontend/user/edit_profile.css b/frontend/user/editProfile/edit_profile.css similarity index 100% rename from frontend/user/edit_profile.css rename to frontend/user/editProfile/edit_profile.css diff --git a/frontend/user/edit_profile.html b/frontend/user/editProfile/edit_profile.html similarity index 100% rename from frontend/user/edit_profile.html rename to frontend/user/editProfile/edit_profile.html diff --git a/frontend/user/configProfile/userProfiles/userProfiles.component.js b/frontend/user/userProfiles/userProfiles.component.js similarity index 87% rename from frontend/user/configProfile/userProfiles/userProfiles.component.js rename to frontend/user/userProfiles/userProfiles.component.js index ff76deda3..f0b538c90 100644 --- a/frontend/user/configProfile/userProfiles/userProfiles.component.js +++ b/frontend/user/userProfiles/userProfiles.component.js @@ -4,7 +4,7 @@ angular .module("app") .component("userProfiles", { - templateUrl: 'app/user/configProfile/userProfiles/user_profiles.html', + templateUrl: 'app/user/userProfiles/user_profiles.html', controller: userProfileController, controllerAs: 'userProfileCtrl', bindings: { @@ -23,7 +23,7 @@ userProfileCtrl.openEditDialog = (profile, event) => { const dialogData = { - templateUrl: 'app/user/edit_profile.html', + templateUrl: 'app/user/editProfile/edit_profile.html', controller: 'EditProfileController', controllerAs: "editProfileCtrl", locals: { profile }, diff --git a/frontend/user/configProfile/userProfiles/user_profiles.css b/frontend/user/userProfiles/user_profiles.css similarity index 100% rename from frontend/user/configProfile/userProfiles/user_profiles.css rename to frontend/user/userProfiles/user_profiles.css diff --git a/frontend/user/configProfile/userProfiles/user_profiles.html b/frontend/user/userProfiles/user_profiles.html similarity index 100% rename from frontend/user/configProfile/userProfiles/user_profiles.html rename to frontend/user/userProfiles/user_profiles.html diff --git a/frontend/utils/utils.js b/frontend/utils/utils.js index 64593ecdb..5160ad474 100644 --- a/frontend/utils/utils.js +++ b/frontend/utils/utils.js @@ -267,10 +267,4 @@ var Utils = { */ showProperty: property => property || 'Não informado', - getRegex: type => { - const regexes = { - phone: "[0-9]{2}[\\s][0-9]{4,5}[-][0-9]{4,5}" - }; - return regexes[type]; - } }; From 08d4ffc3c226198cbd24c9b0c124c73ffcfef243 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 6 Feb 2019 15:23:15 -0300 Subject: [PATCH 109/606] set to userProfile component to receive the onclick function --- .../user/configProfile/configProfileController.js | 9 +++++++-- .../user/configProfile/config_profile_mobile.html | 3 ++- frontend/user/editProfile/edit_profile_mobile.css | 0 .../user/editProfile/edit_profile_mobile.html | 5 +++++ .../user/userProfiles/userProfiles.component.js | 15 ++++----------- frontend/user/userProfiles/user_profiles.html | 2 +- 6 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 frontend/user/editProfile/edit_profile_mobile.css create mode 100644 frontend/user/editProfile/edit_profile_mobile.html diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index 1a7713b68..8be933e59 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -4,7 +4,7 @@ const app = angular.module("app"); app.controller("ConfigProfileController", function ConfigProfileController($state, STATES, $stateParams, - CropImageService, AuthService, UserService, ImageService, $rootScope, $q, MessageService, $mdDialog, ObserverRecorderService) { + CropImageService, AuthService, UserService, ImageService, $rootScope, SCREEN_SIZES, MessageService, $mdDialog, ObserverRecorderService) { const configProfileCtrl = this; @@ -157,8 +157,13 @@ }; configProfileCtrl.editProfile = function editProfile(profile, event) { + const templateUrl = Utils.selectFieldBasedOnScreenSize( + 'app/user/editProfile/edit_profile.html', + 'app/user/editProfile/edit_profile_mobile.html', + SCREEN_SIZES.SMARTPHONE + ); $mdDialog.show({ - templateUrl: 'app/user/editProfile/edit_profile.html', + templateUrl: templateUrl, controller: 'EditProfileController', controllerAs: "editProfileCtrl", locals: { profile }, diff --git a/frontend/user/configProfile/config_profile_mobile.html b/frontend/user/configProfile/config_profile_mobile.html index bc368eefe..3f5c83662 100644 --- a/frontend/user/configProfile/config_profile_mobile.html +++ b/frontend/user/configProfile/config_profile_mobile.html @@ -65,6 +65,7 @@ + edit-mode="configProfileCtrl.canEdit()" + on-click="configProfileCtrl.editProfile"> \ No newline at end of file diff --git a/frontend/user/editProfile/edit_profile_mobile.css b/frontend/user/editProfile/edit_profile_mobile.css new file mode 100644 index 000000000..e69de29bb diff --git a/frontend/user/editProfile/edit_profile_mobile.html b/frontend/user/editProfile/edit_profile_mobile.html new file mode 100644 index 000000000..8dee719e8 --- /dev/null +++ b/frontend/user/editProfile/edit_profile_mobile.html @@ -0,0 +1,5 @@ + + + hehehehee + + \ No newline at end of file diff --git a/frontend/user/userProfiles/userProfiles.component.js b/frontend/user/userProfiles/userProfiles.component.js index f0b538c90..a47464bb7 100644 --- a/frontend/user/userProfiles/userProfiles.component.js +++ b/frontend/user/userProfiles/userProfiles.component.js @@ -9,7 +9,8 @@ controllerAs: 'userProfileCtrl', bindings: { profiles: '<', - editMode: '<' + editMode: '<', + onClick: '<' } }) @@ -21,16 +22,8 @@ return userProfileCtrl.editMode ? editImagePath : profile.institution.photo_url; } - userProfileCtrl.openEditDialog = (profile, event) => { - const dialogData = { - templateUrl: 'app/user/editProfile/edit_profile.html', - controller: 'EditProfileController', - controllerAs: "editProfileCtrl", - locals: { profile }, - targetEvent: event, - clickOutsideToClose: false - }; - if(userProfileCtrl.editMode) $mdDialog.show(dialogData); + userProfileCtrl.edit = (profile, event) => { + if(userProfileCtrl.editMode) userProfileCtrl.onClick(profile, event); }; } diff --git a/frontend/user/userProfiles/user_profiles.html b/frontend/user/userProfiles/user_profiles.html index e7920b71f..1978cbe43 100644 --- a/frontend/user/userProfiles/user_profiles.html +++ b/frontend/user/userProfiles/user_profiles.html @@ -3,7 +3,7 @@
    + ng-click="userProfileCtrl.edit(profile, $event)"/>

    {{profile.institution.name}}

    From aa9ef88a5c99ea6dd1057fa5a6cbc79f5ea733ce Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 6 Feb 2019 16:50:23 -0300 Subject: [PATCH 110/606] started edit profile dialog --- frontend/index.html | 1 + .../user/editProfile/edit_profile_mobile.css | 33 +++++++++++++++++++ .../user/editProfile/edit_profile_mobile.html | 31 +++++++++++++++-- 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index 29b0e078b..c90222560 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -64,6 +64,7 @@ + diff --git a/frontend/user/editProfile/edit_profile_mobile.css b/frontend/user/editProfile/edit_profile_mobile.css index e69de29bb..da189187a 100644 --- a/frontend/user/editProfile/edit_profile_mobile.css +++ b/frontend/user/editProfile/edit_profile_mobile.css @@ -0,0 +1,33 @@ +.edit-profile-dialog { + height: min-content; + width: 75%; +} + +.edit-profile-dialog__content { + padding: 1em; + display: grid; + grid-row-gap: 1em; +} + +.edit-profile-dialog__content > h3 { + margin: 0; +} + +.edit-profile-dialog__content > span { + text-transform: uppercase; + color: #004D41; + text-align: start; + font-size: 0.9em; + font-weight: 500; +} + +.edit-profile__form { + display: grid; + grid-template-rows: 1fr 1fr 1fr; + grid-row-gap: 0.5em; + margin-top: 1em; +} + +.edit-profile__form > md-input-container { + margin: 0; +} \ No newline at end of file diff --git a/frontend/user/editProfile/edit_profile_mobile.html b/frontend/user/editProfile/edit_profile_mobile.html index 8dee719e8..fd7472e87 100644 --- a/frontend/user/editProfile/edit_profile_mobile.html +++ b/frontend/user/editProfile/edit_profile_mobile.html @@ -1,5 +1,30 @@ - - - hehehehee + + +

    Editar vínculo

    + {{editProfileCtrl.profile.institution.name}} + +
    + + + + + + + + + + + + + + + + +
    +     \ No newline at end of file From 38301b8524be24f9f4ac83ff9600a19dd8bc0f0c Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 7 Feb 2019 12:10:50 -0300 Subject: [PATCH 111/606] Fix colorpicker to show institution avatar --- frontend/sideMenu/side_menu.css | 22 +++++++++++++++++++++- frontend/sideMenu/side_menu.html | 8 ++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/frontend/sideMenu/side_menu.css b/frontend/sideMenu/side_menu.css index 7e4520798..4dc4f9e14 100644 --- a/frontend/sideMenu/side_menu.css +++ b/frontend/sideMenu/side_menu.css @@ -7,4 +7,24 @@ font-size: 12px; font-weight: 700; color: #019587; -} \ No newline at end of file +} + +img.avatar-icon { + padding: 0; + display: inline-block; + background-repeat: no-repeat no-repeat; + pointer-events: none; + width: 2em; + height: 2em; + border-radius: 50%; + margin-right: 0.6em; +} + +button.color-picker-button { + text-overflow: ellipsis; +} + +md-icon#color-picker-icon { + font-size: 2em; + margin-bottom: 0.4em; +} diff --git a/frontend/sideMenu/side_menu.html b/frontend/sideMenu/side_menu.html index 35213b44f..8d3400050 100644 --- a/frontend/sideMenu/side_menu.html +++ b/frontend/sideMenu/side_menu.html @@ -18,15 +18,15 @@ - - brightness_1 + + {{ profile.institution.name }} - color_lens - GERENCIAR CORES + color_lens + Gerenciar cores From 4d3e37db0a650b6a5d63cc5d0d5b68d1977bbb96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 12:39:16 -0300 Subject: [PATCH 112/606] Change dialog title --- frontend/requests/request_invitation_dialog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/requests/request_invitation_dialog.html b/frontend/requests/request_invitation_dialog.html index 877a21372..110b7c644 100644 --- a/frontend/requests/request_invitation_dialog.html +++ b/frontend/requests/request_invitation_dialog.html @@ -4,7 +4,7 @@ - Solicitar Cadastro + Solicitar vinculo institucional {{requestInvCtrl.request.institution_name}} From fc34dace66a261f46b42ed768f8b4d11a08a6459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 13:19:38 -0300 Subject: [PATCH 113/606] Add cancel button and change submit button text --- frontend/requests/request_invitation_dialog.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/requests/request_invitation_dialog.html b/frontend/requests/request_invitation_dialog.html index 110b7c644..287ec934f 100644 --- a/frontend/requests/request_invitation_dialog.html +++ b/frontend/requests/request_invitation_dialog.html @@ -33,12 +33,14 @@
    Este campo é obrigatório!
    -
    - - Solicitar Cadastro - -
    +
    + + Cancelar + + + Confirmar + +
    From 5fc87a713b5756e5d72e1194334a3f357a841614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 14:26:11 -0300 Subject: [PATCH 114/606] Change input bar color --- frontend/requests/request_invitation_dialog.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/requests/request_invitation_dialog.html b/frontend/requests/request_invitation_dialog.html index 287ec934f..1b8f368e2 100644 --- a/frontend/requests/request_invitation_dialog.html +++ b/frontend/requests/request_invitation_dialog.html @@ -12,7 +12,7 @@
    - +
    Este campo é obrigatório!
    @@ -20,7 +20,7 @@ - +
    Este campo é obrigatório!
    @@ -28,10 +28,10 @@ - -
    -
    Este campo é obrigatório!
    -
    + +
    +
    Este campo é obrigatório!
    +
    From acf2f4c2ddb1969a18defc68862972a6df709a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 14:41:39 -0300 Subject: [PATCH 115/606] Remove md-card and unecessary divs --- .../requests/request_invitation_dialog.html | 82 +++++++++---------- 1 file changed, 37 insertions(+), 45 deletions(-) diff --git a/frontend/requests/request_invitation_dialog.html b/frontend/requests/request_invitation_dialog.html index 1b8f368e2..fd2e33ff1 100644 --- a/frontend/requests/request_invitation_dialog.html +++ b/frontend/requests/request_invitation_dialog.html @@ -1,48 +1,40 @@ - -
    - - - - - Solicitar vinculo institucional - {{requestInvCtrl.request.institution_name}} - - - - - - - -
    -
    Este campo é obrigatório!
    -
    -     + + + + Solicitar vinculo institucional + {{requestInvCtrl.request.institution_name}} + + + + +
    +
    Este campo é obrigatório!
    +
    +     - - - -
    -
    Este campo é obrigatório!
    -
    -     + + + +
    +
    Este campo é obrigatório!
    +
    +     - - - -
    -
    Este campo é obrigatório!
    -
    -     -
    - - Cancelar - - - Confirmar - -
    - -     -     -
    + + + +
    +
    Este campo é obrigatório!
    +
    +     +
    + + Cancelar + + + Confirmar + +
    + +     From 4f73368d95698b42e980923514c350bad1710fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 14:42:41 -0300 Subject: [PATCH 116/606] Replace md-title for custom-title to apply css properly --- frontend/requests/request_invitation_dialog.html | 2 +- frontend/styles/custom.css | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/requests/request_invitation_dialog.html b/frontend/requests/request_invitation_dialog.html index fd2e33ff1..335cb7a90 100644 --- a/frontend/requests/request_invitation_dialog.html +++ b/frontend/requests/request_invitation_dialog.html @@ -1,7 +1,7 @@ - Solicitar vinculo institucional + Solicitar vinculo institucional {{requestInvCtrl.request.institution_name}}
    diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index 0cf0bf1ac..0481764da 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -1107,6 +1107,11 @@ md-input-container:not(.md-input-invalid).md-input-has-value .inputEmail { border-bottom-color: #009688 !important; } +.custom-title { + font-size: 20px; + font-weight: 500; +} + /* Smartphones */ @media screen and (max-width: 420px) { .custom-card { From 0b22aac13b46895ca394d78d3905ac6efc4344f2 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 7 Feb 2019 14:46:41 -0300 Subject: [PATCH 117/606] Update sideMenu to new colorpicker design --- frontend/sideMenu/sideMenu.component.js | 20 ++++++++++++++++++++ frontend/sideMenu/side_menu.css | 5 +++-- frontend/sideMenu/side_menu.html | 14 +++++++++----- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/frontend/sideMenu/sideMenu.component.js b/frontend/sideMenu/sideMenu.component.js index 5fd094a6a..6d28857b8 100644 --- a/frontend/sideMenu/sideMenu.component.js +++ b/frontend/sideMenu/sideMenu.component.js @@ -16,6 +16,14 @@ HomeItemsFactory, ManageInstItemsFactory, InstitutionService, SIDE_MENU_TYPES) { const sideMenuCtrl = this; + const colorPickerButton = { + text: 'Gerenciar cores', + icon: 'color_lens', + }; + const backButton = { + text: 'Voltar', + icon: 'keyboard_arrow_left', + }; sideMenuCtrl.user = AuthService.getCurrentUser(); @@ -92,6 +100,18 @@ return type === sideMenuCtrl.type; }; + sideMenuCtrl.isColorPickerActive = false; + + sideMenuCtrl.toggleColorPicker = () => { + sideMenuCtrl.isColorPickerActive = !sideMenuCtrl.isColorPickerActive; + } + + Object.defineProperty(sideMenuCtrl, 'currentMenuOption', { + get: function() { + return sideMenuCtrl.isColorPickerActive ? backButton : colorPickerButton; + } + }) + sideMenuCtrl.openColorPicker = () => { $mdDialog.show({ controller: "ColorPickerController", diff --git a/frontend/sideMenu/side_menu.css b/frontend/sideMenu/side_menu.css index 4dc4f9e14..890f2c776 100644 --- a/frontend/sideMenu/side_menu.css +++ b/frontend/sideMenu/side_menu.css @@ -24,7 +24,8 @@ button.color-picker-button { text-overflow: ellipsis; } -md-icon#color-picker-icon { +md-icon.color-picker-icon { font-size: 2em; - margin-bottom: 0.4em; + margin-bottom: 0.3em !important; + margin-right: 0.5em !important; } diff --git a/frontend/sideMenu/side_menu.html b/frontend/sideMenu/side_menu.html index 8d3400050..232957941 100644 --- a/frontend/sideMenu/side_menu.html +++ b/frontend/sideMenu/side_menu.html @@ -18,15 +18,19 @@ - + {{ profile.institution.name }} - + + + brightness_1 + {{ profile.institution.name }} + - - color_lens - Gerenciar cores + + {{ sideMenuCtrl.currentMenuOption.icon }} + {{ sideMenuCtrl.currentMenuOption.text }} From bb3aa407f3c0c371a15a3aebf3b12475486826fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 15:15:01 -0300 Subject: [PATCH 118/606] Add request_invitation_dialog specific classes --- frontend/index.html | 1 + frontend/requests/request_invitation_dialog.css | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 frontend/requests/request_invitation_dialog.css diff --git a/frontend/index.html b/frontend/index.html index d36c9c9e8..b26cdb414 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -63,6 +63,7 @@ + diff --git a/frontend/requests/request_invitation_dialog.css b/frontend/requests/request_invitation_dialog.css new file mode 100644 index 000000000..35031078f --- /dev/null +++ b/frontend/requests/request_invitation_dialog.css @@ -0,0 +1,14 @@ +.request-invitation__dialog { + max-width: 90%; + border-radius: 0; +} + +.request-invitation__content { + padding: 2.5em 2em; +} + +.request-invitation__title { + display: flex; + text-align: center; + margin: 0 0 1.5em; +} \ No newline at end of file From 8ba89b4720ca9b6bec6088ca03d161807c938fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 15:16:02 -0300 Subject: [PATCH 119/606] Fix request invitation dialog title --- frontend/requests/request_invitation_dialog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/requests/request_invitation_dialog.html b/frontend/requests/request_invitation_dialog.html index 335cb7a90..1429baa53 100644 --- a/frontend/requests/request_invitation_dialog.html +++ b/frontend/requests/request_invitation_dialog.html @@ -1,7 +1,7 @@ - Solicitar vinculo institucional + Solicitar vinculo institucional {{requestInvCtrl.request.institution_name}} From c2f25072af8e35fece9f41bdfa62ff180ff0f547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 15:17:00 -0300 Subject: [PATCH 120/606] Fix request invitation dialog container --- frontend/requests/request_invitation_dialog.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/requests/request_invitation_dialog.html b/frontend/requests/request_invitation_dialog.html index 1429baa53..ba0329314 100644 --- a/frontend/requests/request_invitation_dialog.html +++ b/frontend/requests/request_invitation_dialog.html @@ -1,5 +1,5 @@ - - + + Solicitar vinculo institucional {{requestInvCtrl.request.institution_name}} From 2dfda056df96c7654a95b816dfc39fd98a490efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 16:20:01 -0300 Subject: [PATCH 121/606] Fix request invitation dialog title typo --- frontend/requests/request_invitation_dialog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/requests/request_invitation_dialog.html b/frontend/requests/request_invitation_dialog.html index ba0329314..c7eceff01 100644 --- a/frontend/requests/request_invitation_dialog.html +++ b/frontend/requests/request_invitation_dialog.html @@ -1,7 +1,7 @@ - Solicitar vinculo institucional + Solicitar vínculo institucional {{requestInvCtrl.request.institution_name}} From 11b252a4c6a454ddb97ca4f4378db8cea74925a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 17:24:39 -0300 Subject: [PATCH 122/606] Add is-empty-card component --- frontend/images/desenho-cis.png | Bin 0 -> 63421 bytes frontend/index.html | 4 +++ .../is-empty-card/is-empty-card.component.js | 17 ++++++++++++ .../utils/is-empty-card/is-empty-card.css | 25 ++++++++++++++++++ .../utils/is-empty-card/is-empty-card.html | 4 +++ 5 files changed, 50 insertions(+) create mode 100644 frontend/images/desenho-cis.png create mode 100644 frontend/utils/is-empty-card/is-empty-card.component.js create mode 100644 frontend/utils/is-empty-card/is-empty-card.css create mode 100644 frontend/utils/is-empty-card/is-empty-card.html diff --git a/frontend/images/desenho-cis.png b/frontend/images/desenho-cis.png new file mode 100644 index 0000000000000000000000000000000000000000..958e63f9af8086e54aa65a10f12bd9f7096ec219 GIT binary patch literal 63421 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ðH}L1VzUQy;6)k^Pk0&egSdQi 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

    $BSsDqaeXu_!bA-xbqX*)o4` z2eGFeAY~rGd!7fO6z0?g?X~!r4_F+k=9C2BI@-EISI&Z^_Jy>AMctXz8$z>ZVY!+h z^uvhsSp@&&F%AIz+zO8vpqLIThN{zMgRz@|P@SOoMD0mt5RG8H5NIvE@~$Nvz`31@ zfL~CM3*3Oz;U`or6Fx)W2yZ!;b)wel2>p2oiziBv znr{Jg1XI<5!hXV1*P~zO3sQw^!G;!)azddKR!R?w$^S1XlG~tG6zhiFk@AZ3zTrn# zXamosAzq=nD;FBqtPJG0z5`}E^1>P82cdaipHDB*9u+ICvEL^>4WQ5U+?dIG1{nWs zU!w;kGC;#|{=As$aV>CM&FpV;G`yeWdlJN0Sp6*kY3zXu88s)9W7{yAqHmc?`G)_Z zJMA>xDIn#zZ~BCeo>V0vNhkB*n)XmAo_30|VEc0b&dd1~ckH|GBM3;$(l_&d)LUp( zRB_O=)qqa}K`QOk)A1eydrA~{oN$FJI4=n#$Ya~c`b5-5uQDCrjJ$v*1!1enJmAX$ z>s#*tP6#ad6)otqoG|0_SS{%PD-w_*7v9P)l{&+MPu8G+hFre`9C0q-MV&M-#mQ(% zNZOxiP?#JAOI=*JG>{yAl`a$KF%=+_^h@!#rfU1iGWAMK^pEGDXVs`4Vd9WpCM5%- zzGNvGGRR@69Y}|^Fd`mWJd4?Qb{eSXc7V&d-+?nJE=AYUWeC>=!z4tyvEiYtxbELt zX9q}b*Q*qvkq}quUj?T}R2utKdX4-!d*;kdu-`C|M20jkumsA`hwlOvGbC%ucn9RF zB;-{@JtxVR|A!XST_B~cFrst&X-1Xt*qzgv^L~JpFK-~pb3kior3t;i{O;q+C;A6^ zBrfbGg@~4ly92&Vc@UEhI3UeRRz?JV+0U%@t@ACGL6c_*)^K|2sdP`SGh`mk! z^A33Yg4*RSXfqM@r(vAoUHOaQxOMgnDsR#mLX`wsQB z#?ph^c<#|kN`yqi?&e4bIKbgi#MM^g&$e&M!ihWP^tp)A=aO>y>yi{D4iH~o^_jq- zroqq{(D+YwsIB$+f$?m%)&H_YAUwL$ByzT@FXVki4r#KvTt8D-!|M?QmJE3fqAkfb zb&?yw9j1kmZcj{5w0CqlJcJCh1T=e-z+zv(4jEi{`IqMqi>(mcOvG?;!UGuWUoW|cesM=c4J0%jYbq)mDKp#j&A#xUXvvv6O zF+vCKnkCt-(2YX>Z9~Z15D%5w8x$^=l(*N+Z>IA??<}K#?p&wsP2dKg>0yWuXMaDX za6}U53HbAIDBvJ)mJ(aSb`LgRgZRn&_(9dge1-fOmZDJLjvS-`WF(#gqx*cSRg@s? t)))SIo;hDTs2_a$|L=b-+xv%3!-RRiA6DpRKM9TXrsiFZ5;dEb{{v + @@ -277,5 +278,8 @@ + + + diff --git a/frontend/utils/is-empty-card/is-empty-card.component.js b/frontend/utils/is-empty-card/is-empty-card.component.js new file mode 100644 index 000000000..2c0417dbb --- /dev/null +++ b/frontend/utils/is-empty-card/is-empty-card.component.js @@ -0,0 +1,17 @@ +(function () { + 'use strict'; + + angular.module("app").component("isEmptyCard", { + templateUrl: "app/utils/is-empty-card/is-empty-card.html", + controller: isEmptyCardController, + controllerAs: "isEmptyCardCtrl", + bindings: { + text: "@" + }, + }); + + function isEmptyCardController() { + const isEmptyCardCtrl = this; + } + +})(); \ No newline at end of file diff --git a/frontend/utils/is-empty-card/is-empty-card.css b/frontend/utils/is-empty-card/is-empty-card.css new file mode 100644 index 000000000..fa5d358eb --- /dev/null +++ b/frontend/utils/is-empty-card/is-empty-card.css @@ -0,0 +1,25 @@ +.is-empty-card__container { + display: grid; + grid-template-rows: auto auto; + grid-template-areas: + 'image' + 'text'; + width: 100%; + height: 100%; +} + +.is-empty-card__image { + grid-area: image; + width: 100%; +} + +.is-empty-card__text { + grid-area: text; + display: flex; + font-size: 1.5em; + margin: 1em 0; + padding: 0 0.5em; + font-weight: bold; + color: #009688; + text-align: center; +} \ No newline at end of file diff --git a/frontend/utils/is-empty-card/is-empty-card.html b/frontend/utils/is-empty-card/is-empty-card.html new file mode 100644 index 000000000..0e62794a9 --- /dev/null +++ b/frontend/utils/is-empty-card/is-empty-card.html @@ -0,0 +1,4 @@ +

    + + {{ isEmptyCardCtrl.text }} +
    From 9f3bdd9590b0001b7640c14d32b84e6a72fb20a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Feb 2019 17:37:57 -0300 Subject: [PATCH 123/606] Apply is-empty-card in app --- frontend/event/event.css | 4 ++++ frontend/event/events_mobile.html | 8 ++++---- frontend/notification/notifications_list_mobile.html | 6 +++--- frontend/post/timeline.html | 7 ++----- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/frontend/event/event.css b/frontend/event/event.css index 027165ed0..be7600119 100644 --- a/frontend/event/event.css +++ b/frontend/event/event.css @@ -314,6 +314,10 @@ width: 6em; } + .select-container { + justify-content: center; + } + .create-event-mobile-top-bar { height: 3em; width: 100%; diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index 9b0ea6261..0b26c0156 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -2,7 +2,7 @@
    - + @@ -17,9 +17,9 @@ - -

    Nenhum evento a ser exibido.

    -     + +
    -

    - Nenhuma notificação no momento -

    + +
    diff --git a/frontend/post/timeline.html b/frontend/post/timeline.html index e579e55bc..34bb2272d 100644 --- a/frontend/post/timeline.html +++ b/frontend/post/timeline.html @@ -1,10 +1,7 @@
    - - -

    Esta instituição ainda não possui publicações.

    -     -     + +
    VOCÊ TEM NOVOS POSTS From 0b0d4010a057009ab875041cf316cd403bb24a01 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Fri, 8 Feb 2019 10:10:18 -0300 Subject: [PATCH 124/606] Working --- backend/custom_exceptions/__init__.py | 3 +- .../custom_exceptions/notAllowedException.py | 10 +++++ backend/handlers/__init__.py | 3 +- backend/handlers/event_followers_handler.py | 40 +++++++++++++++++++ backend/main.py | 2 + backend/models/event.py | 32 ++++++++++++++- frontend/event/event.js | 10 +++++ frontend/event/eventDetailsDirective.js | 22 +++++++++- frontend/event/eventService.js | 8 ++++ frontend/event/event_details.html | 8 ++++ 10 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 backend/custom_exceptions/notAllowedException.py create mode 100644 backend/handlers/event_followers_handler.py diff --git a/backend/custom_exceptions/__init__.py b/backend/custom_exceptions/__init__.py index 6c7f0858d..e3d9e3709 100644 --- a/backend/custom_exceptions/__init__.py +++ b/backend/custom_exceptions/__init__.py @@ -5,7 +5,8 @@ from .notAuthorizedException import * from .queryException import * from .queueException import * +from .notAllowedException import * -exceptions = [entityException, fieldException, notAuthorizedException, queryException, queueException] +exceptions = [entityException, fieldException, notAuthorizedException, queryException, queueException, notAllowedException] __all__ = [prop for exception in exceptions for prop in exception.__all__] diff --git a/backend/custom_exceptions/notAllowedException.py b/backend/custom_exceptions/notAllowedException.py new file mode 100644 index 000000000..87368b4b1 --- /dev/null +++ b/backend/custom_exceptions/notAllowedException.py @@ -0,0 +1,10 @@ +"""Not Allowed Exception.""" + +__all__ = ['NotAllowedException'] + +class NotAllowedException(Exception): + """Not Allowed Exception.""" + + def __init__(self, msg=None): + """Init method.""" + super(NotAllowedException, self).__init__(msg or 'Operation not allowed.') \ No newline at end of file diff --git a/backend/handlers/__init__.py b/backend/handlers/__init__.py index a3f6e98a3..f6cb6875d 100644 --- a/backend/handlers/__init__.py +++ b/backend/handlers/__init__.py @@ -42,6 +42,7 @@ from .invite_user_handler import * from .institution_parent_handler import * from .institution_children_handler import * +from .event_followers_handler import * handlers = [ base_handler, erro_handler, event_collection_handler, event_handler, @@ -61,6 +62,6 @@ user_request_collection_handler, user_timeline_handler, vote_handler, invite_hierarchy_collection_handler, invite_user_collection_handler, invite_institution_handler, invite_user_handler, institution_parent_handler, - institution_children_handler] + institution_children_handler, event_followers_handler] __all__ = [prop for handler in handlers for prop in handler.__all__] diff --git a/backend/handlers/event_followers_handler.py b/backend/handlers/event_followers_handler.py new file mode 100644 index 000000000..cc38f28cc --- /dev/null +++ b/backend/handlers/event_followers_handler.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +"""Event Followers Handler.""" +import json +from google.appengine.ext import ndb + +from models import Event +from utils import Utils +from util import login_required +from utils import NotAuthorizedException +from utils import json_response +from . import BaseHandler + +__all__ = ['EventFollowersHandler'] + +class EventFollowersHandler(BaseHandler): + """Event Followers Handler.""" + + @json_response + @login_required + def post(self, user, event_urlsafe): + """.""" + event = ndb.Key(urlsafe=event_urlsafe).get() + + Utils._assert(event.state != 'published', + 'The event is not published', + NotAuthorizedException) + + event.add_follower(user) + + @json_response + @login_required + def delete(self, user, event_urlsafe): + """.""" + event = ndb.Key(urlsafe=event_urlsafe).get() + + Utils._assert(event.state != 'published', + 'The event is not published', + NotAuthorizedException) + + event.remove_follower(user) \ No newline at end of file diff --git a/backend/main.py b/backend/main.py index 4bbdb7f86..76611004f 100644 --- a/backend/main.py +++ b/backend/main.py @@ -45,6 +45,7 @@ from handlers import InviteHandler from handlers import InstitutionParentHandler from handlers import InstitutionChildrenHandler +from handlers import EventFollowersHandler methods = set(webapp2.WSGIApplication.allowed_methods) methods.add('PATCH') @@ -63,6 +64,7 @@ ("/api/requests/(.*)/institution", InstitutionRequestHandler), ("/api/requests/(.*)/institution_parent", InstitutionParentRequestHandler), ("/api/requests/(.*)/institution_children", InstitutionChildrenRequestHandler), + ("/api/events/(.*)/followers", EventFollowersHandler), ("/api/events/(.*)", EventHandler), ("/api/events.*", EventCollectionHandler), ("/api/institutions", InstitutionCollectionHandler), diff --git a/backend/models/event.py b/backend/models/event.py index 5c7679ad2..1013b54bb 100644 --- a/backend/models/event.py +++ b/backend/models/event.py @@ -4,6 +4,7 @@ from google.appengine.ext import ndb from custom_exceptions import FieldException from models import Address +from custom_exceptions import NotAllowedException __all__ = ['Event'] @@ -78,6 +79,8 @@ class Event(ndb.Model): # Local of the event local = ndb.StringProperty(required=True) + followers = ndb.KeyProperty(kind="User", repeated=True) + def isValid(self, is_patch=False): """Check if is valid event.""" date_now = datetime.today() @@ -127,6 +130,7 @@ def create(data, author, institution): event.end_time = datetime.strptime( data.get('end_time'), "%Y-%m-%dT%H:%M:%S") event.address = Address.create(data.get('address')) + event.followers.append(author.key) event.isValid() @@ -161,7 +165,8 @@ def make(event): 'author_key': event.author_key.urlsafe(), 'institution_key': event.institution_key.urlsafe(), 'key': event.key.urlsafe(), - 'institution_acronym': event.institution_acronym + 'institution_acronym': event.institution_acronym, + 'followers': [key.urlsafe() for key in event.followers] } def __setattr__(self, attr, value): @@ -177,3 +182,28 @@ def __setattr__(self, attr, value): if is_attr_data and not is_value_datetime: value = datetime.strptime(value, "%Y-%m-%dT%H:%M:%S") super(Event, self).__setattr__(attr, value) + + def add_follower(self, user): + """Add a subscriber.""" + is_active = user.state == 'active' + is_not_a_follower = not user.key in self.followers + + if is_active and is_not_a_follower: + self.followers.append(user.key) + self.put() + else: + raise NotAllowedException("%s" %(not is_active and "The user is not active" + or not is_not_a_follower and "The user is a follower yet")) + + + def remove_follower(self, user): + """Remove a subscriber.""" + is_a_follower = user.key in self.followers + is_not_the_author = self.author_key != user.key + + if is_a_follower and is_not_the_author: + self.followers.remove(user.key) + self.put() + else: + raise NotAllowedException("%s" %(not is_a_follower and 'The user is not a follower' + or not is_not_the_author and "The user is the author")) diff --git a/frontend/event/event.js b/frontend/event/event.js index 5334477d2..0abfb8aa3 100644 --- a/frontend/event/event.js +++ b/frontend/event/event.js @@ -25,3 +25,13 @@ Event.prototype.convertDate = function(){ } }; +Event.prototype.addFollower = function (userKey) { + this.followers.push(userKey); +}; + +Event.prototype.removeFollower = function (userKey) { + _.remove(this.followers, followerKey => { + return followerKey === userKey; + }); +}; + diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index 9a2e4f9c5..afb51524a 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -148,6 +148,26 @@ return new Date(isoTime).getHours(); }; + eventCtrl.isFollower = () => { + return _.includes(eventCtrl.event.followers, eventCtrl.user.key); + }; + + eventCtrl.addFollower = () => { + EventService.addFollower(eventCtrl.event.key).then(() => { + eventCtrl.event.addFollower(eventCtrl.user.key); + }).catch((error) => { + console.error(error); + }); + }; + + eventCtrl.removeFollower = () => { + EventService.removeFollower(eventCtrl.event.key).then(() => { + eventCtrl.event.removeFollower(eventCtrl.user.key); + }).catch((error) => { + console.error(error); + }); + }; + /** * This function receives the event key, makes a * request to the backend, and returns the event @@ -157,7 +177,7 @@ */ function loadEvent(eventKey) { return EventService.getEvent(eventKey).then(function success(response) { - eventCtrl.event = response; + eventCtrl.event = new Event(response); }, function error(response) { MessageService.showToast(response); $state.go(STATES.HOME); diff --git a/frontend/event/eventService.js b/frontend/event/eventService.js index eb4dd7aa9..d62fa5bb3 100644 --- a/frontend/event/eventService.js +++ b/frontend/event/eventService.js @@ -39,5 +39,13 @@ service.getMonths = function getMonths() { return HttpService.get('app/utils/months.json'); }; + + service.addFollower = function (event) { + return HttpService.post(`/api/events/${event}/followers`); + }; + + service.removeFollower = function (event) { + return HttpService.delete(`/api/events/${event}/followers`); + }; }); })(); \ No newline at end of file diff --git a/frontend/event/event_details.html b/frontend/event/event_details.html index 96cf9314c..bb803eb5f 100644 --- a/frontend/event/event_details.html +++ b/frontend/event/event_details.html @@ -59,6 +59,14 @@

    + visibility + + + visibility_off + From 6b5c24106222b77a82b2e5af7a523e4072aa9ad0 Mon Sep 17 00:00:00 2001 From: ruanres Date: Sun, 10 Feb 2019 20:25:32 -0300 Subject: [PATCH 125/606] added buttons to form --- .../user/editProfile/editProfileController.js | 4 +++ .../user/editProfile/edit_profile_mobile.css | 24 +++++++++++-- .../user/editProfile/edit_profile_mobile.html | 34 ++++++++++++------- 3 files changed, 46 insertions(+), 16 deletions(-) diff --git a/frontend/user/editProfile/editProfileController.js b/frontend/user/editProfile/editProfileController.js index 715a368b0..6440954dc 100644 --- a/frontend/user/editProfile/editProfileController.js +++ b/frontend/user/editProfile/editProfileController.js @@ -18,6 +18,10 @@ profileObserver = ObserverRecorderService.register(editProfileCtrl.user); }; + editProfileCtrl.getInstName = () => { + return Utils.limitString(editProfileCtrl.profile.institution.name, 67); + }; + editProfileCtrl.edit = function edit() { if (isValidProfile()) { var patch = ObserverRecorderService.generate(profileObserver); diff --git a/frontend/user/editProfile/edit_profile_mobile.css b/frontend/user/editProfile/edit_profile_mobile.css index da189187a..d19f6b98e 100644 --- a/frontend/user/editProfile/edit_profile_mobile.css +++ b/frontend/user/editProfile/edit_profile_mobile.css @@ -6,7 +6,8 @@ .edit-profile-dialog__content { padding: 1em; display: grid; - grid-row-gap: 1em; + grid-template-rows: auto 3em auto; + grid-row-gap: 0.7em; } .edit-profile-dialog__content > h3 { @@ -19,6 +20,7 @@ text-align: start; font-size: 0.9em; font-weight: 500; + overflow: hidden; } .edit-profile__form { @@ -28,6 +30,22 @@ margin-top: 1em; } -.edit-profile__form > md-input-container { +.edit-profile__form md-input-container { margin: 0; -} \ No newline at end of file +} + + +.edit-profile__form__phone { + display: grid; + grid-template-columns: 2fr 1fr; +} + +#edit-profile__delete__btn { + background: red; + color: white; +} + +.edit-profile__btns { + display: grid; + grid-template-columns: 1fr 1fr; +} diff --git a/frontend/user/editProfile/edit_profile_mobile.html b/frontend/user/editProfile/edit_profile_mobile.html index fd7472e87..91a1fc7d0 100644 --- a/frontend/user/editProfile/edit_profile_mobile.html +++ b/frontend/user/editProfile/edit_profile_mobile.html @@ -1,30 +1,38 @@

    Editar vínculo

    - {{editProfileCtrl.profile.institution.name}} + {{editProfileCtrl.getInstName()}}
    - - - - - - - - +
    + + + + + + + + +
    + EXCLUIR VÍNCULO +
    + CANCELAR + CONFIRMAR +
    +     \ No newline at end of file From 61586652ee12f39455b43ca3696c6d36e24d2c7c Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 11 Feb 2019 09:11:07 -0300 Subject: [PATCH 126/606] Refactoring html --- frontend/event/eventDetailsDirective.js | 2 ++ frontend/event/event_details.html | 26 ++++++++++++++----------- frontend/sw.js | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index afb51524a..631f0ebe2 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -155,6 +155,7 @@ eventCtrl.addFollower = () => { EventService.addFollower(eventCtrl.event.key).then(() => { eventCtrl.event.addFollower(eventCtrl.user.key); + MessageService.showToast('Você receberá as atualizações desse evento.'); }).catch((error) => { console.error(error); }); @@ -163,6 +164,7 @@ eventCtrl.removeFollower = () => { EventService.removeFollower(eventCtrl.event.key).then(() => { eventCtrl.event.removeFollower(eventCtrl.user.key); + MessageService.showToast('Você não receberá as atualizações desse evento.'); }).catch((error) => { console.error(error); }); diff --git a/frontend/event/event_details.html b/frontend/event/event_details.html index bb803eb5f..3564451de 100644 --- a/frontend/event/event_details.html +++ b/frontend/event/event_details.html @@ -33,7 +33,7 @@

    - + more_vert @@ -46,27 +46,31 @@

    - + share Compartilhar evento - + cancel Cancelar evento + + + visibility + Receber Atualizações + + + + + visibility_off + Deixar de receber atualizações + + - - visibility - - - visibility_off - diff --git a/frontend/sw.js b/frontend/sw.js index 4bca0fe8a..85b463e1b 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'master'; + const CACHE_SUFIX = 'add-interest-in-event'; let messaging; From d528eac757f06bfa5d153e0329bfbd16b8ab6bde Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 11 Feb 2019 09:29:19 -0300 Subject: [PATCH 127/606] Refactoring worker handler --- backend/handlers/like_handler.py | 3 ++- backend/models/post.py | 6 +++++- backend/worker.py | 15 ++++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/backend/handlers/like_handler.py b/backend/handlers/like_handler.py index ddafd8738..33995430c 100644 --- a/backend/handlers/like_handler.py +++ b/backend/handlers/like_handler.py @@ -80,7 +80,8 @@ def post(self, user, post_key, comment_id=None, reply_id=None): 'entity_key': post.key.urlsafe(), 'entity_type': entity_type, 'current_institution': user.current_institution.urlsafe(), - 'sender_institution_key': post.institution.urlsafe() + 'sender_institution_key': post.institution.urlsafe(), + 'field': 'subscribers' } enqueue_task('post-notification', params) diff --git a/backend/models/post.py b/backend/models/post.py index f082a8378..5d5ae9797 100644 --- a/backend/models/post.py +++ b/backend/models/post.py @@ -370,7 +370,11 @@ def create_notification_message(self, user_key, current_institution_key, sender_ current_institution_key=current_institution_key, sender_institution_key=sender_institution_key or current_institution_key ) - + + def __getitem__(self, key): + if key in self.keys(): + return self[key] + super(Post, self).__getitem__(attr, value) @staticmethod def is_hidden(post): diff --git a/backend/worker.py b/backend/worker.py index c1f51e25c..49dc9c114 100644 --- a/backend/worker.py +++ b/backend/worker.py @@ -261,29 +261,30 @@ class PostNotificationHandler(BaseHandler): def post(self): """Handle post requests.""" - post_author_key = self.request.get('receiver_key') + author_key = self.request.get('receiver_key') sender_url_key = self.request.get('sender_key') - post_key = self.request.get('entity_key') + entity_key = self.request.get('entity_key') entity_type = self.request.get('entity_type') current_institution_key = ndb.Key(urlsafe=self.request.get('current_institution')) sender_inst_key = self.request.get('sender_institution_key') and ndb.Key(urlsafe=self.request.get('sender_institution_key')) - post = ndb.Key(urlsafe=post_key).get() + field = self.request.get('field') + entity = ndb.Key(urlsafe=entity_key).get() - notification_message = post.create_notification_message( + notification_message = entity.create_notification_message( ndb.Key(urlsafe=sender_url_key), current_institution_key, sender_inst_key ) - subscribers = [subscriber.urlsafe() for subscriber in post.subscribers] + subscribers = [subscriber.urlsafe() for subscriber in entity[field]] - user_is_author = post_author_key == sender_url_key + user_is_author = author_key == sender_url_key for subscriber in subscribers: subscriber_is_sender = subscriber == sender_url_key if not (user_is_author and subscriber_is_sender) and not subscriber_is_sender: send_message_notification( receiver_key=subscriber, notification_type=entity_type, - entity_key=post_key, + entity_key=entity_key, message=notification_message ) From 2ae5441a40765689381d1bf844f507200f94a94b Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 11 Feb 2019 11:12:30 -0300 Subject: [PATCH 128/606] fix-issues --- feature-toggles/auth/loginController.js | 14 ++- .../test/specs/auth/authServiceSpec.js | 86 ++++++++++++------- .../test/specs/auth/loginControllerSpec.js | 85 ++++++++++++++++-- .../test/specs/user/userServiceSpec.js | 4 - 4 files changed, 137 insertions(+), 52 deletions(-) diff --git a/feature-toggles/auth/loginController.js b/feature-toggles/auth/loginController.js index 01b96b366..42e64ef25 100644 --- a/feature-toggles/auth/loginController.js +++ b/feature-toggles/auth/loginController.js @@ -13,13 +13,11 @@ var redirectPath = $stateParams.redirect; loginCtrl.loginWithGoogle = function loginWithGoogle() { - var promise = AuthService.loginWithGoogle(); - promise.then(function success() { - redirectTo(redirectPath); + return AuthService.loginWithGoogle().then(function success() { + loginCtrl._redirectTo(redirectPath); }).catch(function(error) { MessageService.showToast(error); }); - return promise; }; /** @@ -32,9 +30,9 @@ loginCtrl.loginWithEmailPassword = function loginWithEmailPassword() { - AuthService.loginWithEmailAndPassword(loginCtrl.user.email, loginCtrl.user.password).then( + return AuthService.loginWithEmailAndPassword(loginCtrl.user.email, loginCtrl.user.password).then( function success() { - redirectTo(redirectPath); + loginCtrl._redirectTo(redirectPath); } ).catch(function(error) { MessageService.showToast(error); @@ -42,7 +40,7 @@ }; loginCtrl.redirect = function success() { - redirectTo(redirectPath); + loginCtrl._redirectTo(redirectPath); }; loginCtrl.goToLandingPage = function goToLandingPage() { @@ -53,7 +51,7 @@ loginCtrl.isRequestInvite = !loginCtrl.isRequestInvite; }; - function redirectTo(path) { + loginCtrl._redirectTo = function redirectTo(path) { if (path) { window.location.pathname = path; } else { diff --git a/feature-toggles/test/specs/auth/authServiceSpec.js b/feature-toggles/test/specs/auth/authServiceSpec.js index e5b80d580..24b06fffd 100644 --- a/feature-toggles/test/specs/auth/authServiceSpec.js +++ b/feature-toggles/test/specs/auth/authServiceSpec.js @@ -1,7 +1,7 @@ 'use strict'; (describe('Test AuthService', function() { - let authService, userService, userFactory; + let authService, userService, userFactory, scope; let userTest = { name : 'User', @@ -16,17 +16,18 @@ beforeEach(module('app')); - beforeEach(inject(function(AuthService, UserService, UserFactory) { + beforeEach(inject(function(AuthService, UserService, UserFactory, $rootScope) { authService = AuthService; userService = UserService; userFactory = UserFactory; + scope = $rootScope.$new(); firebase.auth = () => { return { onAuthStateChanged: (callback) => callback(firebaseUser), signOut: function signOut() {} }; - } + }; firebase.auth.GoogleAuthProvider = function GoogleAuthProvider() {}; authService.useOriginalGetUserToken(); @@ -34,7 +35,7 @@ describe('AuthService setupUser', function() { - it('should call authService.setupUser()', function() { + it('should be config user with firebase token', function() { spyOn(userService, 'load').and.callThrough(); authService.setupUser(userTest.accessToken, userTest.emailVerified); @@ -47,42 +48,61 @@ }); describe('AuthService user informations', function() { - beforeEach(function() { - authService.setupUser(userTest.accessToken); - }); - - it('should authService.getCurrentUser()', function() { - spyOn(userService, 'load').and.callThrough(); - authService.setupUser(userTest.accessToken, userTest.emailVerified); - const user = authService.getCurrentUser(); - const new_user = new userFactory.user(userTest); - expect(user).toEqual(new_user); - }); - it('should authService.getUserToken()', function(done) { - spyOn(authService, 'save'); - authService.getUserToken().then(userToken => { - expect(userToken).toEqual(firebaseUser.accessToken); - expect(authService.save).toHaveBeenCalled(); - done(); + describe('test getCurrentUser', function() { + it('should be return user logged', function() { + spyOn(userService, 'load').and.callThrough(); + authService.setupUser(userTest.accessToken, userTest.emailVerified); + const user = authService.getCurrentUser(); + const new_user = new userFactory.user(userTest); + expect(user).toEqual(new_user); }); }); - - it('should authService.isLoggedIn()', function() { - const isLoggedIn = authService.isLoggedIn(); - expect(isLoggedIn).toEqual(true); + + describe('test getUserToken', function() { + it('should be return actualized user token', function(done) { + spyOn(authService, 'save'); + const user = { + accessToken: firebaseUser.accessToken, + getIdToken: async () => user.accessToken + }; + + authService._getIdToken(user); + authService.getUserToken().then(userToken => { + expect(userToken).toEqual(firebaseUser.accessToken); + expect(authService.save).toHaveBeenCalled(); + done(); + }); + + scope.$apply(); + }); }); - it('should authService.save()', function() { - spyOn(userService, 'load').and.callThrough(); - authService.setupUser(userTest.accessToken, userTest.emailVerified); + describe('test isLoggedIn', function() { + it('should br return true', function() { + const isLoggedIn = authService.isLoggedIn(); + expect(isLoggedIn).toEqual(true); + }); - window.localStorage.userInfo = null; - authService.save(); - const userCache = window.localStorage.userInfo; - const new_user = JSON.stringify(userTest); + it('should br return false', function() { + authService.logout(); + const isLoggedIn = authService.isLoggedIn(); + expect(isLoggedIn).toEqual(false); + }); + }); - expect(userCache).toEqual(new_user); + describe('test save', function() { + it('should be saev user in localStorage', function() { + spyOn(userService, 'load').and.callThrough(); + authService.setupUser(userTest.accessToken, userTest.emailVerified); + + window.localStorage.userInfo = null; + authService.save(); + const userCache = window.localStorage.userInfo; + const new_user = JSON.stringify(userTest); + + expect(userCache).toEqual(new_user); + }); }); }); diff --git a/feature-toggles/test/specs/auth/loginControllerSpec.js b/feature-toggles/test/specs/auth/loginControllerSpec.js index 88850447c..1aac93b06 100644 --- a/feature-toggles/test/specs/auth/loginControllerSpec.js +++ b/feature-toggles/test/specs/auth/loginControllerSpec.js @@ -2,7 +2,7 @@ (describe('Test LoginController', function() { - let logginCtrl, httpBackend, scope, createCtrl, state, authService, states; + let logginCtrl, httpBackend, scope, createCtrl, state, authService, states, q, messageService; const user = { name: 'Tiago', @@ -11,21 +11,19 @@ beforeEach(module('app')); - beforeEach(inject(function($controller, $httpBackend, $rootScope, STATES, $state, AuthService) { + beforeEach(inject(function($controller, $httpBackend, $rootScope, STATES, $state, AuthService, $q, MessageService) { httpBackend = $httpBackend; scope = $rootScope.$new(); state = $state; states = STATES; authService = AuthService; - - httpBackend.when('GET', "main/main.html").respond(200); - - httpBackend.when('GET', "home/home.html").respond(200); + q = $q; + messageService = MessageService; authService.login(user); spyOn(authService, 'isLoggedIn').and.callThrough(); - spyOn(state, 'go').and.callThrough(); + httpBackend.when('GET', '/signin').respond(200); createCtrl = function() { return $controller('LoginController', { @@ -44,10 +42,19 @@ describe('main()', function() { it('should change state to manage_features if user is loggedIn', function() { + spyOn(state, 'go').and.callThrough(); logginCtrl.$onInit(); expect(authService.isLoggedIn).toHaveBeenCalled(); expect(state.go).toHaveBeenCalledWith(states.MANAGE_FEATURES); }); + + it('should not call state.go if user is not loggedIn', function() { + authService.logout(); + spyOn(state, 'go').and.callThrough(); + logginCtrl.$onInit(); + expect(authService.isLoggedIn).toHaveBeenCalled(); + expect(state.go).not.toHaveBeenCalled(); + }); }); describe('isLoadingUser()', function() { @@ -61,4 +68,68 @@ expect(logginCtrl.isLoadingUser()).toBe(false); }); }); + + describe('test loginWithGoogle', function() { + it('Should be call state.go if login is successful', function(done) { + spyOn(authService, 'loginWithGoogle').and.callFake(function() { + return q.when(); + }); + spyOn(state, 'go'); + + logginCtrl.loginWithGoogle().then(function() { + expect(authService.loginWithGoogle).toHaveBeenCalled(); + expect(state.go).toHaveBeenCalled(); + done(); + }); + + scope.$apply(); + }); + + it('Should be call messageService.showToast if login is not successful', function(done) { + spyOn(authService, 'loginWithGoogle').and.callFake(function() { + return q.reject('Login failed'); + }); + spyOn(messageService, 'showToast'); + + logginCtrl.loginWithGoogle().then(function() { + expect(authService.loginWithGoogle).toHaveBeenCalled(); + expect(messageService.showToast).toHaveBeenCalledWith('Login failed'); + done(); + }); + + scope.$apply(); + }); + }); + + describe('test loginWithEmailPassword', function() { + it('Should be call state.go if login is successful', function(done) { + spyOn(authService, 'loginWithEmailAndPassword').and.callFake(function() { + return q.when(); + }); + spyOn(state, 'go'); + + logginCtrl.loginWithEmailPassword().then(function() { + expect(authService.loginWithEmailAndPassword).toHaveBeenCalledWith(logginCtrl.user.email, logginCtrl.user.password); + expect(state.go).toHaveBeenCalled(); + done(); + }); + + scope.$apply(); + }); + + it('Should be call messageService.showToast if login is not successful', function(done) { + spyOn(authService, 'loginWithEmailAndPassword').and.callFake(function() { + return q.reject('Login failed'); + }); + spyOn(messageService, 'showToast'); + + logginCtrl.loginWithEmailPassword().then(function() { + expect(authService.loginWithEmailAndPassword).toHaveBeenCalledWith(logginCtrl.user.email, logginCtrl.user.password); + expect(messageService.showToast).toHaveBeenCalledWith('Login failed'); + done(); + }); + + scope.$apply(); + }); + }); })); \ No newline at end of file diff --git a/feature-toggles/test/specs/user/userServiceSpec.js b/feature-toggles/test/specs/user/userServiceSpec.js index e78548180..4ab83be3e 100644 --- a/feature-toggles/test/specs/user/userServiceSpec.js +++ b/feature-toggles/test/specs/user/userServiceSpec.js @@ -32,10 +32,6 @@ scope = $rootScope.$new(); service = UserService; AuthService.login(user); - httpBackend.when('GET', 'main/main.html').respond(200); - httpBackend.when('GET', 'home/home.html').respond(200); - httpBackend.when('GET', 'error/error.html').respond(200); - httpBackend.when('GET', 'auth/login.html').respond(200); })); afterEach(function() { From 7d90eab1ecba4d10051ce2b95d338e6447f3f08b Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 11 Feb 2019 11:21:04 -0300 Subject: [PATCH 129/606] remove unused function --- feature-toggles/auth/loginController.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/feature-toggles/auth/loginController.js b/feature-toggles/auth/loginController.js index 42e64ef25..2c094dd65 100644 --- a/feature-toggles/auth/loginController.js +++ b/feature-toggles/auth/loginController.js @@ -47,10 +47,6 @@ $window.open(Config.LANDINGPAGE_URL, '_self'); }; - loginCtrl.requestInvite = function requestInvite() { - loginCtrl.isRequestInvite = !loginCtrl.isRequestInvite; - }; - loginCtrl._redirectTo = function redirectTo(path) { if (path) { window.location.pathname = path; From 7d4a87c76a22c2080feda9204e8e652120a667ef Mon Sep 17 00:00:00 2001 From: ruanres Date: Mon, 11 Feb 2019 11:41:19 -0300 Subject: [PATCH 130/606] moved remove profile function from configProfileController to profile service --- .../configProfile/configProfileController.js | 62 +---------------- .../user/configProfile/config_profile.html | 2 +- .../user/editProfile/editProfileController.js | 4 ++ .../user/editProfile/edit_profile_mobile.html | 8 +-- frontend/user/profileService.js | 66 ++++++++++++++++++- 5 files changed, 75 insertions(+), 67 deletions(-) diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index 8be933e59..ad020dcdc 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -3,7 +3,7 @@ (function () { const app = angular.module("app"); - app.controller("ConfigProfileController", function ConfigProfileController($state, STATES, $stateParams, + app.controller("ConfigProfileController", function ConfigProfileController($state, STATES, $stateParams, ProfileService, CropImageService, AuthService, UserService, ImageService, $rootScope, SCREEN_SIZES, MessageService, $mdDialog, ObserverRecorderService) { const configProfileCtrl = this; @@ -13,15 +13,6 @@ configProfileCtrl.cpfRegex = /^\d{3}\.\d{3}\.\d{3}\-\d{2}$/; configProfileCtrl.loadingSubmission = false; - const HAS_ONLY_ONE_INSTITUTION_MSG = "Esta é a única instituição ao qual você é vinculado." + - " Ao remover o vínculo você não poderá mais acessar o sistema," + - " exceto por meio de novo convite. Deseja remover?"; - - const HAS_MORE_THAN_ONE_INSTITUTION_MSG = "Ao remover o vínculo com esta instituição," + - " você deixará de ser membro" + - " e não poderá mais publicar na mesma," + - " no entanto seus posts existentes serão mantidos. Deseja remover?"; - const DELETE_ACCOUNT_ALERT = "Ao excluir sua conta você não poderá mais acessar o sistema," + "exceto por meio de novo convite. Deseja realmente excluir sua conta?"; @@ -133,27 +124,8 @@ }); }; - configProfileCtrl.removeInstitution = function removeInstitution(event, institution) { - if (!isAdmin(institution.key)) { - const confirm = $mdDialog.confirm(); - confirm - .clickOutsideToClose(false) - .title('Remover vínculo com ' + institution.name) - .textContent(hasMoreThanOneInstitution() ? HAS_MORE_THAN_ONE_INSTITUTION_MSG : HAS_ONLY_ONE_INSTITUTION_MSG) - .ariaLabel('Remover instituicao') - .targetEvent(event) - .ok('Sim') - .cancel('Não'); - const promise = $mdDialog.show(confirm); - promise.then(function () { - deleteInstitution(institution.key); - }, function () { - MessageService.showToast('Cancelado'); - }); - return promise; - } else { - MessageService.showToast('Desvínculo não permitido. Você é administrador dessa instituição.'); - } + configProfileCtrl.removeProfile = (event, institution) => { + ProfileService.removeProfile(event, institution); }; configProfileCtrl.editProfile = function editProfile(profile, event) { @@ -172,34 +144,6 @@ }); }; - function isAdmin(institution_key) { - return configProfileCtrl.newUser.isAdmin(institution_key); - } - - function hasMoreThanOneInstitution() { - return _.size(configProfileCtrl.user.institutions) > 1; - } - - function deleteInstitution(institution_key) { - return new Promise(resolve => { - UserService.deleteInstitution(institution_key) - .then(_ => { - removeConection(institution_key); - resolve(); - }); - }); - } - - function removeConection(institution_key) { - if (_.size(configProfileCtrl.user.institutions) > 1) { - configProfileCtrl.user.removeInstitution(institution_key); - configProfileCtrl.user.removeProfile(institution_key); - AuthService.save(); - } else { - AuthService.logout(); - } - } - function isAdminOfAnyInstitution() { return !_.isEmpty(configProfileCtrl.user.institutions_admin); } diff --git a/frontend/user/configProfile/config_profile.html b/frontend/user/configProfile/config_profile.html index 4885a7f35..1c23abd23 100644 --- a/frontend/user/configProfile/config_profile.html +++ b/frontend/user/configProfile/config_profile.html @@ -75,7 +75,7 @@

    edit + ng-click="configProfileCtrl.removeProfile($event, profile.institution)" md-colors="{background: 'light-green'}"> delete

    diff --git a/frontend/user/editProfile/editProfileController.js b/frontend/user/editProfile/editProfileController.js index 6440954dc..7ae754bf6 100644 --- a/frontend/user/editProfile/editProfileController.js +++ b/frontend/user/editProfile/editProfileController.js @@ -38,6 +38,10 @@ } }; + editProfileCtrl.removeProfile = (event) => { + ProfileService.removeProfile(event, profile.institution); + }; + editProfileCtrl.closeDialog = function closeDialog() { const indexOfProfile = editProfileCtrl.user.institution_profiles.indexOf(editProfileCtrl.profile); editProfileCtrl.user.institution_profiles[indexOfProfile] = oldProfile; diff --git a/frontend/user/editProfile/edit_profile_mobile.html b/frontend/user/editProfile/edit_profile_mobile.html index 91a1fc7d0..edfc1d3c7 100644 --- a/frontend/user/editProfile/edit_profile_mobile.html +++ b/frontend/user/editProfile/edit_profile_mobile.html @@ -24,14 +24,14 @@

    Editar vínculo

    - +
    - EXCLUIR VÍNCULO + EXCLUIR VÍNCULO
    - CANCELAR - CONFIRMAR + CANCELAR + CONFIRMAR
    diff --git a/frontend/user/profileService.js b/frontend/user/profileService.js index c33c5f3a8..282079cee 100644 --- a/frontend/user/profileService.js +++ b/frontend/user/profileService.js @@ -5,8 +5,19 @@ var USER_URI = '/api/user'; - app.service("ProfileService", function UserService($mdDialog, HttpService, $q, AuthService) { - var service = this; + app.service("ProfileService", function ProfileService($mdDialog, HttpService, AuthService, MessageService, UserService) { + const service = this; + + const HAS_ONLY_ONE_INSTITUTION_MSG = "Esta é a única instituição ao qual você é vinculado." + + " Ao remover o vínculo você não poderá mais acessar o sistema," + + " exceto por meio de novo convite. Deseja remover?"; + + const HAS_MORE_THAN_ONE_INSTITUTION_MSG = "Ao remover o vínculo com esta instituição," + + " você deixará de ser membro" + + " e não poderá mais publicar na mesma," + + " no entanto seus posts existentes serão mantidos. Deseja remover?"; + + const user = AuthService.getCurrentUser(); service.showProfile = function showProfile(userKey, ev, institutionKey) { $mdDialog.show({ @@ -16,7 +27,7 @@ controllerAs: "profileCtrl", locals: { user: userKey, - currentUserKey: AuthService.getCurrentUser().key, + currentUserKey: user.key, institutionKey: institutionKey }, targetEvent: ev, @@ -29,5 +40,54 @@ return HttpService.patch(USER_URI, data); }; + service.removeProfile = (event, institution) => { + if (!isAdmin(institution)) { + const confirm = $mdDialog.confirm(); + confirm + .clickOutsideToClose(false) + .title('Remover vínculo com ' + institution.name) + .textContent(hasMoreThanOneInstitution() ? HAS_MORE_THAN_ONE_INSTITUTION_MSG : HAS_ONLY_ONE_INSTITUTION_MSG) + .ariaLabel('Remover instituicao') + .targetEvent(event) + .ok('Sim') + .cancel('Não'); + const promise = $mdDialog.show(confirm); + promise.then(function () { + deleteInstitution(institution.key); + }, function () { + MessageService.showToast('Cancelado'); + }); + return promise; + } else { + MessageService.showToast('Desvínculo não permitido. Você é administrador dessa instituição.'); + } + }; + + const isAdmin = institution => user.isAdmin(institution.key); + + const deleteInstitution = (institution_key) => { + return new Promise(resolve => { + UserService.deleteInstitution(institution_key) + .then(_ => { + removeConection(institution_key); + resolve(); + }); + }); + }; + + const removeConection = (institution_key) => { + if (_.size(user.institutions) > 1) { + user.removeInstitution(institution_key); + user.removeProfile(institution_key); + AuthService.save(); + } else { + AuthService.logout(); + } + } + + const hasMoreThanOneInstitution = () => { + return user.institutions.length > 1; + }; + }); })(); \ No newline at end of file From f8236bc8130c79e2b8a5cd833ac526461d7d0036 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Mon, 11 Feb 2019 11:46:14 -0300 Subject: [PATCH 131/606] create dialog --- frontend/app.js | 11 +++- frontend/institution/base_institution.css | 10 ++++ .../base_institution_page_mobile.html | 5 +- frontend/institution/description_inst.html | 6 +++ frontend/institution/editDescription.html | 11 ++++ frontend/institution/institutionController.js | 50 ++++++++++++++++++- .../institutionHeader.component.js | 16 ++++++ frontend/institution/institution_header.html | 5 +- frontend/institution/timeline_inst.html | 2 +- frontend/utils/hideNavbar.js | 3 +- frontend/utils/statesConstants.js | 1 + 11 files changed, 111 insertions(+), 9 deletions(-) create mode 100644 frontend/institution/description_inst.html create mode 100644 frontend/institution/editDescription.html diff --git a/frontend/app.js b/frontend/app.js index d3766ec6a..c6c12e72a 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -164,6 +164,15 @@ } } }) + .state(STATES.INST_DESCRIPTION, { + url: "/institution/:institutionKey/description", + views: { + institution_content: { + templateUrl: "app/institution/description_inst.html", + controller: "DescriptionInstController as descriptionCtrl" + } + } + }) .state(STATES.INST_EVENTS, { url: "/institution/:institutionKey/institution_events", views: { @@ -568,6 +577,6 @@ } (function main() { - initServiceWorker(); + //initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/institution/base_institution.css b/frontend/institution/base_institution.css index a295ab194..f030daa0d 100644 --- a/frontend/institution/base_institution.css +++ b/frontend/institution/base_institution.css @@ -19,6 +19,16 @@ padding: 5px; } +.description-inst{ + padding: 0px 1.5em; +} + +.base-content-inst{ + height: 100%; + position: absolute; + width: 100%; +} + .timeline-z-index{ z-index: 1; } diff --git a/frontend/institution/base_institution_page_mobile.html b/frontend/institution/base_institution_page_mobile.html index 7f10283f2..912e57bef 100644 --- a/frontend/institution/base_institution_page_mobile.html +++ b/frontend/institution/base_institution_page_mobile.html @@ -1,4 +1,4 @@ - +
    @@ -26,7 +26,8 @@
    -
    +
    diff --git a/frontend/institution/description_inst.html b/frontend/institution/description_inst.html new file mode 100644 index 000000000..95a2de142 --- /dev/null +++ b/frontend/institution/description_inst.html @@ -0,0 +1,6 @@ +
    + +
    +

    {{descriptionCtrl.institution.description}}

    +
    +
    \ No newline at end of file diff --git a/frontend/institution/editDescription.html b/frontend/institution/editDescription.html new file mode 100644 index 000000000..69b683fd9 --- /dev/null +++ b/frontend/institution/editDescription.html @@ -0,0 +1,11 @@ +
    + + + + + + CONFIRMAR + +
    \ No newline at end of file diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index 18b9c3cab..1d872a49f 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -112,13 +112,14 @@ function loadTimelineButtonsHeaderMob(){ institutionCtrl.timelineButtonsHeaderMob = { goBack: institutionCtrl.goBack, - showDescribe: null, + goToDescription: institutionCtrl.goToDescription, follow: institutionCtrl.follow, unfollow: institutionCtrl.unfollow, cropImage: institutionCtrl.cropImage, showImageCover: institutionCtrl.showImageCover, requestInvitation: institutionCtrl.requestInvitation, - getLimitedName: institutionCtrl.getLimitedName + getLimitedName: institutionCtrl.getLimitedName, + editDescription: institutionCtrl.editDescription } } @@ -206,6 +207,11 @@ $state.go(STATES.INST_TIMELINE, {institutionKey: instKey}); }; + institutionCtrl.goToDescription = function goToDescription(institutionKey) { + const instKey = institutionKey || currentInstitutionKey; + $state.go(STATES.INST_DESCRIPTION, {institutionKey: instKey}); + }; + institutionCtrl.goToMembers = function goToMembers(institutionKey) { UtilsService.selectNavOption(STATES.INST_MEMBERS, {institutionKey: institutionKey}); }; @@ -262,6 +268,20 @@ }); }; + institutionCtrl.editDescription = function(ev) { + $mdDialog.show({ + templateUrl: 'app/institution/editDescription.html', + targetEvent: ev, + clickOutsideToClose:true, + locals: { + institution: institutionCtrl.institution, + save: institutionCtrl.saveChanges + }, + controller: InstitutionController, + controllerAs: 'ctrl' + }); + }; + institutionCtrl.openWebsite = function openWebsite() { var website = institutionCtrl.institution.website_url; website = Utils.addHttpsToUrl(website, [website]); @@ -468,4 +488,30 @@ followersCtrl._getFollowers(); }; }); + + app.controller("DescriptionInstController", function DescriptionInstController($state, InstitutionService, ObserverRecorderService){ + const descriptionCtrl = this; + let observer; + + descriptionCtrl.isLoading = false; + descriptionCtrl.$onInit = () => { + descriptionCtrl.currentInstitutionKey = $state.params.institutionKey; + descriptionCtrl.isLoading = true; + InstitutionService.getInstitution(descriptionCtrl.currentInstitutionKey).then(function(institution){ + descriptionCtrl.institution = institution; + descriptionCtrl.isLoading = false; + observer = ObserverRecorderService.register(descriptionCtrl.institution); + }) + }; + + function patchIntitution() { + var patch = ObserverRecorderService.generate(observer); + InstitutionService.update(descriptionCtrl.currentInstitutionKey, patch).then( + /*function success() { + if(configInstCtrl.newInstitution) + updateUserInstitutions(configInstCtrl.newInstitution);}*/ + ); + } + + }); })(); \ No newline at end of file diff --git a/frontend/institution/institutionHeader.component.js b/frontend/institution/institutionHeader.component.js index 3ffaba663..0f52ee08b 100644 --- a/frontend/institution/institutionHeader.component.js +++ b/frontend/institution/institutionHeader.component.js @@ -33,6 +33,13 @@ return $state.current.name == STATES.INST_REGISTRATION_DATA; } + /** Return if current state is registration data on institution. + * + */ + instHeaderCtrl.isDescription = function isDescription(){ + return $state.current.name == STATES.INST_DESCRIPTION; + } + /** Return the title of page according current state. */ instHeaderCtrl.getTitle = function getTitle(){ @@ -42,11 +49,20 @@ [STATES.INST_TIMELINE]: getLimitedName, [STATES.INST_REGISTRATION_DATA]: "Dados cadastrais", [STATES.INST_LINKS]: "Vínculos Institucionais", + [STATES.INST_DESCRIPTION]: "Descrição", [STATES.INST_MEMBERS]: "Membros", [STATES.INST_FOLLOWERS]: "Seguidores" }; return tileState[$state.current.name]; } + + instHeaderCtrl.showButtonEdit = function showButtonEdit(){ + return instHeaderCtrl.isRegistrationData() || instHeaderCtrl.isDescription(); + } + + instHeaderCtrl.editInfo = function editInfo(){ + if(instHeaderCtrl.isDescription())instHeaderCtrl.actionsButtons.editDescription(); + } }], controllerAs: "instHeaderCtrl", bindings: { diff --git a/frontend/institution/institution_header.html b/frontend/institution/institution_header.html index cb169eafb..8fbace53c 100644 --- a/frontend/institution/institution_header.html +++ b/frontend/institution/institution_header.html @@ -7,7 +7,7 @@
    + id="btn-description" ng-click="instHeaderCtrl.actionsButtons.goToDescription()"> DESCRIÇÃO
    @@ -42,7 +42,8 @@ - EDITAR diff --git a/frontend/institution/timeline_inst.html b/frontend/institution/timeline_inst.html index 3ec2a84fc..96d9c23bc 100644 --- a/frontend/institution/timeline_inst.html +++ b/frontend/institution/timeline_inst.html @@ -4,7 +4,7 @@
    -
    +
    diff --git a/frontend/utils/hideNavbar.js b/frontend/utils/hideNavbar.js index 4191b9006..c00ee6aa9 100644 --- a/frontend/utils/hideNavbar.js +++ b/frontend/utils/hideNavbar.js @@ -11,7 +11,8 @@ scope.bottomToolbar = document.getElementById('navbar-bottom'); scope.INSTITUTION_STATES = [ STATES.INST_TIMELINE, STATES.INST_FOLLOWERS, STATES.INST_EVENTS, - STATES.INST_MEMBERS, STATES.INST_REGISTRATION_DATA, STATES.INST_LINKS + STATES.INST_MEMBERS, STATES.INST_REGISTRATION_DATA, STATES.INST_LINKS, + STATES.INST_DESCRIPTION ]; scope.STATES_WITHOUT_BOTTOM_TOOLBAR = [ STATES.CREATE_EVENT diff --git a/frontend/utils/statesConstants.js b/frontend/utils/statesConstants.js index 46a0d8d44..5c74d2543 100644 --- a/frontend/utils/statesConstants.js +++ b/frontend/utils/statesConstants.js @@ -16,6 +16,7 @@ NOTIFICATION: "app.user.notifications", INSTITUTION: "app.institution", INST_TIMELINE: "app.institution.timeline", + INST_DESCRIPTION: "app.institution.description", INST_FOLLOWERS: "app.institution.followers", INST_EVENTS: "app.institution.events", INST_MEMBERS: "app.institution.members", From d755573c4d0aa3f606d9b7d373b30b4d347e27ea Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 11 Feb 2019 12:35:58 -0300 Subject: [PATCH 132/606] fix-issues --- feature-toggles/test/specs/auth/authServiceSpec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/feature-toggles/test/specs/auth/authServiceSpec.js b/feature-toggles/test/specs/auth/authServiceSpec.js index 24b06fffd..c93de01ff 100644 --- a/feature-toggles/test/specs/auth/authServiceSpec.js +++ b/feature-toggles/test/specs/auth/authServiceSpec.js @@ -79,12 +79,12 @@ }); describe('test isLoggedIn', function() { - it('should br return true', function() { + it('should be return true', function() { const isLoggedIn = authService.isLoggedIn(); expect(isLoggedIn).toEqual(true); }); - it('should br return false', function() { + it('should be return false', function() { authService.logout(); const isLoggedIn = authService.isLoggedIn(); expect(isLoggedIn).toEqual(false); @@ -92,7 +92,7 @@ }); describe('test save', function() { - it('should be saev user in localStorage', function() { + it('should be save user in localStorage', function() { spyOn(userService, 'load').and.callThrough(); authService.setupUser(userTest.accessToken, userTest.emailVerified); From d46d4bb8763ecb24b74cc3f052edaa47bc2d2b44 Mon Sep 17 00:00:00 2001 From: ruanres Date: Mon, 11 Feb 2019 13:31:47 -0300 Subject: [PATCH 133/606] implemented the goToUserProfilePage function from profileController --- frontend/user/configProfile/config_profile_mobile.html | 2 +- frontend/user/profileController.js | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/frontend/user/configProfile/config_profile_mobile.html b/frontend/user/configProfile/config_profile_mobile.html index 3f5c83662..5bc35381c 100644 --- a/frontend/user/configProfile/config_profile_mobile.html +++ b/frontend/user/configProfile/config_profile_mobile.html @@ -1,4 +1,4 @@ - +
    close diff --git a/frontend/user/profileController.js b/frontend/user/profileController.js index 94486b546..a66d91fec 100644 --- a/frontend/user/profileController.js +++ b/frontend/user/profileController.js @@ -34,12 +34,9 @@ $mdDialog.cancel(); }; - profileCtrl.goToUserProfilePage = (userKey) => { - /** - * TODO: implements this function to go to the user profile page - * when the same be implemented - * @tiagolimpe - Jan - 23 - 2019 - */ + profileCtrl.goToUserProfilePage = () => { + $state.go(STATES.CONFIG_PROFILE, {userKey: profileCtrl.user.key}); + $mdDialog.hide(); }; profileCtrl.isOwnProfile = function isOwnProfile() { From d415b89c280c1a80350fdfce32f57c4f84ba4dc1 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 11 Feb 2019 14:43:14 -0300 Subject: [PATCH 134/606] Sending notification when the event is deleted or updated --- backend/handlers/event_handler.py | 27 +++++++++++++++++++ backend/models/event.py | 19 +++++++++++++ backend/models/post.py | 4 +-- backend/service_messages.py | 2 +- backend/worker.py | 4 ++- .../notificationMessageCreatorService.js | 10 ++++--- frontend/notification/notificationService.js | 3 ++- .../notifications_type.constant.js | 6 +++++ 8 files changed, 66 insertions(+), 9 deletions(-) diff --git a/backend/handlers/event_handler.py b/backend/handlers/event_handler.py index 8ea7f5ab4..487719898 100644 --- a/backend/handlers/event_handler.py +++ b/backend/handlers/event_handler.py @@ -10,6 +10,7 @@ from utils import json_response from util import JsonPatch from . import BaseHandler +from service_entities import enqueue_task __all__ = ['EventHandler'] @@ -56,6 +57,19 @@ def delete(self, user, event_urlsafe): event.last_modified_by_name = user.name event.put() + params = { + 'receiver_key': event.author_key.urlsafe(), + 'sender_key': user.key.urlsafe(), + 'entity_key': event.key.urlsafe(), + 'entity_type': 'DELETED_EVENT', + 'current_institution': user.current_institution.urlsafe(), + 'sender_institution_key': event.institution_key.urlsafe(), + 'field': 'followers', + 'title': event.title + } + + enqueue_task('post-notification', params) + @json_response @login_required def patch(self, user, event_urlsafe): @@ -85,3 +99,16 @@ def patch(self, user, event_urlsafe): """Update event.""" event.put() + + params = { + 'receiver_key': event.author_key.urlsafe(), + 'sender_key': user.key.urlsafe(), + 'entity_key': event.key.urlsafe(), + 'entity_type': 'UPDATED_EVENT', + 'current_institution': user.current_institution.urlsafe(), + 'sender_institution_key': event.institution_key.urlsafe(), + 'field': 'followers', + 'title': event.title + } + + enqueue_task('post-notification', params) diff --git a/backend/models/event.py b/backend/models/event.py index 1013b54bb..642e38300 100644 --- a/backend/models/event.py +++ b/backend/models/event.py @@ -5,6 +5,7 @@ from custom_exceptions import FieldException from models import Address from custom_exceptions import NotAllowedException +from service_messages import create_message __all__ = ['Event'] @@ -207,3 +208,21 @@ def remove_follower(self, user): else: raise NotAllowedException("%s" %(not is_a_follower and 'The user is not a follower' or not is_not_the_author and "The user is the author")) + + def create_notification_message(self, user_key, current_institution_key, sender_institution_key=None): + """ Create message that will be used in notification. + user_key -- The user key that made the action. + current_institution_key -- The institution that user was in the moment that made the action. + sender_institution_key -- The institution by which the post was created, + if it hasn't been defined yet, the sender institution should be the current institution. + """ + return create_message( + sender_key= user_key, + current_institution_key=current_institution_key, + sender_institution_key=sender_institution_key or current_institution_key + ) + + def __getitem__(self, key): + if key in self.to_dict(): + return self.to_dict()[key] + super(Event, self).__getitem__(attr, value) diff --git a/backend/models/post.py b/backend/models/post.py index 5d5ae9797..58b943d26 100644 --- a/backend/models/post.py +++ b/backend/models/post.py @@ -372,8 +372,8 @@ def create_notification_message(self, user_key, current_institution_key, sender_ ) def __getitem__(self, key): - if key in self.keys(): - return self[key] + if key in self.to_dict(): + return self.to_dict()[key] super(Post, self).__getitem__(attr, value) @staticmethod diff --git a/backend/service_messages.py b/backend/service_messages.py index 44221f6ff..b6c68c088 100644 --- a/backend/service_messages.py +++ b/backend/service_messages.py @@ -61,7 +61,7 @@ def create_system_message(receiver_institution_key=None): def create_entity(entity_key): """Create a short entity with only key.""" entity = { - "key": entity_key + "key": entity_key, } return json.dumps(entity) diff --git a/backend/worker.py b/backend/worker.py index 49dc9c114..0c57b99c2 100644 --- a/backend/worker.py +++ b/backend/worker.py @@ -269,6 +269,7 @@ def post(self): sender_inst_key = self.request.get('sender_institution_key') and ndb.Key(urlsafe=self.request.get('sender_institution_key')) field = self.request.get('field') entity = ndb.Key(urlsafe=entity_key).get() + entity_title = self.request.get('title') or None notification_message = entity.create_notification_message( ndb.Key(urlsafe=sender_url_key), @@ -285,7 +286,8 @@ def post(self): receiver_key=subscriber, notification_type=entity_type, entity_key=entity_key, - message=notification_message + message=notification_message, + entity={'key': entity_key, 'title': entity_title} ) diff --git a/frontend/notification/notificationMessageCreatorService.js b/frontend/notification/notificationMessageCreatorService.js index c08b39299..fac5fb33e 100644 --- a/frontend/notification/notificationMessageCreatorService.js +++ b/frontend/notification/notificationMessageCreatorService.js @@ -47,16 +47,18 @@ 'DELETED_USER': messageCreator('Removeu sua conta na Plataforma Virtual CIS', NO_INST), 'ADD_ADM_PERMISSIONS': messageCreator('Suas permissões hierárquicas foram atualizadas na instituição ', SINGLE_INST), 'USER_INVITES_SENT': messageCreator('Todos os convites para novos membros foram enviados', NO_INST), - 'RE_ADD_ADM_PERMISSIONS': messageCreator('O vínculo foi restabelecido entre ', DOUBLE_INST) + 'RE_ADD_ADM_PERMISSIONS': messageCreator('O vínculo foi restabelecido entre ', DOUBLE_INST), + 'DELETED_EVENT': messageCreator('Removeu o evento de título ', NO_INST), + 'UPDATED_EVENT': messageCreator('Atualizou o evento de título ', NO_INST) }; - service.assembleMessage = function assembleMessage(entity_type, mainInst, otherInst) { + service.assembleMessage = function assembleMessage(entity_type, mainInst, otherInst, title) { var assembler = MESSAGE_ASSEMBLERS[entity_type]; - return assembler(mainInst, otherInst); + return assembler(mainInst, otherInst) + title || ''; }; - function messageCreator(message, notificationType) { + function messageCreator(message, notificationType, title) { return function (mainInst, otherInst) { switch(notificationType) { case DOUBLE_INST: diff --git a/frontend/notification/notificationService.js b/frontend/notification/notificationService.js index 974719fdd..eca37b748 100644 --- a/frontend/notification/notificationService.js +++ b/frontend/notification/notificationService.js @@ -25,7 +25,8 @@ * DATE: 10/05/2018 */ var otherInst = (notification.to && notification.to.institution_name) || notification.from.institution_name; - var message = NotificationMessageCreatorService.assembleMessage(entity_type, mainInst, otherInst); + console.log(notification); + var message = NotificationMessageCreatorService.assembleMessage(entity_type, mainInst, otherInst, notification.title); return message; }; diff --git a/frontend/notification/notifications_type.constant.js b/frontend/notification/notifications_type.constant.js index 510638b02..d7364d3d3 100644 --- a/frontend/notification/notifications_type.constant.js +++ b/frontend/notification/notifications_type.constant.js @@ -150,6 +150,12 @@ }, RE_ADD_ADM_PERMISSIONS: { "icon": "check_circle_outline" + }, + DELETED_EVENT: { + "icon": "delete" + }, + UPDATED_EVENT: { + "icon": "autorenew" } }) })() \ No newline at end of file From 40a3edae4ffad89c620e0d28ee2c448b96889af5 Mon Sep 17 00:00:00 2001 From: ruanres Date: Mon, 11 Feb 2019 15:02:23 -0300 Subject: [PATCH 135/606] added verification to getPhoto function --- frontend/user/configProfile/configProfileController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index ad020dcdc..f7515b0a0 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -41,7 +41,7 @@ configProfileCtrl.getPhoto = () => { const user = configProfileCtrl.canEdit() ? configProfileCtrl.newUser : configProfileCtrl.user; - return user.photo_url; + return user && user.photo_url; } configProfileCtrl.addImage = function(image) { From a6927c19d85e67672fc353a32eecef654b9b1e19 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 11 Feb 2019 16:14:32 -0300 Subject: [PATCH 136/606] spreading the feature through the app --- backend/service_messages.py | 4 ++-- .../notification/notificationMessageCreatorService.js | 2 +- frontend/notification/notificationService.js | 3 +-- frontend/post/postDetailsDirective.js | 11 +++++++++++ frontend/post/post_details.html | 9 +++++++++ 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/backend/service_messages.py b/backend/service_messages.py index b6c68c088..7994f861c 100644 --- a/backend/service_messages.py +++ b/backend/service_messages.py @@ -63,7 +63,7 @@ def create_entity(entity_key): entity = { "key": entity_key, } - return json.dumps(entity) + return entity def send_message_notification(receiver_key, notification_type, entity_key, message, entity=None): @@ -86,7 +86,7 @@ def send_message_notification(receiver_key, notification_type, entity_key, messa 'receiver_key': receiver_key, 'message': message, 'notification_type': notification_type, - 'entity': entity + 'entity': json.dumps(entity) } ) \ No newline at end of file diff --git a/frontend/notification/notificationMessageCreatorService.js b/frontend/notification/notificationMessageCreatorService.js index fac5fb33e..47980eebf 100644 --- a/frontend/notification/notificationMessageCreatorService.js +++ b/frontend/notification/notificationMessageCreatorService.js @@ -55,7 +55,7 @@ service.assembleMessage = function assembleMessage(entity_type, mainInst, otherInst, title) { var assembler = MESSAGE_ASSEMBLERS[entity_type]; - return assembler(mainInst, otherInst) + title || ''; + return assembler(mainInst, otherInst) + (title || ''); }; function messageCreator(message, notificationType, title) { diff --git a/frontend/notification/notificationService.js b/frontend/notification/notificationService.js index eca37b748..4b9dbc143 100644 --- a/frontend/notification/notificationService.js +++ b/frontend/notification/notificationService.js @@ -25,8 +25,7 @@ * DATE: 10/05/2018 */ var otherInst = (notification.to && notification.to.institution_name) || notification.from.institution_name; - console.log(notification); - var message = NotificationMessageCreatorService.assembleMessage(entity_type, mainInst, otherInst, notification.title); + var message = NotificationMessageCreatorService.assembleMessage(entity_type, mainInst, otherInst, notification.entity.title); return message; }; diff --git a/frontend/post/postDetailsDirective.js b/frontend/post/postDetailsDirective.js index fdc3a1b13..55150c695 100644 --- a/frontend/post/postDetailsDirective.js +++ b/frontend/post/postDetailsDirective.js @@ -275,6 +275,16 @@ return Utils.isLargerThanTheScreen(postDetailsCtrl.post.title) ? 'break' : 'no-break'; }; + postDetailsCtrl.isSharedEvent = () => { + return postDetailsCtrl.post.shared_event; + }; + + postDetailsCtrl.isFollowingEvent = () => { + const eventFollowers = postDetailsCtrl.post.shared_event.followers; + console.log(eventFollowers); + return _.includes(eventFollowers, postDetailsCtrl.user.key); + }; + function getOriginalPost(post){ if(post.shared_post){ return post.shared_post; @@ -450,6 +460,7 @@ return !postDetailsCtrl.post || _.isEmpty(postDetailsCtrl.post); }; + function isInstitutionAdmin() { return _.includes(_.map(postDetailsCtrl.user.institutions_admin, getKeyFromUrl), postDetailsCtrl.post.institution_key); } diff --git a/frontend/post/post_details.html b/frontend/post/post_details.html index 251de6917..09a8ac1e2 100644 --- a/frontend/post/post_details.html +++ b/frontend/post/post_details.html @@ -73,6 +73,15 @@ bookmark Receber atualizações + + visibility + Receber atualizações do evento + + + visibility_off + Deixar de receber atualizações do evento + Date: Mon, 11 Feb 2019 16:42:00 -0300 Subject: [PATCH 137/606] changed controller --- frontend/app.js | 5 ++- frontend/index.html | 1 + .../descriptionInst/descriptionController.js | 36 +++++++++++++++++++ .../description_inst.html | 2 ++ .../edit_description.html} | 0 frontend/institution/institutionController.js | 34 +++--------------- 6 files changed, 47 insertions(+), 31 deletions(-) create mode 100644 frontend/institution/descriptionInst/descriptionController.js rename frontend/institution/{ => descriptionInst}/description_inst.html (80%) rename frontend/institution/{editDescription.html => descriptionInst/edit_description.html} (100%) diff --git a/frontend/app.js b/frontend/app.js index c6c12e72a..8b387ab38 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -168,9 +168,12 @@ url: "/institution/:institutionKey/description", views: { institution_content: { - templateUrl: "app/institution/description_inst.html", + templateUrl: "app/institution/descriptionInst/description_inst.html", controller: "DescriptionInstController as descriptionCtrl" } + }, + params: { + institution: undefined } }) .state(STATES.INST_EVENTS, { diff --git a/frontend/index.html b/frontend/index.html index e541bc4ae..496c0bad0 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -219,6 +219,7 @@ + diff --git a/frontend/institution/descriptionInst/descriptionController.js b/frontend/institution/descriptionInst/descriptionController.js new file mode 100644 index 000000000..b12b02253 --- /dev/null +++ b/frontend/institution/descriptionInst/descriptionController.js @@ -0,0 +1,36 @@ +(function(){ + var app = angular.module('app'); + + app.controller("EditDescriptionController", function EditDescriptionController($state, InstitutionService, ObserverRecorderService){ + const descriptionCtrl = this; + let observer; + + descriptionCtrl.isLoading = false; + descriptionCtrl.$onInit = () => { + descriptionCtrl.currentInstitutionKey = $state.params.institutionKey; + descriptionCtrl.isLoading = true; + InstitutionService.getInstitution(descriptionCtrl.currentInstitutionKey).then(function(institution){ + descriptionCtrl.institution = institution; + descriptionCtrl.isLoading = false; + observer = ObserverRecorderService.register(descriptionCtrl.institution); + }) + }; + + function patchIntitution() { + var patch = ObserverRecorderService.generate(observer); + InstitutionService.update(descriptionCtrl.currentInstitutionKey, patch).then( + /*function success() { + if(configInstCtrl.newInstitution) + updateUserInstitutions(configInstCtrl.newInstitution);}*/ + ); + } + + }); + + app.controller("DescriptionInstController", function DescriptionInstController($state){ + const descriptionCtrl = this; + descriptionCtrl.isLoading = false; + descriptionCtrl.institution = $state.params.institution; + console.log($state.params); + }); +})(); \ No newline at end of file diff --git a/frontend/institution/description_inst.html b/frontend/institution/descriptionInst/description_inst.html similarity index 80% rename from frontend/institution/description_inst.html rename to frontend/institution/descriptionInst/description_inst.html index 95a2de142..b3b58a285 100644 --- a/frontend/institution/description_inst.html +++ b/frontend/institution/descriptionInst/description_inst.html @@ -1,6 +1,8 @@
    + ddddd + {{descriptionCtrl. institution}}

    {{descriptionCtrl.institution.description}}

    \ No newline at end of file diff --git a/frontend/institution/editDescription.html b/frontend/institution/descriptionInst/edit_description.html similarity index 100% rename from frontend/institution/editDescription.html rename to frontend/institution/descriptionInst/edit_description.html diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index 1d872a49f..c4314d05d 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -209,7 +209,8 @@ institutionCtrl.goToDescription = function goToDescription(institutionKey) { const instKey = institutionKey || currentInstitutionKey; - $state.go(STATES.INST_DESCRIPTION, {institutionKey: instKey}); + $state.go(STATES.INST_DESCRIPTION, {institutionKey: instKey, + institution: institutionCtrl.institution}); }; institutionCtrl.goToMembers = function goToMembers(institutionKey) { @@ -270,14 +271,13 @@ institutionCtrl.editDescription = function(ev) { $mdDialog.show({ - templateUrl: 'app/institution/editDescription.html', + templateUrl: 'app/institution/descriptionInst/edit_description.html', targetEvent: ev, clickOutsideToClose:true, locals: { institution: institutionCtrl.institution, - save: institutionCtrl.saveChanges }, - controller: InstitutionController, + controller: app.EditDescriptionController, controllerAs: 'ctrl' }); }; @@ -488,30 +488,4 @@ followersCtrl._getFollowers(); }; }); - - app.controller("DescriptionInstController", function DescriptionInstController($state, InstitutionService, ObserverRecorderService){ - const descriptionCtrl = this; - let observer; - - descriptionCtrl.isLoading = false; - descriptionCtrl.$onInit = () => { - descriptionCtrl.currentInstitutionKey = $state.params.institutionKey; - descriptionCtrl.isLoading = true; - InstitutionService.getInstitution(descriptionCtrl.currentInstitutionKey).then(function(institution){ - descriptionCtrl.institution = institution; - descriptionCtrl.isLoading = false; - observer = ObserverRecorderService.register(descriptionCtrl.institution); - }) - }; - - function patchIntitution() { - var patch = ObserverRecorderService.generate(observer); - InstitutionService.update(descriptionCtrl.currentInstitutionKey, patch).then( - /*function success() { - if(configInstCtrl.newInstitution) - updateUserInstitutions(configInstCtrl.newInstitution);}*/ - ); - } - - }); })(); \ No newline at end of file From d34d04f472b212c6e1aa6bceaebc9a5284abfe36 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 11 Feb 2019 17:06:48 -0300 Subject: [PATCH 138/606] working --- frontend/event/event_details_small_page.html | 12 ++++++++++ frontend/post/postDetailsDirective.js | 23 ++++++++++++++++++-- frontend/post/post_details.html | 11 ++++++---- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/frontend/event/event_details_small_page.html b/frontend/event/event_details_small_page.html index aaeb75c47..e934989ce 100644 --- a/frontend/event/event_details_small_page.html +++ b/frontend/event/event_details_small_page.html @@ -20,6 +20,18 @@ Cancelar evento     + + + visibility + Receber Atualizações + + + + + visibility_off + Deixar de receber atualizações + +
    diff --git a/frontend/post/postDetailsDirective.js b/frontend/post/postDetailsDirective.js index 55150c695..fc9a1cc26 100644 --- a/frontend/post/postDetailsDirective.js +++ b/frontend/post/postDetailsDirective.js @@ -4,7 +4,7 @@ var app = angular.module('app'); app.controller('PostDetailsController', function(PostService, AuthService, CommentService, $state, - $mdDialog, MessageService, ngClipboard, ProfileService, $rootScope, POST_EVENTS, STATES) { + $mdDialog, MessageService, ngClipboard, ProfileService, $rootScope, POST_EVENTS, STATES, EventService) { var postDetailsCtrl = this; @@ -281,10 +281,29 @@ postDetailsCtrl.isFollowingEvent = () => { const eventFollowers = postDetailsCtrl.post.shared_event.followers; - console.log(eventFollowers); return _.includes(eventFollowers, postDetailsCtrl.user.key); }; + postDetailsCtrl.followEvent = () => { + EventService.addFollower(postDetailsCtrl.post.shared_event.key).then(() => { + postDetailsCtrl.post.shared_event.followers.push(postDetailsCtrl.user.key); + MessageService.showToast('Você receberá as atualizações desse evento.'); + }).catch((error) => { + console.error(error); + }); + }; + + postDetailsCtrl.unFollowEvent = () => { + EventService.removeFollower(postDetailsCtrl.post.shared_event.key).then(() => { + _.remove(postDetailsCtrl.post.shared_event.followers, follower => { + return follower.key === postDetailsCtrl.user.key; + }); + MessageService.showToast('Você não receberá as atualizações desse evento.'); + }).catch((error) => { + console.error(error); + }); + }; + function getOriginalPost(post){ if(post.shared_post){ return post.shared_post; diff --git a/frontend/post/post_details.html b/frontend/post/post_details.html index 09a8ac1e2..344715525 100644 --- a/frontend/post/post_details.html +++ b/frontend/post/post_details.html @@ -73,14 +73,17 @@ bookmark Receber atualizações - + + + visibility Receber atualizações do evento - + + + visibility_off - Deixar de receber atualizações do evento + Deixar de receber atualizações do evento From a6172ad4e65a606bd73b8e4182d3d820230e1219 Mon Sep 17 00:00:00 2001 From: ruanres Date: Mon, 11 Feb 2019 17:19:01 -0300 Subject: [PATCH 139/606] fixed some tests of configProfileController --- .../configProfileControllerSpec.js | 180 ++++++------------ .../editProfileControllerSpec.js | 0 .../configProfile/configProfileController.js | 8 +- 3 files changed, 58 insertions(+), 130 deletions(-) rename frontend/test/specs/{auth => user}/configProfileControllerSpec.js (60%) rename frontend/test/specs/{auth => user}/editProfileControllerSpec.js (100%) diff --git a/frontend/test/specs/auth/configProfileControllerSpec.js b/frontend/test/specs/user/configProfileControllerSpec.js similarity index 60% rename from frontend/test/specs/auth/configProfileControllerSpec.js rename to frontend/test/specs/user/configProfileControllerSpec.js index adb933065..d31845cb0 100644 --- a/frontend/test/specs/auth/configProfileControllerSpec.js +++ b/frontend/test/specs/user/configProfileControllerSpec.js @@ -1,20 +1,20 @@ 'use strict'; -(describe('Test ConfigProfileController', function() { - var configCtrl, httpBackend, deffered, scope, userService, createCrtl, state, - mdToast, authService, imageService, mdDialog, cropImageService, states; +(fdescribe('Test ConfigProfileController', function() { + let configCtrl, httpBackend, scope, userService, createCrtl, state, deferred, + authService, imageService, mdDialog, cropImageService, states, messageService; - var institution = { + const institution = { name: 'institution', key: '987654321' }; - var other_institution = { + const other_institution = { name: 'other_institution', key: '3279847298' }; - var user = { + const user = { name: 'User', cpf: '121.445.044-07', email: 'teste@gmail.com', @@ -24,7 +24,7 @@ state: 'active' }; - var newUser = { + const newUser = { name: 'newUser', cpf: '121.115.044-07', email: 'teste@gmail.com', @@ -32,25 +32,31 @@ institutions_admin: [] }; + const fakeCallback = response => { + return () => { + return { + then: function(callback) { + return callback(response); + } + }; + } + } + beforeEach(module('app')); beforeEach(inject(function($controller, $httpBackend, $rootScope, $q, $state, STATES, - $mdToast, $mdDialog, UserService, AuthService, ImageService, CropImageService) { + $mdDialog, UserService, AuthService, ImageService, CropImageService, MessageService) { httpBackend = $httpBackend; - httpBackend.when('GET', 'main/main.html').respond(200); - httpBackend.when('GET', 'home/home.html').respond(200); - httpBackend.when('GET', 'auth/login.html').respond(200); scope = $rootScope.$new(); state = $state; states = STATES; imageService = ImageService; - mdToast = $mdToast; mdDialog = $mdDialog; - deffered = $q.defer(); + deferred = $q.defer(); userService = UserService; cropImageService = CropImageService; - + messageService = MessageService; authService = AuthService; authService.login(user); @@ -61,10 +67,12 @@ authService: authService, userService: userService, imageService: imageService, - cropImageService : cropImageService + cropImageService : cropImageService, + messageService: messageService }); }; configCtrl = createCrtl(); + configCtrl.$onInit(); })); afterEach(function() { @@ -72,10 +80,10 @@ httpBackend.verifyNoOutstandingRequest(); }); - describe('main()', function() { + xdescribe('main()', function() { it("should delete name from user if that is Unknown", function() { - var unknownUser = { + const unknownUser = { name: 'Unknown' }; @@ -85,7 +93,7 @@ return new User(unknownUser); }; - configCtrl = createCrtl(); + // configCtrl = createCrtl(); expect(configCtrl.newUser.name).toBeUndefined(); }); @@ -93,24 +101,15 @@ describe('finish()', function(){ - it("Should call mdToast.show", function(){ - spyOn(mdToast, 'show'); - - var userInvalid = { - name: 'Invalid User', - cpf: '', - email: 'invalidUser@gmail', - institutions: [institution] - }; - - configCtrl.newUser = new User(userInvalid); - expect(configCtrl.newUser.isValid()).toEqual(false); - - configCtrl.finish().should.be.rejected; - expect(mdToast.show).toHaveBeenCalled(); + it("Should show a message when the user is invalid", function(){ + spyOn(messageService, 'showToast'); + spyOn(configCtrl, '_saveImage').and.returnValue(Promise.resolve()); + spyOn(configCtrl.newUser, 'isValid').and.returnValue(false); + configCtrl._saveUser().should.be.resolved; + expect(messageService.showToast).toHaveBeenCalledWith("Campos obrigatórios não preenchidos corretamente."); }); - it('Should change informations of user from system', function(done) { + xit('Should change informations of user from system', function(done) { spyOn(state, 'go'); spyOn(userService, 'save').and.callThrough(); @@ -123,7 +122,7 @@ httpBackend.expect('PATCH', '/api/user').respond(newUser); - var promise = configCtrl.finish(); + const promise = configCtrl.finish(); promise.should.be.fulfilled.then(function() { expect(state.go).toHaveBeenCalledWith(states.HOME); @@ -137,77 +136,27 @@ }); describe('addImage()', function() { - beforeEach(function() { - var image = createImage(100); - spyOn(imageService, 'compress').and.callFake(function() { - return { - then: function(callback) { - return callback(image); - } - }; - }); - - spyOn(imageService, 'readFile').and.callFake(function() { - configCtrl.newUser.photo_url = "Base64 data of photo"; - }); - - spyOn(imageService, 'saveImage').and.callFake(function() { - return { - then: function(callback) { - return callback({ - url : "imagens/test" - }); - } - }; - }); - }); - - it('Should add new image in post', function() { - spyOn(userService, 'save').and.callThrough(); - - spyOn(authService, 'reload').and.callFake(function() { - return { - then: function(callback) { - return callback(newUser); - } - }; - }); - httpBackend.expect('PATCH', '/api/user').respond(newUser); - - var image = createImage(100); - configCtrl.addImage(image); - configCtrl.finish(); - - httpBackend.flush(); + it('Should set a new image to the user', function() { + const imageInput = createImage(100); + const imageOutput = createImage(800); + spyOn(imageService, 'compress').and.returnValue(deferred.promise); + spyOn(imageService, 'readFile'); + deferred.resolve(imageOutput); + configCtrl.addImage(imageInput); scope.$apply(); - - expect(imageService.compress).toHaveBeenCalled(); + expect(imageService.compress).toHaveBeenCalledWith(imageInput, 800); + expect(configCtrl.photo_user).toBe(imageOutput); expect(imageService.readFile).toHaveBeenCalled(); - expect(imageService.saveImage).toHaveBeenCalled(); + expect(configCtrl.file).toBe(null); }); }); describe('cropImage()', function() { beforeEach(function() { - var image = createImage(100); - - spyOn(cropImageService, 'crop').and.callFake(function() { - return { - then : function(callback) { - return callback("Image"); - } - }; - }); - - spyOn(imageService, 'compress').and.callFake(function() { - return { - then: function(callback) { - return callback(image); - } - }; - }); - + const image = createImage(100); + spyOn(cropImageService, 'crop').and.callFake(fakeCallback("Image")); + spyOn(imageService, 'compress').and.callFake(fakeCallback(image)); spyOn(imageService, 'readFile').and.callFake(function() { configCtrl.newUser.photo_url = "Base64 data of photo"; }); @@ -215,16 +164,16 @@ it('should crop image in config user', function() { spyOn(configCtrl, 'addImage'); - var image = createImage(100); + const image = createImage(100); configCtrl.cropImage(image); expect(cropImageService.crop).toHaveBeenCalled(); expect(configCtrl.addImage).toHaveBeenCalled(); }); }); - describe('removeInstitution()', function() { + xdescribe('removeInstitution()', function() { - var promise; + let promise; beforeEach(function() { spyOn(configCtrl.newUser, 'isAdmin'); @@ -299,33 +248,12 @@ describe('deleteAccount()', function() { - var promise; + let promise; beforeEach(function() { - spyOn(mdDialog, 'show').and.callFake(function() { - return { - then: function(callback) { - return callback(); - } - }; - }); - - spyOn(userService, 'deleteAccount').and.callFake(function() { - return { - then: function(callback) { - return callback(); - } - }; - }); - - spyOn(authService, 'logout').and.callFake(function() { - return { - then: function(callback) { - return callback(); - } - }; - }); - + spyOn(mdDialog, 'show').and.callFake(fakeCallback()); + spyOn(userService, 'deleteAccount').and.callFake(fakeCallback()); + spyOn(authService, 'logout').and.callFake(fakeCallback()); promise = configCtrl.deleteAccount(); }); diff --git a/frontend/test/specs/auth/editProfileControllerSpec.js b/frontend/test/specs/user/editProfileControllerSpec.js similarity index 100% rename from frontend/test/specs/auth/editProfileControllerSpec.js rename to frontend/test/specs/user/editProfileControllerSpec.js diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index f7515b0a0..0c81426e8 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -76,15 +76,15 @@ configProfileCtrl.finish = function finish() { configProfileCtrl.loadingSubmission = true; - saveImage().then(_ => { - saveUser() + configProfileCtrl._saveImage().then(_ => { + configProfileCtrl._saveUser() .finally(_ => { configProfileCtrl.loadingSubmission = false; }); }) }; - const saveImage = () => { + configProfileCtrl._saveImage = () => { return new Promise((resolve) => { if(configProfileCtrl.photo_user) { ImageService.saveImage(configProfileCtrl.photo_user) @@ -99,7 +99,7 @@ }) } - const saveUser = () => { + configProfileCtrl._saveUser = () => { return new Promise((resolve) => { if (configProfileCtrl.newUser.isValid()) { updateUser(); From e5bd8aa4d85be52810ec8a65c7c693d85db8f3b4 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Feb 2019 09:26:52 -0300 Subject: [PATCH 140/606] Fix institution color picker controller * Now updates a selected instutition, rather than current user institution --- frontend/home/colorPickerController.js | 5 ++--- frontend/home/color_picker.css | 10 ++++++++++ frontend/sideMenu/sideMenu.component.js | 3 ++- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 frontend/home/color_picker.css diff --git a/frontend/home/colorPickerController.js b/frontend/home/colorPickerController.js index 23f42e280..e45eab9fa 100644 --- a/frontend/home/colorPickerController.js +++ b/frontend/home/colorPickerController.js @@ -6,6 +6,7 @@ app.controller("ColorPickerController", function ColorPickerController(user, ProfileService, MessageService, $mdDialog, AuthService, $http) { var colorPickerCtrl = this; colorPickerCtrl.user = user; + colorPickerCtrl.institution = institution; colorPickerCtrl.saveColor = function saveColor() { var diff = jsonpatch.compare(colorPickerCtrl.user, colorPickerCtrl.newUser); @@ -26,9 +27,7 @@ function loadProfile() { colorPickerCtrl.newUser = _.cloneDeep(colorPickerCtrl.user); - colorPickerCtrl.newProfile = _.find(colorPickerCtrl.newUser.institution_profiles, function (profile) { - return profile.institution_key === colorPickerCtrl.newUser.current_institution.key; - }); + colorPickerCtrl.newProfile = _.cloneDeep(colorPickerCtrl.institution); } function loadColors() { diff --git a/frontend/home/color_picker.css b/frontend/home/color_picker.css new file mode 100644 index 000000000..46da3bacb --- /dev/null +++ b/frontend/home/color_picker.css @@ -0,0 +1,10 @@ +.color-picker-area { + display: grid; + grid-template-columns: repeat(4, min-content); + justify-content: space-around; +} + +.color-picker-circle { + width: 3em !important; + height: 3em !important; +} diff --git a/frontend/sideMenu/sideMenu.component.js b/frontend/sideMenu/sideMenu.component.js index 6d28857b8..55ca5c879 100644 --- a/frontend/sideMenu/sideMenu.component.js +++ b/frontend/sideMenu/sideMenu.component.js @@ -112,7 +112,7 @@ } }) - sideMenuCtrl.openColorPicker = () => { + sideMenuCtrl.openColorPicker = (institution) => { $mdDialog.show({ controller: "ColorPickerController", controllerAs: "colorPickerCtrl", @@ -121,6 +121,7 @@ clickOutsideToClose: true, locals: { user : sideMenuCtrl.user + institution, }, bindToController: true }); From 2ab22be5faf83739770a94a8c23b655ac7fc910c Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Tue, 12 Feb 2019 09:55:26 -0300 Subject: [PATCH 141/606] Refactoring worker handler name and fixing the tests --- backend/handlers/event_handler.py | 4 +-- backend/handlers/like_handler.py | 2 +- backend/handlers/post_collection_handler.py | 2 +- backend/handlers/post_comment_handler.py | 2 +- .../event_handler_test.py | 33 ++++++++++--------- .../like_post_handler_test.py | 5 +-- .../post_collection_handler_test.py | 2 +- .../post_comment_handler_test.py | 2 +- .../services_tests/service_messages_test.py | 6 ++-- backend/worker.py | 4 +-- 10 files changed, 32 insertions(+), 30 deletions(-) diff --git a/backend/handlers/event_handler.py b/backend/handlers/event_handler.py index 487719898..100bbe491 100644 --- a/backend/handlers/event_handler.py +++ b/backend/handlers/event_handler.py @@ -68,7 +68,7 @@ def delete(self, user, event_urlsafe): 'title': event.title } - enqueue_task('post-notification', params) + enqueue_task('multiple-notification', params) @json_response @login_required @@ -111,4 +111,4 @@ def patch(self, user, event_urlsafe): 'title': event.title } - enqueue_task('post-notification', params) + enqueue_task('multiple-notification', params) diff --git a/backend/handlers/like_handler.py b/backend/handlers/like_handler.py index 33995430c..b190d2d6f 100644 --- a/backend/handlers/like_handler.py +++ b/backend/handlers/like_handler.py @@ -84,7 +84,7 @@ def post(self, user, post_key, comment_id=None, reply_id=None): 'field': 'subscribers' } - enqueue_task('post-notification', params) + enqueue_task('multiple-notification', params) is_first_like = post.get_number_of_likes() == 1 if is_first_like: diff --git a/backend/handlers/post_collection_handler.py b/backend/handlers/post_collection_handler.py index 19db58ac7..c8f91a2e5 100644 --- a/backend/handlers/post_collection_handler.py +++ b/backend/handlers/post_collection_handler.py @@ -90,7 +90,7 @@ def create_post(post_data, user, institution): 'sender_institution_key': shared_post.institution.urlsafe() } - enqueue_task('post-notification', params) + enqueue_task('multiple-notification', params) elif post.shared_event: shared_event = post.shared_event.get() if shared_event.author_key != user.key: diff --git a/backend/handlers/post_comment_handler.py b/backend/handlers/post_comment_handler.py index d310b1945..75d2832b4 100644 --- a/backend/handlers/post_comment_handler.py +++ b/backend/handlers/post_comment_handler.py @@ -65,7 +65,7 @@ def post(self, user, post_key): 'current_institution': user.current_institution.urlsafe(), 'sender_institution_key': post.institution.urlsafe() } - enqueue_task('post-notification', params) + enqueue_task('multiple-notification', params) is_first_comment = post.get_number_of_comment() == 1 if is_first_comment: diff --git a/backend/test/event_handlers_tests/event_handler_test.py b/backend/test/event_handlers_tests/event_handler_test.py index ba8033b6b..2e25b171d 100644 --- a/backend/test/event_handlers_tests/event_handler_test.py +++ b/backend/test/event_handlers_tests/event_handler_test.py @@ -55,7 +55,7 @@ def test_delete_by_author(self, verify_token): ['edit_post', 'remove_post'], self.event.key.urlsafe()) # Call the delete method self.testapp.delete("/api/events/%s" % - self.event.key.urlsafe()) + self.event.key.urlsafe(), headers={'institution-authorization': self.institution.key.urlsafe()}) # Refresh event self.event = self.event.key.get() # Verify if after delete the state of event is deleted @@ -71,7 +71,7 @@ def test_delete_by_author(self, verify_token): # Call the patch method and assert that it raises an exception with self.assertRaises(Exception): self.testapp.delete("/api/events/%s" % - self.event.key.urlsafe()) + self.event.key.urlsafe(), headers={'institution-authorization': self.institution.key.urlsafe()}) @patch('util.login_service.verify_token', return_value={'email': 'usersd@gmail.com'}) def test_delete_by_admin(self, verify_token): @@ -80,7 +80,7 @@ def test_delete_by_admin(self, verify_token): # because the user doesn't have the permission yet. with self.assertRaises(Exception) as raises_context: self.testapp.delete("/api/events/%s" % - self.event.key.urlsafe()) + self.event.key.urlsafe(), headers={'institution-authorization': self.institution.key.urlsafe()}) message = self.get_message_exception(str(raises_context.exception)) self.assertEquals(message, "Error! The user can not remove this event") @@ -89,7 +89,7 @@ def test_delete_by_admin(self, verify_token): # Call the delete method self.testapp.delete("/api/events/%s" % - self.event.key.urlsafe()) + self.event.key.urlsafe(), headers={'institution-authorization': self.institution.key.urlsafe()}) # Refresh event self.event = self.event.key.get() # Verify if after delete the state of event is deleted @@ -117,7 +117,7 @@ def test_patch(self, verify_token): self.user.add_permission('edit_post', self.event.key.urlsafe()) self.testapp.patch("/api/events/" + self.event.key.urlsafe(), - json_edit) + json_edit, headers={'institution-authorization': self.institution.key.urlsafe()}) self.event = self.event.key.get() self.assertEqual(self.event.title, "Edit Event") @@ -134,7 +134,7 @@ def test_patch(self, verify_token): self.event.key.urlsafe(), [{"op": "replace", "path": "/start_time", "value": '2018-07-27T12:30:15'} - ] + ], headers={'institution-authorization': self.institution.key.urlsafe()} ) # test the case when the end_time is before start_time @@ -143,7 +143,7 @@ def test_patch(self, verify_token): self.event.key.urlsafe(), [{"op": "replace", "path": "/end_time", "value": '2018-07-07T12:30:15'} - ] + ], headers={'institution-authorization': self.institution.key.urlsafe()} ) # Pretend a new authentication @@ -154,8 +154,8 @@ def test_patch(self, verify_token): self.testapp.patch_json("/api/events/%s" % self.event.key.urlsafe(), [{"op": "replace", "path": "/local", - "value": "New Local"}] - ) + "value": "New Local"}], + headers={'institution-authorization': self.institution.key.urlsafe()}) @patch('util.login_service.verify_token', return_value={'email': 'user@gmail.com'}) def test_pacth_datetime(self, verify_token): @@ -169,8 +169,8 @@ def test_pacth_datetime(self, verify_token): self.user.add_permission('edit_post', self.event.key.urlsafe()) self.testapp.patch("/api/events/" + - self.event.key.urlsafe(), - json_edit) + self.event.key.urlsafe(), json_edit, + headers={'institution-authorization': self.institution.key.urlsafe()}) self.event = self.event.key.get() @@ -209,7 +209,7 @@ def test_patch_on_event_outdated(self, verify_token): patch = [{"op": "replace", "path": "/"+prop, "value": value}] self.testapp.patch("/api/events/" + self.event.key.urlsafe(), - json.dumps(patch)) + json.dumps(patch), headers={'institution-authorization': self.institution.key.urlsafe()}) self.event = self.event.key.get() self.assertEquals( @@ -222,7 +222,7 @@ def test_get_a_deleted_event(self, verify_token): self.event.put() with self.assertRaises(Exception) as ex: - self.testapp.get('/api/events/%s' %self.event.key.urlsafe()) + self.testapp.get('/api/events/%s' %self.event.key.urlsafe(), headers={'institution-authorization': self.institution.key.urlsafe()}) exception_message = self.get_message_exception(ex.exception.message) self.assertTrue(exception_message == 'Error! The event has been deleted.') @@ -235,7 +235,8 @@ def test_patch_a_deleted_event(self, verify_token): with self.assertRaises(Exception) as ex: patch = [{"op": "replace", "path": "/title", "value": 'other_value'}] - self.testapp.patch('/api/events/%s' % self.event.key.urlsafe(), json.dumps(patch)) + self.testapp.patch('/api/events/%s' % self.event.key.urlsafe(), json.dumps(patch), + headers={'institution-authorization': self.institution.key.urlsafe()}) exception_message = self.get_message_exception(ex.exception.message) self.assertTrue(exception_message == @@ -256,7 +257,7 @@ def test_permissions_in_delete(self, verify_token): self.assertTrue(self.event.state != 'deleted') self.user.add_permissions(['edit_post', 'remove_post'], self.event.key.urlsafe()) - self.testapp.delete("/api/events/%s" %self.event.key.urlsafe()) + self.testapp.delete("/api/events/%s" %self.event.key.urlsafe(), headers={'institution-authorization': self.institution.key.urlsafe()}) self.event = self.event.key.get() self.assertTrue(self.event.state == 'deleted') @@ -266,7 +267,7 @@ def test_patch_without_permission(self, verify_token): with self.assertRaises(Exception) as ex: patch = [{"op": "replace", "path": "/title", "value": 'other_value'}] self.testapp.patch('/api/events/%s' % - self.event.key.urlsafe(), json.dumps(patch)) + self.event.key.urlsafe(), json.dumps(patch), headers={'institution-authorization': self.institution.key.urlsafe()}) exception_message = self.get_message_exception(ex.exception.message) self.assertTrue(exception_message == diff --git a/backend/test/like_handlers_tests/like_post_handler_test.py b/backend/test/like_handlers_tests/like_post_handler_test.py index 52835f71c..52dd044d1 100644 --- a/backend/test/like_handlers_tests/like_post_handler_test.py +++ b/backend/test/like_handlers_tests/like_post_handler_test.py @@ -94,7 +94,8 @@ def test_post(self, verify_token, enqueue_task): 'entity_key': self.post.key.urlsafe(), 'entity_type': 'LIKE_POST', 'current_institution': self.institution.key.urlsafe(), - 'sender_institution_key': self.post.institution.urlsafe() + 'sender_institution_key': self.post.institution.urlsafe(), + 'field': 'subscribers' } push_not_params = { @@ -104,7 +105,7 @@ def test_post(self, verify_token, enqueue_task): } calls = [ - call('post-notification', post_not_params), + call('multiple-notification', post_not_params), call('send-push-notification', push_not_params) ] diff --git a/backend/test/post_handlers_tests/post_collection_handler_test.py b/backend/test/post_handlers_tests/post_collection_handler_test.py index 848479e39..e540b692a 100644 --- a/backend/test/post_handlers_tests/post_collection_handler_test.py +++ b/backend/test/post_handlers_tests/post_collection_handler_test.py @@ -194,7 +194,7 @@ def test_post_sharing(self, verify_token, enqueue_task): } ), call( - 'post-notification', + 'multiple-notification', { 'receiver_key': self.post.author.urlsafe(), 'sender_key': self.user.key.urlsafe(), diff --git a/backend/test/post_handlers_tests/post_comment_handler_test.py b/backend/test/post_handlers_tests/post_comment_handler_test.py index 54458ab7b..8c539cf69 100644 --- a/backend/test/post_handlers_tests/post_comment_handler_test.py +++ b/backend/test/post_handlers_tests/post_comment_handler_test.py @@ -96,7 +96,7 @@ def test_post(self, verify_token, enqueue_task): } calls = [ - call('post-notification', post_not_params), + call('multiple-notification', post_not_params), call('send-push-notification', push_not_params) ] diff --git a/backend/test/services_tests/service_messages_test.py b/backend/test/services_tests/service_messages_test.py index ebe3b9ef1..991ee5854 100644 --- a/backend/test/services_tests/service_messages_test.py +++ b/backend/test/services_tests/service_messages_test.py @@ -55,7 +55,7 @@ def test_create_entity_from_institution(self): self.assertEquals( entity, - json.dumps(expected_entity), + expected_entity, "The created entity should be equal to the expected one" ) @@ -71,12 +71,12 @@ def test_create_entity_from_post(self): self.assertEquals( entity, - json.dumps(expected_entity), + expected_entity, "The created entity should be equal to the expected one" ) - @mock.patch('service_messages.create_entity') + @mock.patch('service_messages.create_entity', return_value={"key": 'opaskdop-OAPKSDPOAK'}) @mock.patch('service_messages.taskqueue.add') def test_send_message_notification(self, taskqueue_add, create_entity): """Test send_message_notification method.""" diff --git a/backend/worker.py b/backend/worker.py index 0c57b99c2..1444922a8 100644 --- a/backend/worker.py +++ b/backend/worker.py @@ -256,7 +256,7 @@ def apply_remove_operation(remove_hierarchy, institution, user): apply_remove_operation(remove_hierarchy, institution, user) -class PostNotificationHandler(BaseHandler): +class MultipleNotificationHandler(BaseHandler): """Handler that sends post's notifications to another queue.""" def post(self): @@ -508,7 +508,7 @@ def save_changes(admin, new_admin, institution): ('/api/queue/send-notification', SendNotificationHandler), ('/api/queue/send-email', SendEmailHandler), ('/api/queue/remove-inst', RemoveInstitutionHandler), - ('/api/queue/post-notification', PostNotificationHandler), + ('/api/queue/multiple-notification', MultipleNotificationHandler), ('/api/queue/email-members', EmailMembersHandler), ('/api/queue/notify-followers', NotifyFollowersHandler), ('/api/queue/add-admin-permissions', AddAdminPermissionsInInstitutionHierarchy), From 85de45bcf4d61c6eb8b69aebbc9b0d4336bc8c25 Mon Sep 17 00:00:00 2001 From: Julie Pessoa Date: Tue, 12 Feb 2019 09:59:42 -0300 Subject: [PATCH 142/606] missing comma at admin.py --- backend/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/admin.py b/backend/admin.py index 2dfdeee27..ed235961c 100644 --- a/backend/admin.py +++ b/backend/admin.py @@ -579,7 +579,7 @@ def get(self): app = webapp2.WSGIApplication([ ('/admin/reset', ResetHandler), - ('/admin/create-features', CreateFeaturesHandler) + ('/admin/create-features', CreateFeaturesHandler), ('/admin/update', UpdateHandler) ], debug=True) From d5830082c76fd0185bc6c8b9134ddc718df419b4 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Tue, 12 Feb 2019 10:19:58 -0300 Subject: [PATCH 143/606] Translating error message and a fixing a missing check --- frontend/event/eventDetailsDirective.js | 2 +- frontend/utils/messageService.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index 631f0ebe2..1b65a08de 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -149,7 +149,7 @@ }; eventCtrl.isFollower = () => { - return _.includes(eventCtrl.event.followers, eventCtrl.user.key); + return eventCtrl.event && _.includes(eventCtrl.event.followers, eventCtrl.user.key); }; eventCtrl.addFollower = () => { diff --git a/frontend/utils/messageService.js b/frontend/utils/messageService.js index 34dd2ab11..a72f30893 100644 --- a/frontend/utils/messageService.js +++ b/frontend/utils/messageService.js @@ -39,7 +39,8 @@ "Error! This post cannot be updated": "A publicação não pode ser editada.", "Error! You don't have permission to publish post.": "Você não tem permissão para publicar post nesta instituição", "Error! The user can not remove this post": "Você não tem permissão para remover esse post", - "Error! Email not verified.": "Seu email precisa ser verificado." + "Error! Email not verified.": "Seu email precisa ser verificado.", + "Error! The user is the author": "O usuário é o autor do evento." }; service.showToast = function showToast(message) { From 3221d07dc183376381e81b22aac07a3fd25227d7 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Tue, 12 Feb 2019 10:32:00 -0300 Subject: [PATCH 144/606] Updating the design of events timeline --- frontend/event/event.css | 13 +++++++++++-- frontend/event/events_mobile.html | 21 +++++++++++---------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/frontend/event/event.css b/frontend/event/event.css index 027165ed0..ffa680f35 100644 --- a/frontend/event/event.css +++ b/frontend/event/event.css @@ -206,7 +206,7 @@ .events-grid { display: grid; grid-template-columns: 20% 78% auto; - grid-template-rows: 9em auto; + grid-template-rows: auto; align-items: initial; margin: 0; } @@ -245,7 +245,7 @@ grid-column-end: 3; } - .event-preview-image { + .event-preview-image, .event-preview-without-image { max-height: 8em; height: 8em; max-width: 100%; @@ -255,10 +255,19 @@ background-color: #009688; } + .event-preview-without-image { + max-height: 3.5em; + } + .event-preview-border { border-left: 0.55em solid; } + .event-button-margin { + position: fixed !important; + margin-bottom: 3.5em; + } + .highlight { background:rgba(0,0,0,0.65); position: absolute; diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index 9b0ea6261..4ab5e9b10 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -35,7 +35,8 @@

    Nenhum evento a ser exibido.

    ng-click="eventCtrl.goToEvent(event)">
    - +
    {{ event.title | uppercase}} @@ -56,13 +57,13 @@

    Nenhum evento a ser exibido.

    + + + + add + + +
    - - - - add - - - \ No newline at end of file From b19faec59eda5815f784e143c8f2e9c57d1696cf Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Feb 2019 10:52:12 -0300 Subject: [PATCH 145/606] Update colorpicker dialog * Uses css grid * Changes a color of a particular institution --- frontend/home/colorPickerController.js | 7 ++-- frontend/home/color_picker.css | 24 +++++++++++ frontend/home/color_picker.html | 54 +++++++++++++------------ frontend/index.html | 1 + frontend/sideMenu/sideMenu.component.js | 2 +- 5 files changed, 59 insertions(+), 29 deletions(-) diff --git a/frontend/home/colorPickerController.js b/frontend/home/colorPickerController.js index e45eab9fa..4d1ba7055 100644 --- a/frontend/home/colorPickerController.js +++ b/frontend/home/colorPickerController.js @@ -3,10 +3,11 @@ (function () { const app = angular.module("app"); - app.controller("ColorPickerController", function ColorPickerController(user, ProfileService, MessageService, $mdDialog, AuthService, $http) { + app.controller("ColorPickerController", function ColorPickerController(user, institution, ProfileService, MessageService, $mdDialog, AuthService, $http) { var colorPickerCtrl = this; colorPickerCtrl.user = user; - colorPickerCtrl.institution = institution; + colorPickerCtrl.institution = {}; + colorPickerCtrl.oldColorValue = institution.color; colorPickerCtrl.saveColor = function saveColor() { var diff = jsonpatch.compare(colorPickerCtrl.user, colorPickerCtrl.newUser); @@ -27,7 +28,7 @@ function loadProfile() { colorPickerCtrl.newUser = _.cloneDeep(colorPickerCtrl.user); - colorPickerCtrl.newProfile = _.cloneDeep(colorPickerCtrl.institution); + colorPickerCtrl.institution = _.find(colorPickerCtrl.newUser.institution_profiles, i => _.isEqual(i, institution)); } function loadColors() { diff --git a/frontend/home/color_picker.css b/frontend/home/color_picker.css index 46da3bacb..e1f43aa96 100644 --- a/frontend/home/color_picker.css +++ b/frontend/home/color_picker.css @@ -1,3 +1,16 @@ +#color-dialog { + display: grid; + padding: 1em; + grid-template-rows: 10% 1fr auto; +} + +#color-dialog-buttons { + display: grid; + grid-auto-flow: column; + grid-auto-columns: min-content; + justify-content: end; +} + .color-picker-area { display: grid; grid-template-columns: repeat(4, min-content); @@ -8,3 +21,14 @@ width: 3em !important; height: 3em !important; } + +.color-picker-title { + color: #009688; + font-size: 1em; + justify-self: center; + align-self: center; +} + +button.color-dialog-button { + font-size: 0.7em; +} diff --git a/frontend/home/color_picker.html b/frontend/home/color_picker.html index d1a42a5d7..082f31eed 100644 --- a/frontend/home/color_picker.html +++ b/frontend/home/color_picker.html @@ -1,26 +1,30 @@ - -
    - -

    Selecione uma cor:

    - - - - - check_circle - - - - - -
    - - Cancelar - - - Aplicar - -
    -     + + +
    + Selecione uma cor +
    +
    + + check_circle + +
    +
    +
    + + CANCELAR + + + ALTERAR + +
    -     \ No newline at end of file + + diff --git a/frontend/index.html b/frontend/index.html index 40b04272c..708e49542 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -67,6 +67,7 @@ + diff --git a/frontend/sideMenu/sideMenu.component.js b/frontend/sideMenu/sideMenu.component.js index 55ca5c879..293db173b 100644 --- a/frontend/sideMenu/sideMenu.component.js +++ b/frontend/sideMenu/sideMenu.component.js @@ -120,7 +120,7 @@ parent: angular.element(document.body), clickOutsideToClose: true, locals: { - user : sideMenuCtrl.user + user : sideMenuCtrl.user, institution, }, bindToController: true From 6396285e949d8d597dc977f363f9642cacf008b0 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Feb 2019 11:28:11 -0300 Subject: [PATCH 146/606] Update sideMenu icon to show real insttitution color --- frontend/sideMenu/side_menu.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/sideMenu/side_menu.html b/frontend/sideMenu/side_menu.html index 232957941..9875238bf 100644 --- a/frontend/sideMenu/side_menu.html +++ b/frontend/sideMenu/side_menu.html @@ -23,7 +23,7 @@ {{ profile.institution.name }} - brightness_1 + brightness_1 {{ profile.institution.name }} From de6a5311f57d3f12044f358578f14a17fbecf3e9 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Feb 2019 11:35:51 -0300 Subject: [PATCH 147/606] Update ecis script to use mac compatible sed usage --- ecis | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ecis b/ecis index a81d88556..311d48d21 100755 --- a/ecis +++ b/ecis @@ -59,7 +59,8 @@ function setup_app_version { } function set_cache_suffix_sw { - sed -i "10s|.*| const CACHE_SUFIX = '$1';|" $SW_FILE + tmpfile=$(mktemp) + sed "10s|.*| const CACHE_SUFIX = '$1';|" $SW_FILE > "$tmpfile" && mv "$tmpfile" $SW_FILE catch_error $? "CACHE_SUFIX on SW $1" } From a02211132ea5133384c53b2470b47f8faf230ea3 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Tue, 12 Feb 2019 11:36:13 -0300 Subject: [PATCH 148/606] Testing server --- .../event_followers_handler_test.py | 115 ++++++++++++++++++ .../event_handler_test.py | 33 ++++- backend/test/model_test/event_test.py | 69 +++++++++++ 3 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 backend/test/event_handlers_tests/event_followers_handler_test.py diff --git a/backend/test/event_handlers_tests/event_followers_handler_test.py b/backend/test/event_handlers_tests/event_followers_handler_test.py new file mode 100644 index 000000000..e9ee6935e --- /dev/null +++ b/backend/test/event_handlers_tests/event_followers_handler_test.py @@ -0,0 +1,115 @@ +# -*- coding: utf-8 -*- +"""Event Followers handler test.""" + +from ..test_base_handler import TestBaseHandler +from models import User +from models import Institution +from models import Event +from handlers import EventFollowersHandler +from mock import patch + +import json +from .. import mocks + + +class EventFollowersHandlerTest(TestBaseHandler): + """Test Event Followers Handler.""" + + @classmethod + def setUp(cls): + """Provide the base for the tests.""" + super(EventFollowersHandlerTest, cls).setUp() + methods = set(cls.webapp2.WSGIApplication.allowed_methods) + methods.add('PATCH') + cls.webapp2.WSGIApplication.allowed_methods = frozenset(methods) + app = cls.webapp2.WSGIApplication( + [("/api/events/(.*)/followers", EventFollowersHandler) + ], debug=True) + cls.testapp = cls.webtest.TestApp(app) + + """Init the models.""" + cls.user = mocks.create_user('user@gmail.com') + cls.another_user = mocks.create_user('another@gmail.com') + cls.another_user.state = 'active' + cls.another_user.put() + + cls.institution = mocks.create_institution() + cls.institution.members = [cls.user.key] + cls.institution.followers = [cls.user.key] + cls.institution.admin = cls.user.key + cls.institution.put() + + cls.user.add_institution(cls.institution.key) + cls.user.follows = [cls.institution.key] + cls.user.put() + + cls.event = mocks.create_event(cls.user, cls.institution) + + @patch('util.login_service.verify_token', return_value={'email': 'another@gmail.com'}) + def test_post(self, verify_token): + """.""" + self.assertEqual(len(self.event.followers), 1) + + self.testapp.post("/api/events/%s/followers" %self.event.key.urlsafe()) + + self.event = self.event.key.get() + + self.assertEqual(len(self.event.followers), 2) + + @patch('util.login_service.verify_token', return_value={'email': 'another@gmail.com'}) + def test_post_with_unpublished_event(self, verify_token): + """.""" + self.assertEqual(len(self.event.followers), 1) + self.event.state = 'draft' + self.event.put() + + with self.assertRaises(Exception) as ex: + self.testapp.post("/api/events/%s/followers" %self.event.key.urlsafe()) + + exception_message = self.get_message_exception(ex.exception.message) + self.assertEqual(exception_message, "Error! The event is not published") + + @patch('util.login_service.verify_token', return_value={'email': 'another@gmail.com'}) + def test_delete_a_not_follower(self, verify_token): + """.""" + self.assertEqual(len(self.event.followers), 1) + + with self.assertRaises(Exception) as ex: + self.testapp.delete("/api/events/%s/followers" %self.event.key.urlsafe()) + + exception_message = self.get_message_exception(ex.exception.message) + self.assertEqual(exception_message, "Error! The user is not a follower") + + @patch('util.login_service.verify_token', return_value={'email': 'another@gmail.com'}) + def test_delete_with_a_deleted_event(self, verify_token): + """.""" + self.assertEqual(len(self.event.followers), 1) + self.event.state = 'deleted' + self.event.put() + + with self.assertRaises(Exception) as ex: + self.testapp.delete("/api/events/%s/followers" %self.event.key.urlsafe()) + + exception_message = self.get_message_exception(ex.exception.message) + self.assertEqual(exception_message, "Error! The event is not published") + + @patch('util.login_service.verify_token', return_value={'email': 'another@gmail.com'}) + def test_delete(self, verify_token): + """.""" + self.assertEqual(len(self.event.followers), 1) + + self.testapp.post("/api/events/%s/followers" %self.event.key.urlsafe()) + + self.event = self.event.key.get() + self.assertEqual(len(self.event.followers), 2) + + self.testapp.delete("/api/events/%s/followers" %self.event.key.urlsafe()) + + self.event = self.event.key.get() + self.assertEqual(len(self.event.followers), 1) + + + + def tearDown(cls): + """Deactivate the test.""" + cls.test.deactivate() diff --git a/backend/test/event_handlers_tests/event_handler_test.py b/backend/test/event_handlers_tests/event_handler_test.py index 2e25b171d..37312a989 100644 --- a/backend/test/event_handlers_tests/event_handler_test.py +++ b/backend/test/event_handlers_tests/event_handler_test.py @@ -48,14 +48,29 @@ def setUp(cls): # Events cls.event = mocks.create_event(cls.user, cls.institution) + @patch('handlers.event_handler.enqueue_task') @patch('util.login_service.verify_token', return_value={'email': 'user@gmail.com'}) - def test_delete_by_author(self, verify_token): + def test_delete_by_author(self, verify_token, mock_method): """Test the event_handler's delete method when user is author.""" self.user.add_permissions( ['edit_post', 'remove_post'], self.event.key.urlsafe()) # Call the delete method self.testapp.delete("/api/events/%s" % self.event.key.urlsafe(), headers={'institution-authorization': self.institution.key.urlsafe()}) + + not_params = { + 'receiver_key': self.event.author_key.urlsafe(), + 'sender_key': self.user.key.urlsafe(), + 'entity_key': self.event.key.urlsafe(), + 'entity_type': 'DELETED_EVENT', + 'current_institution': self.institution.key.urlsafe(), + 'sender_institution_key': self.institution.key.urlsafe(), + 'field': 'followers', + 'title': self.event.title + } + + mock_method.assert_called_with('multiple-notification', not_params) + # Refresh event self.event = self.event.key.get() # Verify if after delete the state of event is deleted @@ -157,8 +172,9 @@ def test_patch(self, verify_token): "value": "New Local"}], headers={'institution-authorization': self.institution.key.urlsafe()}) + @patch('handlers.event_handler.enqueue_task') @patch('util.login_service.verify_token', return_value={'email': 'user@gmail.com'}) - def test_pacth_datetime(self, verify_token): + def test_pacth_datetime(self, verify_token, mock_method): """Test pacth datetimes in event handler.""" json_edit = json.dumps([ {"op": "replace", "path": "/start_time", @@ -180,6 +196,19 @@ def test_pacth_datetime(self, verify_token): '2018-07-14T12:30:15') self.assertEqual(self.event.end_time.isoformat(), '2018-07-25T12:30:15') + + not_params = { + 'receiver_key': self.event.author_key.urlsafe(), + 'sender_key': self.user.key.urlsafe(), + 'entity_key': self.event.key.urlsafe(), + 'entity_type': 'UPDATED_EVENT', + 'current_institution': self.institution.key.urlsafe(), + 'sender_institution_key': self.institution.key.urlsafe(), + 'field': 'followers', + 'title': self.event.title + } + + mock_method.assert_called_with('multiple-notification', not_params) @patch('util.login_service.verify_token', return_value={'email': 'user@gmail.com'}) def test_patch_on_event_outdated(self, verify_token): diff --git a/backend/test/model_test/event_test.py b/backend/test/model_test/event_test.py index 0e02b46b0..4cdead29e 100644 --- a/backend/test/model_test/event_test.py +++ b/backend/test/model_test/event_test.py @@ -29,6 +29,12 @@ def setUp(cls): """Init the models.""" # new User user cls.user = mocks.create_user("test@example.com") + cls.user.state = 'active' + cls.user.put() + + cls.another_user = mocks.create_user("another@gmail.com") + cls.another_user.state = 'active' + cls.another_user.put() # new Institution cls.institution = mocks.create_institution() cls.institution.members = [cls.user.key] @@ -129,3 +135,66 @@ def test_verify_patch(self): "The event basic data can not be changed after it has ended", "The exception message is not equal to the expected one" ) + + def test_add_follower(self): + """Test regular add follower""" + self.assertEqual(len(self.event.followers), 1) + + self.event.add_follower(self.another_user) + + self.assertEqual(len(self.event.followers), 2) + + def test_add_follower_with_an_inactive_user(self): + """Test add an inactive user as a follower""" + self.another_user.state = 'pending' + self.another_user.put() + + self.assertEqual(len(self.event.followers), 1) + + with self.assertRaises(Exception) as ex: + self.event.add_follower(self.another_user) + + self.assertEqual(str(ex.__dict__['exception']), "The user is not active") + self.assertEqual(len(self.event.followers), 1) + + def test_add_an_user_who_is_a_follower_yet(self): + """Test add a user who is a follower""" + self.assertEqual(len(self.event.followers), 1) + + with self.assertRaises(Exception) as ex: + self.event.add_follower(self.user) + + self.assertEqual(str(ex.__dict__['exception']), "The user is a follower yet") + self.assertEqual(len(self.event.followers), 1) + + def test_remove_follower(self): + """Test regular remove follower""" + self.assertEqual(len(self.event.followers), 1) + + self.event.add_follower(self.another_user) + + self.assertEqual(len(self.event.followers), 2) + + self.event.remove_follower(self.another_user) + + self.assertEqual(len(self.event.followers), 1) + + def test_remove_a_user_who_is_not_a_follower(self): + """Test remove a user who is not a follower""" + self.assertEqual(len(self.event.followers), 1) + + with self.assertRaises(Exception) as ex: + self.event.remove_follower(self.another_user) + + self.assertEqual(str(ex.__dict__['exception']), "The user is not a follower") + self.assertEqual(len(self.event.followers), 1) + + def test_remove_a_user_who_is_the_author(self): + """Test remove a user who is the author""" + self.assertEqual(len(self.event.followers), 1) + + with self.assertRaises(Exception) as ex: + self.event.remove_follower(self.user) + + self.assertEqual(str(ex.__dict__['exception']), "The user is the author") + self.assertEqual(len(self.event.followers), 1) \ No newline at end of file From a8a4c537851bad8efb0a8ddc06f8d5c7fd6f31ed Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Feb 2019 13:43:34 -0300 Subject: [PATCH 149/606] Fix colorpicker failing test * Pass institution to the ColorPickerController --- frontend/test/specs/home/colorPickerControllerSpec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/test/specs/home/colorPickerControllerSpec.js b/frontend/test/specs/home/colorPickerControllerSpec.js index a25027f38..b7b6fe8c5 100644 --- a/frontend/test/specs/home/colorPickerControllerSpec.js +++ b/frontend/test/specs/home/colorPickerControllerSpec.js @@ -31,7 +31,8 @@ profileService = ProfileService; colorPickerCtrl = $controller('ColorPickerController', { - user: user + user, + institution, }); AuthService.login(user); From fe7ada8b36d1c1b359f9b53717a2314fb68794ac Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 12 Feb 2019 13:56:50 -0300 Subject: [PATCH 150/606] fixed tests for configProfileController --- .../specs/user/configProfileControllerSpec.js | 313 ++++++++++-------- .../configProfile/configProfileController.js | 8 +- 2 files changed, 174 insertions(+), 147 deletions(-) diff --git a/frontend/test/specs/user/configProfileControllerSpec.js b/frontend/test/specs/user/configProfileControllerSpec.js index d31845cb0..f8327c378 100644 --- a/frontend/test/specs/user/configProfileControllerSpec.js +++ b/frontend/test/specs/user/configProfileControllerSpec.js @@ -1,41 +1,44 @@ 'use strict'; -(fdescribe('Test ConfigProfileController', function() { +(describe('Test ConfigProfileController', function() { let configCtrl, httpBackend, scope, userService, createCrtl, state, deferred, - authService, imageService, mdDialog, cropImageService, states, messageService; + authService, imageService, mdDialog, cropImageService, states, messageService, + stateParams, observerRecorderService; - const institution = { - name: 'institution', - key: '987654321' - }; - - const other_institution = { - name: 'other_institution', - key: '3279847298' - }; + let institution, other_institution, user, newUser, authUser; - const user = { - name: 'User', - cpf: '121.445.044-07', - email: 'teste@gmail.com', - institutions: [institution], - uploaded_images: [], - institutions_admin: [], - state: 'active' - }; - - const newUser = { - name: 'newUser', - cpf: '121.115.044-07', - email: 'teste@gmail.com', - institutions: [institution], - institutions_admin: [] + const setUpModels = () => { + institution = { + name: 'institution', + key: '987654321' + }; + + other_institution = { + name: 'other_institution', + key: '3279847298' + }; + + user = new User({ + name: 'User', + cpf: '121.445.044-07', + email: 'teste@gmail.com', + current_institution: institution, + institutions: [institution], + uploaded_images: [], + institutions_admin: [], + state: 'active' + }); + + newUser = new User({ + ...user, + name: 'newUser' + }); }; const fakeCallback = response => { return () => { return { - then: function(callback) { + then: (callback) => { return callback(response); } }; @@ -45,7 +48,8 @@ beforeEach(module('app')); beforeEach(inject(function($controller, $httpBackend, $rootScope, $q, $state, STATES, - $mdDialog, UserService, AuthService, ImageService, CropImageService, MessageService) { + $mdDialog, UserService, AuthService, ImageService, CropImageService, MessageService, + $stateParams, ObserverRecorderService) { httpBackend = $httpBackend; scope = $rootScope.$new(); @@ -58,80 +62,97 @@ cropImageService = CropImageService; messageService = MessageService; authService = AuthService; - - authService.login(user); - + stateParams = $stateParams; + observerRecorderService = ObserverRecorderService; + + createCrtl = function() { return $controller('ConfigProfileController', { - scope: scope, - authService: authService, - userService: userService, - imageService: imageService, - cropImageService : cropImageService, - messageService: messageService - }); + scope: scope, + authService: authService, + userService: userService, + imageService: imageService, + cropImageService : cropImageService, + messageService: messageService + }); }; + + setUpModels(); + authService.login(user); configCtrl = createCrtl(); configCtrl.$onInit(); })); - afterEach(function() { - httpBackend.verifyNoOutstandingExpectation(); - httpBackend.verifyNoOutstandingRequest(); + describe('onInit()', () => { + it('should call _setupUser', () => { + spyOn(configCtrl, '_setupUser'); + configCtrl.$onInit(); + expect(configCtrl._setupUser).toHaveBeenCalled(); + }); }); - xdescribe('main()', function() { - - it("should delete name from user if that is Unknown", function() { - const unknownUser = { - name: 'Unknown' - }; + describe('_setupUser()', function() { - expect(unknownUser.name).not.toBeUndefined(); + it("should set user object and observer when the user can edit", function() { + spyOn(configCtrl, 'canEdit').and.returnValue(true); + spyOn(observerRecorderService, 'register'); + spyOn(configCtrl, '_checkUserName'); + authUser = authService.getCurrentUser(); - authService.getCurrentUser = function() { - return new User(unknownUser); - }; + configCtrl._setupUser(); + + expect(configCtrl.user).toEqual(authUser); + expect(configCtrl.newUser).toEqual(configCtrl.user); + expect(observerRecorderService.register).toHaveBeenCalledWith(authUser); + expect(configCtrl._checkUserName).toHaveBeenCalled(); + }); - // configCtrl = createCrtl(); + it("should get the user via when the user can not edit", function() { + spyOn(configCtrl, 'canEdit').and.returnValue(false); + spyOn(userService, 'getUser').and.callFake(fakeCallback(user)); + stateParams.userKey = "user-key"; - expect(configCtrl.newUser.name).toBeUndefined(); + configCtrl._setupUser(); + + expect(userService.getUser).toHaveBeenCalledWith(stateParams.userKey); + expect(configCtrl.user).toEqual(user); }); }); - describe('finish()', function(){ + describe('_checkUserName()', () => { - it("Should show a message when the user is invalid", function(){ - spyOn(messageService, 'showToast'); - spyOn(configCtrl, '_saveImage').and.returnValue(Promise.resolve()); - spyOn(configCtrl.newUser, 'isValid').and.returnValue(false); - configCtrl._saveUser().should.be.resolved; - expect(messageService.showToast).toHaveBeenCalledWith("Campos obrigatórios não preenchidos corretamente."); + it("should not delete user and newUser name prop when it is not 'UnKnown'", () => { + configCtrl.user = user; + configCtrl.newUser = newUser; + configCtrl._checkUserName(); + expect(configCtrl.user.name).toBe(user.name); + expect(configCtrl.newUser.name).toBe(newUser.name); }); - xit('Should change informations of user from system', function(done) { - spyOn(state, 'go'); - spyOn(userService, 'save').and.callThrough(); - - spyOn(authService, 'save'); - - - expect(configCtrl.newUser.name).toEqual(user.name); - expect(configCtrl.newUser.email).toEqual(user.email); - expect(configCtrl.newUser.cpf).toEqual(user.cpf); - - httpBackend.expect('PATCH', '/api/user').respond(newUser); - - const promise = configCtrl.finish(); + it("should delete user and newUser name prop when it is 'UnKnown'", () => { + configCtrl.user = {...user, name:'Unknown'}; + configCtrl.newUser = {...configCtrl.user}; + configCtrl._checkUserName(); + expect(configCtrl.user.name).toBeUndefined(); + expect(configCtrl.newUser.name).toBeUndefined(); + }); + }); - promise.should.be.fulfilled.then(function() { - expect(state.go).toHaveBeenCalledWith(states.HOME); - expect(userService.save).toHaveBeenCalled(); - expect(authService.save).toHaveBeenCalled(); - }).should.notify(done); + describe('canEdit', () => { + it(`should be true when the loggend user is accessing + its on profile page`, () => { + user.key = "user-key"; + authService.getCurrentUser = () => user; + stateParams.userKey = user.key; + expect(configCtrl.canEdit()).toBe(true); + }); - httpBackend.flush(); - scope.$apply(); + it(`should be false when the loggend user is accessing + the profile page of another user`, () => { + user.key = "user-key"; + authService.getCurrentUser = () => user; + stateParams.userKey = "other-user-key"; + expect(configCtrl.canEdit()).toBe(false); }); }); @@ -171,78 +192,76 @@ }); }); - xdescribe('removeInstitution()', function() { - - let promise; - - beforeEach(function() { - spyOn(configCtrl.newUser, 'isAdmin'); - - spyOn(mdDialog, 'show').and.callFake(function() { - return { - then: function(callback) { - return callback(); - } - }; - }); + describe('finish()', function(){ - spyOn(userService, 'deleteInstitution').and.callFake(function() { - return { - then: function(callback) { - return callback(); - } - }; - }); + it('Should call _saveImage and _saveUser', function() { + spyOn(configCtrl, '_saveImage').and.returnValue(deferred.promise); + spyOn(configCtrl, '_saveUser').and.returnValue(deferred.promise); + configCtrl.loadingSubmission = true; + deferred.resolve(); + + configCtrl.finish(); + scope.$apply(); + + expect(configCtrl._saveImage).toHaveBeenCalled(); + expect(configCtrl._saveUser).toHaveBeenCalled(); + expect(configCtrl.loadingSubmission).toBe(false); + }); + }); - spyOn(authService, 'logout').and.callFake(function() { - return { - then: function(callback) { - return callback(); - } - }; - }); + describe('_saveImage', () => { + + it('should save the image if there is a new one', () => { + const userImage = createImage(50); + const data = {url: 'img-url'}; + configCtrl.photo_user = userImage; + expect(configCtrl.user.photo_url).toBeUndefined(); + spyOn(imageService, 'saveImage').and.returnValue(deferred.promise); + spyOn(configCtrl.user.uploaded_images, 'push'); + deferred.resolve(data); + + configCtrl._saveImage(); + scope.$apply(); - spyOn(authService, 'save').and.callThrough(); - promise = configCtrl.removeInstitution('$event', institution); + expect(imageService.saveImage).toHaveBeenCalledWith(configCtrl.photo_user); + expect(configCtrl.user.photo_url).toBe(data.url); + expect(configCtrl.user.uploaded_images.push).toHaveBeenCalledWith(data.url); }); - it('Should call user.isAdmin()', function(done) { - promise.then(function() { - expect(configCtrl.newUser.isAdmin).toHaveBeenCalled(); - done(); - }); + it('should do nothing when there is no image to save', () => { + configCtrl.photo_user = undefined; + spyOn(imageService, 'saveImage'); + configCtrl._saveImage(); + expect(imageService.saveImage).not.toHaveBeenCalled(); }); + }); - it('Should call mdDialog.show()', function(done) { - promise.then(function() { - expect(mdDialog.show).toHaveBeenCalled(); - done(); - }); - }); + describe('_saveUser()', () => { - it('Should call userService.deleteInstitution()', function(done) { - promise.then(function() { - expect(userService.deleteInstitution).toHaveBeenCalledWith(institution.key); - done(); - }); - }); + it('should save the user and show a message', () => { + const patch = {name: 'newName'}; + spyOn(configCtrl.newUser, 'isValid').and.returnValue(true); + spyOn(observerRecorderService, 'generate').and.returnValue(patch); + spyOn(userService, 'save').and.returnValue(deferred.promise); + spyOn(authService, 'save'); + spyOn(messageService, 'showToast'); + deferred.resolve(); - it('Should call authService.logout()', function(done) { - promise.then(function() { - expect(authService.logout).toHaveBeenCalled(); - done(); - }); + configCtrl._saveUser(); + scope.$apply(); + + expect(observerRecorderService.generate).toHaveBeenCalled(); + expect(userService.save).toHaveBeenCalledWith(patch); + expect(authService.save).toHaveBeenCalledWith(); + expect(messageService.showToast).toHaveBeenCalledWith("Edição concluída com sucesso"); }); - it('Should call authService.save()', function(done) { - user.institutions.push(other_institution); - promise = configCtrl.removeInstitution('$event', institution); - - promise.then(function() { - expect(user.institutions).toEqual([other_institution]); - expect(authService.save).toHaveBeenCalled(); - done(); - }); + it("Should show a message when the user is invalid", function(){ + spyOn(messageService, 'showToast'); + spyOn(configCtrl, '_saveImage').and.returnValue(Promise.resolve()); + spyOn(configCtrl.newUser, 'isValid').and.returnValue(false); + configCtrl._saveUser().should.be.resolved; + expect(messageService.showToast).toHaveBeenCalledWith("Campos obrigatórios não preenchidos corretamente."); }); }); @@ -286,4 +305,12 @@ expect(mdDialog.show).toHaveBeenCalled(); }); }); + + describe('goBack()', () => { + it('should call the window back function', () => { + spyOn(window.history, 'back'); + configCtrl.goBack(); + expect(window.history.back).toHaveBeenCalled(); + }); + }); })); \ No newline at end of file diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index 0c81426e8..673fc964c 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -17,22 +17,22 @@ "exceto por meio de novo convite. Deseja realmente excluir sua conta?"; configProfileCtrl.$onInit = () => { - setupUser(); + configProfileCtrl._setupUser(); } - const setupUser = () => { + configProfileCtrl._setupUser = () => { if(configProfileCtrl.canEdit()) { configProfileCtrl.user = AuthService.getCurrentUser(); configProfileCtrl.newUser = _.cloneDeep(configProfileCtrl.user); observer = ObserverRecorderService.register(configProfileCtrl.user); - checkUserName(); + configProfileCtrl._checkUserName(); } else { UserService.getUser($stateParams.userKey) .then(user => configProfileCtrl.user = user); } } - const checkUserName = () => { + configProfileCtrl._checkUserName = () => { if (configProfileCtrl.user.name === 'Unknown') { delete configProfileCtrl.user.name; delete configProfileCtrl.newUser.name; From 497e4ad93b33135d2f4ae4e4f6d9207668cb9c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 12 Feb 2019 13:58:44 -0300 Subject: [PATCH 151/606] Fix dialog to doesn't change on desktop --- .../institution/institutionCardDirective.js | 2 +- frontend/institution/institutionController.js | 2 +- frontend/institution/institutionService.js | 3 + .../requests/request_invitation_dialog.html | 80 ++++++++++--------- .../request_invitation_dialog_mobile.html | 40 ++++++++++ 5 files changed, 88 insertions(+), 39 deletions(-) create mode 100644 frontend/requests/request_invitation_dialog_mobile.html diff --git a/frontend/institution/institutionCardDirective.js b/frontend/institution/institutionCardDirective.js index bcdb50796..1ac1bbbe7 100644 --- a/frontend/institution/institutionCardDirective.js +++ b/frontend/institution/institutionCardDirective.js @@ -70,7 +70,7 @@ $mdDialog.show({ controller: "RequestInvitationController", controllerAs: "requestInvCtrl", - templateUrl: 'app/requests/request_invitation_dialog.html', + templateUrl: InstitutionService.getRequestInvitationTemplate(), parent: angular.element(document.body), targetEvent: event, locals: { diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index 18b9c3cab..3d53a6056 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -296,7 +296,7 @@ $mdDialog.show({ controller: "RequestInvitationController", controllerAs: "requestInvCtrl", - templateUrl: 'app/requests/request_invitation_dialog.html', + templateUrl: InstitutionService.getRequestInvitationTemplate(), parent: angular.element(document.body), targetEvent: event, locals: { diff --git a/frontend/institution/institutionService.js b/frontend/institution/institutionService.js index b5caa5354..5fb3422b2 100644 --- a/frontend/institution/institutionService.js +++ b/frontend/institution/institutionService.js @@ -76,5 +76,8 @@ const path = (isParent) ? 'institution_children' : 'institution_parent'; return HttpService.delete(INSTITUTIONS_URI + "/" + institutionKey + "/hierarchy/" + institutionLink + '/' + path); }; + + service.getRequestInvitationTemplate = () => Utils.isMobileScreen() ? + "app/requests/request_invitation_dialog_mobile.html" : "app/requests/request_invitation_dialog.html"; }); })(); \ No newline at end of file diff --git a/frontend/requests/request_invitation_dialog.html b/frontend/requests/request_invitation_dialog.html index c7eceff01..877a21372 100644 --- a/frontend/requests/request_invitation_dialog.html +++ b/frontend/requests/request_invitation_dialog.html @@ -1,40 +1,46 @@ - - - - Solicitar vínculo institucional - {{requestInvCtrl.request.institution_name}} - - - - -
    -
    Este campo é obrigatório!
    -
    -     + +
    + + + + + Solicitar Cadastro + {{requestInvCtrl.request.institution_name}} + + + + + + + +
    +
    Este campo é obrigatório!
    +
    +     - - - -
    -
    Este campo é obrigatório!
    -
    -     + + + +
    +
    Este campo é obrigatório!
    +
    +     - - - -
    -
    Este campo é obrigatório!
    -
    -     -
    - - Cancelar - - - Confirmar - -
    - - + + + +
    +
    Este campo é obrigatório!
    +
    +     +
    + + Solicitar Cadastro + +
    + +     +     +
    diff --git a/frontend/requests/request_invitation_dialog_mobile.html b/frontend/requests/request_invitation_dialog_mobile.html new file mode 100644 index 000000000..c7eceff01 --- /dev/null +++ b/frontend/requests/request_invitation_dialog_mobile.html @@ -0,0 +1,40 @@ + + + + Solicitar vínculo institucional + {{requestInvCtrl.request.institution_name}} +
    + + + +
    +
    Este campo é obrigatório!
    +
    +     + + + + +
    +
    Este campo é obrigatório!
    +
    +     + + + + +
    +
    Este campo é obrigatório!
    +
    +     +
    + + Cancelar + + + Confirmar + +
    +
    +     +     From cac5fa93c14dc588d003f5355385bca450840592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 12 Feb 2019 14:05:24 -0300 Subject: [PATCH 152/606] Remove unused css id --- frontend/notification/notification_list_mobile.css | 6 ------ 1 file changed, 6 deletions(-) diff --git a/frontend/notification/notification_list_mobile.css b/frontend/notification/notification_list_mobile.css index 5c5da45c1..3f661ce83 100644 --- a/frontend/notification/notification_list_mobile.css +++ b/frontend/notification/notification_list_mobile.css @@ -13,12 +13,6 @@ margin-top: 1%; } -#mobile-notification-empty { - display: grid; - grid-template-columns: auto; - text-align: center; -} - #mobile-notification-content { display: grid; grid-template-columns: auto; From 9e69ab243c0bdd1593f5fdd0340d5e8995d30783 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 12 Feb 2019 14:24:12 -0300 Subject: [PATCH 153/606] Fix post width --- frontend/post/post_page.html | 6 +++--- frontend/styles/custom.css | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/post/post_page.html b/frontend/post/post_page.html index 9a0d55a1e..fd80abb77 100644 --- a/frontend/post/post_page.html +++ b/frontend/post/post_page.html @@ -4,11 +4,11 @@
    - +
    - +
    - +

    Esta publicação foi removida.

    diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index b78bd0377..d4562386e 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -1161,4 +1161,8 @@ md-input-container:not(.md-input-invalid).md-input-has-value .inputEmail { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; +} + +#post { + width: 100%; } \ No newline at end of file From 04f6784c3c035134de8c65841833ec6ba3d928fa Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 12 Feb 2019 14:41:16 -0300 Subject: [PATCH 154/606] Fix sid-menu height --- frontend/post/post_page.html | 2 +- frontend/styles/custom.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/post/post_page.html b/frontend/post/post_page.html index fd80abb77..faa4a0bfd 100644 --- a/frontend/post/post_page.html +++ b/frontend/post/post_page.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index d4562386e..9368bcded 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -1165,4 +1165,8 @@ md-input-container:not(.md-input-invalid).md-input-has-value .inputEmail { #post { width: 100%; +} + +#post-page-container { + height: 100%; } \ No newline at end of file From bfff9f0feb498f1693bf151d031f9769374fc4f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 12 Feb 2019 14:08:15 -0300 Subject: [PATCH 155/606] Remove unused variable --- frontend/utils/is-empty-card/is-empty-card.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/utils/is-empty-card/is-empty-card.component.js b/frontend/utils/is-empty-card/is-empty-card.component.js index 2c0417dbb..dc74f0478 100644 --- a/frontend/utils/is-empty-card/is-empty-card.component.js +++ b/frontend/utils/is-empty-card/is-empty-card.component.js @@ -11,7 +11,7 @@ }); function isEmptyCardController() { - const isEmptyCardCtrl = this; + } })(); \ No newline at end of file From 79fc36035908e1b78fc826e921c84a2b2a09cb7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 12 Feb 2019 14:17:12 -0300 Subject: [PATCH 156/606] Add jsdoc to is-empty-card component --- frontend/utils/is-empty-card/is-empty-card.component.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/utils/is-empty-card/is-empty-card.component.js b/frontend/utils/is-empty-card/is-empty-card.component.js index dc74f0478..f34f6b275 100644 --- a/frontend/utils/is-empty-card/is-empty-card.component.js +++ b/frontend/utils/is-empty-card/is-empty-card.component.js @@ -1,6 +1,13 @@ (function () { 'use strict'; + /** + * Component that is shown when something is empty and in the error page. + * It's shows a default image and a text that it receives as a binding. + * @class isEmptyCard + * @example + * + */ angular.module("app").component("isEmptyCard", { templateUrl: "app/utils/is-empty-card/is-empty-card.html", controller: isEmptyCardController, From 38555a2d5458ac4bbd2a962dad7d55b510ca07a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 12 Feb 2019 14:34:50 -0300 Subject: [PATCH 157/606] Add is-empty-card component to error page --- frontend/error/error.html | 3 ++- frontend/error/errorController.js | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/error/error.html b/frontend/error/error.html index 5981c35b0..fdd86a2d7 100644 --- a/frontend/error/error.html +++ b/frontend/error/error.html @@ -1,5 +1,5 @@ -
    +
    @@ -36,4 +36,5 @@
    + \ No newline at end of file diff --git a/frontend/error/errorController.js b/frontend/error/errorController.js index 379e5388c..044c01385 100644 --- a/frontend/error/errorController.js +++ b/frontend/error/errorController.js @@ -16,5 +16,7 @@ errorCtrl.goToReport = function goToReport() { $window.open("http://support.plataformacis.org/report"); } + + errorCtrl.isMobileScreen = () => Utils.isMobileScreen(); }); })(); \ No newline at end of file From c0304ccdf5fe99f2b5254651d0b7be03a05b28de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 12 Feb 2019 14:41:25 -0300 Subject: [PATCH 158/606] Change mobile message on timeline to be equals to desktop when empty --- frontend/post/timeline.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/post/timeline.html b/frontend/post/timeline.html index 34bb2272d..f4c6b4ed9 100644 --- a/frontend/post/timeline.html +++ b/frontend/post/timeline.html @@ -1,6 +1,6 @@
    - +
    From 41e18160cd29edff5ad40818c79ce3392420a5f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 12 Feb 2019 14:45:06 -0300 Subject: [PATCH 159/606] Add previously version to desktop timeline --- frontend/post/timeline.html | 7 ++++++- frontend/post/timelineDirective.js | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/post/timeline.html b/frontend/post/timeline.html index f4c6b4ed9..d39ac0b45 100644 --- a/frontend/post/timeline.html +++ b/frontend/post/timeline.html @@ -1,7 +1,12 @@
    - + + + +

    Esta instituição ainda não possui publicações.

    +     +
    VOCÊ TEM NOVOS POSTS diff --git a/frontend/post/timelineDirective.js b/frontend/post/timelineDirective.js index 0704e28a8..c619381eb 100644 --- a/frontend/post/timelineDirective.js +++ b/frontend/post/timelineDirective.js @@ -56,6 +56,8 @@ return timelineCtrl.posts.loadMorePosts(); }; + timelineCtrl.isMobileScreen = () => Utils.isMobileScreen(); + /** * Set the properties necessary to make the default Timeline work * with the expected values to this context. From 72860c1b294ccffb89252c982529e9c495b232d9 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 12 Feb 2019 14:49:18 -0300 Subject: [PATCH 160/606] Add max-height in post card --- frontend/post/post_page.html | 2 +- frontend/styles/custom.css | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/frontend/post/post_page.html b/frontend/post/post_page.html index faa4a0bfd..183d3452d 100644 --- a/frontend/post/post_page.html +++ b/frontend/post/post_page.html @@ -3,7 +3,7 @@ -
    +
    diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index 9368bcded..2b4433883 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -1169,4 +1169,13 @@ md-input-container:not(.md-input-invalid).md-input-has-value .inputEmail { #post-page-container { height: 100%; +} + +#post-content { + max-height: 100%; +} + +#post-content > div { + max-height: 100%; + overflow-y: auto; } \ No newline at end of file From a7400cf297dadd769bcb2d63425e64e40ea957d6 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Tue, 12 Feb 2019 14:56:14 -0300 Subject: [PATCH 161/606] Testing the client --- frontend/post/postDetailsDirective.js | 2 +- .../specs/event/eventDetailsControllerSpec.js | 57 +++++++++++++- frontend/test/specs/event/eventServiceSpec.js | 20 +++++ frontend/test/specs/event/eventSpec.js | 32 +++++++- .../specs/post/postDetailsControllerSpec.js | 75 ++++++++++++++++++- 5 files changed, 181 insertions(+), 5 deletions(-) diff --git a/frontend/post/postDetailsDirective.js b/frontend/post/postDetailsDirective.js index fc9a1cc26..4665524b5 100644 --- a/frontend/post/postDetailsDirective.js +++ b/frontend/post/postDetailsDirective.js @@ -280,7 +280,7 @@ }; postDetailsCtrl.isFollowingEvent = () => { - const eventFollowers = postDetailsCtrl.post.shared_event.followers; + const eventFollowers = (postDetailsCtrl.post.shared_event && postDetailsCtrl.post.shared_event.followers) || []; return _.includes(eventFollowers, postDetailsCtrl.user.key); }; diff --git a/frontend/test/specs/event/eventDetailsControllerSpec.js b/frontend/test/specs/event/eventDetailsControllerSpec.js index 709d4d76b..4b1f80285 100644 --- a/frontend/test/specs/event/eventDetailsControllerSpec.js +++ b/frontend/test/specs/event/eventDetailsControllerSpec.js @@ -2,7 +2,7 @@ (describe('Test EventDetailsController', function () { - let eventCtrl, scope, httpBackend, rootScope, deffered, eventService, messageService, mdDialog, state; + let eventCtrl, scope, q, httpBackend, rootScope, deffered, eventService, messageService, mdDialog, state; const splab = { name: 'Splab', key: '098745' }, @@ -47,6 +47,7 @@ messageService = MessageService; mdDialog = $mdDialog; state = $state; + q = $q; AuthService.login(user); eventCtrl = $controller('EventDetailsController', { @@ -250,4 +251,58 @@ expect(returnedHours).toEqual(hours); }); }); + + describe('isFollower()', () => { + beforeEach(() => { + eventCtrl.event = new Event({ + followers: [] + }); + }); + + it('should return true when the user is following the event', () => { + eventCtrl.event.addFollower(user.key); + expect(eventCtrl.isFollower()).toEqual(true); + }); + + it('should return false when the user is not following the event', () => { + expect(eventCtrl.isFollower()).toEqual(false); + }); + }); + + describe('addFollower()', () => { + it('should call addFollower', () => { + spyOn(eventService, 'addFollower').and.callFake(() => { + return q.when(); + }); + spyOn(messageService, 'showToast'); + eventCtrl.event = new Event({ key: 'aopskdopas-OKAPODKAOP', followers: [] }); + spyOn(eventCtrl.event, 'addFollower').and.callThrough(); + + eventCtrl.addFollower(); + scope.$apply(); + + expect(eventService.addFollower).toHaveBeenCalled(); + expect(messageService.showToast).toHaveBeenCalled(); + expect(eventCtrl.event.addFollower).toHaveBeenCalled(); + expect(eventCtrl.event.followers).toEqual([user.key]); + }); + }); + + describe('removeFollower()', () => { + it('should call removeFollower', () => { + spyOn(eventService, 'removeFollower').and.callFake(() => { + return q.when(); + }); + spyOn(messageService, 'showToast'); + eventCtrl.event = new Event({ key: 'aopskdopas-OKAPODKAOP', followers: [] }); + spyOn(eventCtrl.event, 'removeFollower').and.callThrough(); + + eventCtrl.removeFollower(); + scope.$apply(); + + expect(eventService.removeFollower).toHaveBeenCalled(); + expect(messageService.showToast).toHaveBeenCalled(); + expect(eventCtrl.event.removeFollower).toHaveBeenCalled(); + }); + }); })); \ No newline at end of file diff --git a/frontend/test/specs/event/eventServiceSpec.js b/frontend/test/specs/event/eventServiceSpec.js index 7a3188fa1..09f4401fc 100644 --- a/frontend/test/specs/event/eventServiceSpec.js +++ b/frontend/test/specs/event/eventServiceSpec.js @@ -133,5 +133,25 @@ httpBackend.flush(); expect($http.patch).toHaveBeenCalledWith(EVENT_URI + '/' + event.key, patch); }); + + describe('addFollower', () => { + it('should call post', () => { + spyOn($http, 'post'); + + service.addFollower(); + + expect($http.post).toHaveBeenCalled(); + }); + }); + + describe('removeFollower', () => { + it('should call delete', () => { + spyOn($http, 'delete'); + + service.removeFollower(); + + expect($http.delete).toHaveBeenCalled(); + }); + }); }); })); \ No newline at end of file diff --git a/frontend/test/specs/event/eventSpec.js b/frontend/test/specs/event/eventSpec.js index fe3022987..e51ae4a44 100644 --- a/frontend/test/specs/event/eventSpec.js +++ b/frontend/test/specs/event/eventSpec.js @@ -13,7 +13,8 @@ title: 'event test', local: 'test', start_time, - end_time + end_time, + followers: [] }; }); @@ -54,4 +55,33 @@ expect(event.end_time).toEqual(end_time_conv); }); }); + + describe('addFollower()', () => { + it('should add the user in followers array', () => { + const event = new Event(eventData, institution_key); + + expect(event.followers).toEqual([]); + + const mockedKey = 'aopkdopkasop-AKPDFKOSPAF'; + event.addFollower(mockedKey); + + expect(event.followers).toEqual([mockedKey]); + }); + }); + + describe('removeFollower()', () => { + it('should remove a follower', () => { + const event = new Event(eventData, institution_key); + + expect(event.followers).toEqual([]); + + const mockedKey = 'aopkdopkasop-AKPDFKOSPAF'; + event.addFollower(mockedKey); + + expect(event.followers).toEqual([mockedKey]); + + event.removeFollower(mockedKey); + expect(event.followers).toEqual([]); + }); + }); })); \ No newline at end of file diff --git a/frontend/test/specs/post/postDetailsControllerSpec.js b/frontend/test/specs/post/postDetailsControllerSpec.js index 54ca02451..221a4bcff 100644 --- a/frontend/test/specs/post/postDetailsControllerSpec.js +++ b/frontend/test/specs/post/postDetailsControllerSpec.js @@ -4,7 +4,7 @@ beforeEach(module('app')); let postDetailsCtrl, scope, httpBackend, rootScope, mdDialog, postService, mdToast, http, - commentService, state, posts, rootscope, states; + commentService, state, posts, rootscope, states, q, eventService, messageService; var user = { name: 'name', key: 'asd234jk2l', @@ -46,7 +46,8 @@ beforeEach(inject(function($controller, $httpBackend, HttpService, $mdDialog, STATES, - PostService, AuthService, $mdToast, $rootScope, CommentService, $state) { + PostService, AuthService, $mdToast, $rootScope, CommentService, $state, $q, + EventService, MessageService) { scope = $rootScope.$new(); rootscope = $rootScope; httpBackend = $httpBackend; @@ -58,6 +59,9 @@ state = $state; states = STATES; commentService = CommentService; + q = $q; + eventService = EventService; + messageService = MessageService; commentService.user = user; postService.user = user; var mainPost = new Post({ @@ -613,4 +617,71 @@ expect(returnedValue).toBeFalsy(); }); }); + + describe('isSharedEvent()', () => { + it('should be truthy when the post is a shared_event', () => { + postDetailsCtrl.post = new Post({shared_event : {}}); + expect(postDetailsCtrl.isSharedEvent()).toBeTruthy(); + }); + + it('should be falsy when the post is not a shared_event', () => { + postDetailsCtrl.post = new Post({ }); + expect(postDetailsCtrl.isSharedEvent()).toBeFalsy(); + }); + }); + + describe('followEvent()', () => { + it('should call addFollower', () => { + spyOn(eventService, 'addFollower').and.callFake(() => { + return q.when(); + }); + spyOn(messageService, 'showToast'); + postDetailsCtrl.post = new Post({ + shared_event: new Event({followers: []}) + }); + + postDetailsCtrl.followEvent(); + scope.$apply(); + + expect(eventService.addFollower).toHaveBeenCalled(); + expect(messageService.showToast).toHaveBeenCalled(); + expect(postDetailsCtrl.post.shared_event.followers).toEqual([user.key]); + }); + }); + + describe('unfollowEvent()', () => { + it('should call removeFollower', () => { + spyOn(eventService, 'removeFollower').and.callFake(() => { + return q.when(); + }); + spyOn(messageService, 'showToast'); + postDetailsCtrl.post = new Post({ + shared_event: new Event({ followers: [postDetailsCtrl.user.key] }) + }); + + postDetailsCtrl.unFollowEvent(); + scope.$apply(); + + expect(eventService.removeFollower).toHaveBeenCalled(); + expect(messageService.showToast).toHaveBeenCalled(); + }); + }); + + describe('isFollowingEvent()', () => { + it('should return true', () => { + postDetailsCtrl.post = new Post({ + shared_event: new Event({ followers: [postDetailsCtrl.user.key] }) + }); + + expect(postDetailsCtrl.isFollowingEvent()).toEqual(true); + }); + + it('should return false', () => { + postDetailsCtrl.post = new Post({ + shared_event: new Event({ followers: [] }) + }); + + expect(postDetailsCtrl.isFollowingEvent()).toEqual(false); + }); + }); })); \ No newline at end of file From 5714696748372caab5954ed8468188a69fd14659 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 12 Feb 2019 15:10:52 -0300 Subject: [PATCH 162/606] fixed tests for editProfileController --- .../specs/user/editProfileControllerSpec.js | 162 +++++++++++++----- 1 file changed, 117 insertions(+), 45 deletions(-) diff --git a/frontend/test/specs/user/editProfileControllerSpec.js b/frontend/test/specs/user/editProfileControllerSpec.js index 7c515bf95..5f75a1736 100644 --- a/frontend/test/specs/user/editProfileControllerSpec.js +++ b/frontend/test/specs/user/editProfileControllerSpec.js @@ -2,69 +2,141 @@ (describe('Test EditProfileController', function() { - var httpBackend, scope, mdDialog, authService, profileService, editProfileCtrl, createCrtl, userToEdit; - - var institution = { - name: 'INSTITUTION', - key: '987654321' - }; - - var user = { - name: 'User', - email: 'teste@gmail', - institutions: [institution], - institution_profiles: [{ - office: 'developer', - phone: '(99) 99999-9999', - email: 'teste@gmail.com', - institution_key: institution.key - }], - state: 'active' - }; + let scope, mdDialog, authService, profileService, messageService, + editProfileCtrl, observerRecorderService, userToEdit, deferred; + + let institution, user, profile; + + const setupModels = () => { + institution = { + name: 'INSTITUTION', + key: '987654321' + }; + + user = { + name: 'User', + email: 'teste@gmail', + institutions: [institution], + institution_profiles: [{ + office: 'developer', + phone: '(99) 99999-9999', + email: 'teste@gmail.com', + institution_key: institution.key + }], + state: 'active' + }; + + profile = { + office: 'member', + email: user.email, + institution: institution + }; + } beforeEach(module('app')); - beforeEach(inject(function($controller, $httpBackend, $rootScope, ProfileService, - $mdDialog, AuthService, MessageService) { + beforeEach(inject(function($controller, $rootScope, ProfileService, + $mdDialog, AuthService, MessageService, ObserverRecorderService, $q) { - httpBackend = $httpBackend; - httpBackend.when('GET', 'main/main.html').respond(200); - httpBackend.when('GET', 'home/home.html').respond(200); - httpBackend.when('GET', 'user/edit_profile.html').respond(200); - httpBackend.when('GET', 'auth/login.html').respond(200); profileService = ProfileService; scope = $rootScope.$new(); mdDialog = $mdDialog; + deferred = $q.defer(); authService = AuthService; + observerRecorderService = ObserverRecorderService; + messageService = MessageService; + setupModels(); authService.login(user); - userToEdit = authService.getCurrentUser(); - createCrtl = function() { - return $controller('EditProfileController', { - scope: scope, - institution: institution, - user: userToEdit, - profileService: profileService, - authService: authService, - mdDialog: mdDialog, - MessageService: MessageService - }); - }; - editProfileCtrl = createCrtl(); + editProfileCtrl = $controller('EditProfileController', { + scope: scope, + profile: profile, + institution: institution, + user: userToEdit, + profileService: profileService, + authService: authService, + mdDialog: mdDialog, + MessageService: MessageService + }); + editProfileCtrl.$onInit(); })); + describe('onInit()', () => { + it('should set user, profile and observer', () => { + spyOn(authService, 'getCurrentUser').and.returnValue(user); + spyOn(observerRecorderService, 'register'); + + editProfileCtrl.$onInit(); + + expect(editProfileCtrl.user).toBe(user); + expect(editProfileCtrl.profile).toBe(profile); + expect(observerRecorderService.register).toHaveBeenCalledWith(editProfileCtrl.user); + }); + }); + + describe('getIntName()', () => { + it('should call limitString', () => { + spyOn(Utils, 'limitString'); + editProfileCtrl.getInstName(); + expect(Utils.limitString).toHaveBeenCalledWith(profile.institution.name, 67); + }); + }); + describe('edit', function() { it('should call editProfile() and save()', function() { - spyOn(profileService, 'editProfile').and.callThrough(); - spyOn(authService, 'save').and.callThrough(); - httpBackend.expect('PATCH', '/api/user').respond(userToEdit); - userToEdit.institution_profiles[0].office = 'Developer'; + const patch = {...profile, office: 'developer'}; + spyOn(observerRecorderService, 'generate').and.returnValue(patch); + spyOn(profileService, 'editProfile').and.returnValue(deferred.promise); + spyOn(authService, 'save'); + spyOn(messageService, 'showToast'); + spyOn(mdDialog, 'hide'); + deferred.resolve(); + editProfileCtrl.edit(); - httpBackend.flush(); - expect(profileService.editProfile).toHaveBeenCalled(); + scope.$apply(); + + expect(observerRecorderService.generate).toHaveBeenCalled(); + expect(profileService.editProfile).toHaveBeenCalledWith(patch); + expect(messageService.showToast).toHaveBeenCalledWith('Perfil editado com sucesso'); expect(authService.save).toHaveBeenCalled(); + expect(mdDialog.hide).toHaveBeenCalled(); + }); + + it('should not call editProfile() if there is no alterations', function() { + const patch = {}; + spyOn(observerRecorderService, 'generate').and.returnValue(patch); + spyOn(profileService, 'editProfile'); + spyOn(mdDialog, 'hide'); + + editProfileCtrl.edit(); + + expect(observerRecorderService.generate).toHaveBeenCalled(); + expect(profileService.editProfile).not.toHaveBeenCalled(); + expect(mdDialog.hide).toHaveBeenCalled(); + }); + + it('should show a message when the edited profile is invalid', () => { + editProfileCtrl.profile.office = undefined; + spyOn(observerRecorderService, 'generate'); + spyOn(profileService, 'editProfile'); + spyOn(messageService, 'showToast'); + + editProfileCtrl.edit(); + + expect(observerRecorderService.generate).not.toHaveBeenCalled(); + expect(profileService.editProfile).not.toHaveBeenCalled(); + expect(messageService.showToast).toHaveBeenCalledWith('O cargo é obrigatório.'); + }); + }); + + describe('removeProfile()', () => { + it('should call the removeProfile function from ProfileService', () => { + spyOn(profileService, 'removeProfile'); + const event = {}; + editProfileCtrl.removeProfile(event); + expect(profileService.removeProfile).toHaveBeenCalledWith(event, editProfileCtrl.profile.institution); }); }); From d5d29a00a988223dba2e711d80d161de4bff17c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 12 Feb 2019 15:09:02 -0300 Subject: [PATCH 163/606] Adds toolbar and sidenav on error page --- frontend/error/error.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/error/error.html b/frontend/error/error.html index fdd86a2d7..65cea2f65 100644 --- a/frontend/error/error.html +++ b/frontend/error/error.html @@ -36,5 +36,9 @@
    - +
    + + + +
    \ No newline at end of file From b417b763f9563146c1dc929da1df1e5383a281c9 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Feb 2019 15:12:38 -0300 Subject: [PATCH 164/606] Fix colorPickerControllerSpec --- .../specs/home/colorPickerControllerSpec.js | 58 ++++++++++++++----- 1 file changed, 45 insertions(+), 13 deletions(-) diff --git a/frontend/test/specs/home/colorPickerControllerSpec.js b/frontend/test/specs/home/colorPickerControllerSpec.js index b7b6fe8c5..934eb68e2 100644 --- a/frontend/test/specs/home/colorPickerControllerSpec.js +++ b/frontend/test/specs/home/colorPickerControllerSpec.js @@ -8,7 +8,15 @@ var institution = { 'email' : 'institution@gmail.com', 'key': '123456', - 'institution_key' : '123456' + 'institution_key' : '123456', + 'color' : 'teal', + }; + + let secondInstitution = { + 'email' : 'institution2@gmail.com', + 'key': '1234567', + 'institution_key' : '1234567', + 'color' : 'teal', }; var colors = [{'value' : 'red'}, {'value':'purple'}, {'value':'blue'}]; @@ -17,10 +25,10 @@ 'name' : 'user', 'key': '12345', 'state' : 'active', - 'institution_profiles': [institution], - 'current_institution' : institution + 'institution_profiles': [institution, secondInstitution], + 'current_institution' : institution, }; - + beforeEach(inject(function ($controller, $httpBackend, HttpService, $mdDialog, AuthService, $rootScope, ProfileService) { scope = $rootScope.$new(); @@ -55,25 +63,49 @@ describe('saveColor()', function() { beforeEach(function() { spyOn(profileService, 'editProfile').and.callThrough(); - }); - it('Should return true', function(done) { - var change = { + it('should change first institutions color', function(done) { + let change = { 'color' : 'blue', 'email' : 'institution@gmail.com', 'key': '123456', 'institution_key' : '123456' }; - colorPickerCtrl.newProfile = change; - colorPickerCtrl.newUser.institution_profiles = [change]; + colorPickerCtrl.newUser.institution_profiles = [change, secondInstitution]; + let diff = jsonpatch.compare(colorPickerCtrl.user, colorPickerCtrl.newUser); httpBackend.expect('PATCH', '/api/user').respond(200); - var promise = colorPickerCtrl.saveColor(); + let promise = colorPickerCtrl.saveColor(); promise.should.be.fulfilled.then(function() { - expect(colorPickerCtrl.user.getProfileColor()).toBe('blue'); - expect(colorPickerCtrl.user.institution_profiles).toHaveBeenCalled(change); - }).should.notify(done); + expect(colorPickerCtrl.user).toEqual(colorPickerCtrl.newUser); + expect(colorPickerCtrl.user.institution_profiles[0]).toEqual(change); + expect(profileService.editProfile).toHaveBeenCalledWith(diff); + done(); + }); + httpBackend.flush(); + scope.$apply(); + }); + + it('should change second institutions color', (done) => { + let change = { + 'color': 'red', + 'email' : 'institution2@gmail.com', + 'key': '1234567', + 'institution_key' : '1234567' + } + + colorPickerCtrl.newUser.institution_profiles = [institution, change]; + let diff = jsonpatch.compare(colorPickerCtrl.user, colorPickerCtrl.newUser); + + httpBackend.expect('PATCH', '/api/user').respond(200); + let promise = colorPickerCtrl.saveColor(); + promise.should.be.fulfilled.then(function() { + expect(colorPickerCtrl.user).toEqual(colorPickerCtrl.newUser); + expect(colorPickerCtrl.user.institution_profiles[1]).toEqual(change); + expect(profileService.editProfile).toHaveBeenCalledWith(diff); + done(); + }); httpBackend.flush(); scope.$apply(); }); From 0398dc60f993f4bf9c765b47dbb84ec1b4ee3d7d Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Tue, 12 Feb 2019 15:22:33 -0300 Subject: [PATCH 165/606] Reverting useless changes --- backend/models/event.py | 2 +- frontend/sw.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/models/event.py b/backend/models/event.py index 642e38300..d16a7e263 100644 --- a/backend/models/event.py +++ b/backend/models/event.py @@ -189,7 +189,7 @@ def add_follower(self, user): is_active = user.state == 'active' is_not_a_follower = not user.key in self.followers - if is_active and is_not_a_follower: + if is_active and is_not_a_follower: self.followers.append(user.key) self.put() else: diff --git a/frontend/sw.js b/frontend/sw.js index 85b463e1b..4bca0fe8a 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'add-interest-in-event'; + const CACHE_SUFIX = 'master'; let messaging; From 4d1a1977a42af4fe0d3afb70db1b086cc8081d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 12 Feb 2019 15:22:55 -0300 Subject: [PATCH 166/606] Remove date selector on mobile --- frontend/event/events_mobile.html | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index 6f70e3d99..4f85a614d 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -4,21 +4,6 @@
    - - - - {{month.month_name}} - - - - - - {{year}} - - - From 25d1b0ee8000a2306b57e8d0a6f4e8ffe7b8908a Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Feb 2019 15:26:47 -0300 Subject: [PATCH 167/606] Remove whitespace changes from index.html --- frontend/index.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index 2a088725d..269c4885f 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -6,7 +6,7 @@ Plataforma CIS - + @@ -29,7 +29,7 @@ - + @@ -68,17 +68,16 @@ -
    - - + From 569811a0f8591abdb5f035d6f372c2dfbc30d4a4 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Feb 2019 15:27:30 -0300 Subject: [PATCH 168/606] Add color_picker.css back to index.html --- frontend/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/index.html b/frontend/index.html index 269c4885f..a0e0b050c 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -68,6 +68,7 @@ + From f163c6464037e0cdd2c5ad0ea308f3fee72ee0f4 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Tue, 12 Feb 2019 15:32:46 -0300 Subject: [PATCH 169/606] changed css --- frontend/index.html | 1 + frontend/institution/base_institution.css | 4 -- .../descriptionInst/descriptionController.js | 46 +++++++++++------- .../descriptionInst/description_inst.css | 47 +++++++++++++++++++ .../descriptionInst/description_inst.html | 4 +- .../descriptionInst/edit_description.html | 13 +++-- frontend/institution/institutionController.js | 8 ++-- 7 files changed, 87 insertions(+), 36 deletions(-) create mode 100644 frontend/institution/descriptionInst/description_inst.css diff --git a/frontend/index.html b/frontend/index.html index 496c0bad0..125ab5ff4 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -55,6 +55,7 @@ + diff --git a/frontend/institution/base_institution.css b/frontend/institution/base_institution.css index f030daa0d..cf19555c8 100644 --- a/frontend/institution/base_institution.css +++ b/frontend/institution/base_institution.css @@ -19,10 +19,6 @@ padding: 5px; } -.description-inst{ - padding: 0px 1.5em; -} - .base-content-inst{ height: 100%; position: absolute; diff --git a/frontend/institution/descriptionInst/descriptionController.js b/frontend/institution/descriptionInst/descriptionController.js index b12b02253..8464fb0b6 100644 --- a/frontend/institution/descriptionInst/descriptionController.js +++ b/frontend/institution/descriptionInst/descriptionController.js @@ -1,36 +1,46 @@ (function(){ var app = angular.module('app'); - app.controller("EditDescriptionController", function EditDescriptionController($state, InstitutionService, ObserverRecorderService){ + app.controller("EditDescriptionController", function EditDescriptionController(institution, institutionKey, InstitutionService, + ObserverRecorderService, $rootScope, $mdDialog){ const descriptionCtrl = this; let observer; - descriptionCtrl.isLoading = false; descriptionCtrl.$onInit = () => { - descriptionCtrl.currentInstitutionKey = $state.params.institutionKey; - descriptionCtrl.isLoading = true; - InstitutionService.getInstitution(descriptionCtrl.currentInstitutionKey).then(function(institution){ - descriptionCtrl.institution = institution; - descriptionCtrl.isLoading = false; - observer = ObserverRecorderService.register(descriptionCtrl.institution); - }) + descriptionCtrl.institution = institution; + descriptionCtrl.currentInstitutionKey = institutionKey; + observer = ObserverRecorderService.register(descriptionCtrl.institution); }; - function patchIntitution() { + descriptionCtrl.save = () => { var patch = ObserverRecorderService.generate(observer); InstitutionService.update(descriptionCtrl.currentInstitutionKey, patch).then( - /*function success() { - if(configInstCtrl.newInstitution) - updateUserInstitutions(configInstCtrl.newInstitution);}*/ + function success() { + $rootScope.$emit('EDIT_DESCRIPTION_INST'); + $mdDialog.hide(); + } ); - } - + } }); - app.controller("DescriptionInstController", function DescriptionInstController($state){ + app.controller("DescriptionInstController", function DescriptionInstController($state, InstitutionService, $rootScope){ const descriptionCtrl = this; descriptionCtrl.isLoading = false; - descriptionCtrl.institution = $state.params.institution; - console.log($state.params); + descriptionCtrl.$onInit = () => { + descriptionCtrl.isLoading = true; + InstitutionService.getInstitution($state.params.institutionKey).then(function(institution){ + descriptionCtrl.institution = institution; + descriptionCtrl.isLoading = false; + + }) + }; + + $rootScope.$on('EDIT_DESCRIPTION_INST', () => { + descriptionCtrl.isLoading = true; + InstitutionService.getInstitution($state.params.institutionKey).then(function(institution){ + descriptionCtrl.institution = institution; + descriptionCtrl.isLoading = false; + }) + }); }); })(); \ No newline at end of file diff --git a/frontend/institution/descriptionInst/description_inst.css b/frontend/institution/descriptionInst/description_inst.css new file mode 100644 index 000000000..ac43ebf0b --- /dev/null +++ b/frontend/institution/descriptionInst/description_inst.css @@ -0,0 +1,47 @@ +#textarea-edit-description{ + border-style: solid; + border-width: 1px; + border-color: black; + border-radius: 5px; +} + +#label-edit-description{ + font-weight: bold; + font-size: 25px; + color:black; + margin-bottom: 10px; +} + +.description-inst{ + padding: 0px 1.5em; + margin-right: auto; +} + +.button-confirm-describe{ + justify-self: end; +} + +.dialog-edit-description{ + padding: 2em 1em; + display: grid; + grid-template-rows: 23em 5em; + width: 16em; +} + +@media screen and (max-height: 580px) and (max-width: 325px){ + .dialog-edit-description{ + grid-template-rows: 20em 3em; + width: 13em; + } +} + +@media screen and (min-height: 580px) and (max-height:680px) and (max-width: 365px){ + .dialog-edit-description{ + grid-template-rows: 21em 3em; + width: 15em; + } +} + +/* @media screen and (min-height: 681px) and (max-height:880px){ + +} */ \ No newline at end of file diff --git a/frontend/institution/descriptionInst/description_inst.html b/frontend/institution/descriptionInst/description_inst.html index b3b58a285..3fae1d257 100644 --- a/frontend/institution/descriptionInst/description_inst.html +++ b/frontend/institution/descriptionInst/description_inst.html @@ -1,8 +1,6 @@
    -
    - ddddd - {{descriptionCtrl. institution}} +

    {{descriptionCtrl.institution.description}}

    \ No newline at end of file diff --git a/frontend/institution/descriptionInst/edit_description.html b/frontend/institution/descriptionInst/edit_description.html index 69b683fd9..369377a64 100644 --- a/frontend/institution/descriptionInst/edit_description.html +++ b/frontend/institution/descriptionInst/edit_description.html @@ -1,11 +1,10 @@ -
    - - - +
    + + + - + CONFIRMAR
    \ No newline at end of file diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index c4314d05d..66d50c0cf 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -209,8 +209,7 @@ institutionCtrl.goToDescription = function goToDescription(institutionKey) { const instKey = institutionKey || currentInstitutionKey; - $state.go(STATES.INST_DESCRIPTION, {institutionKey: instKey, - institution: institutionCtrl.institution}); + $state.go(STATES.INST_DESCRIPTION, {institutionKey: instKey}); }; institutionCtrl.goToMembers = function goToMembers(institutionKey) { @@ -276,9 +275,10 @@ clickOutsideToClose:true, locals: { institution: institutionCtrl.institution, + institutionKey: currentInstitutionKey }, - controller: app.EditDescriptionController, - controllerAs: 'ctrl' + controller: 'EditDescriptionController', + controllerAs: 'descriptionCtrl' }); }; From aa18dc17ef96d67b2bbb958d9be3dafdc6ffab39 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 12 Feb 2019 17:10:30 -0300 Subject: [PATCH 170/606] added field key to profile institution --- backend/models/user.py | 3 ++- frontend/user/profileService.js | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/backend/models/user.py b/backend/models/user.py index 791ef5b7c..8ee453848 100644 --- a/backend/models/user.py +++ b/backend/models/user.py @@ -38,7 +38,8 @@ def make(self): profile['institution'] = { 'name': institution.name, 'photo_url': institution.photo_url, - 'acronym': institution.acronym + 'acronym': institution.acronym, + 'key': institution.key.urlsafe() } profile['color'] = self.color or 'teal' diff --git a/frontend/user/profileService.js b/frontend/user/profileService.js index 282079cee..f9665c160 100644 --- a/frontend/user/profileService.js +++ b/frontend/user/profileService.js @@ -1,9 +1,9 @@ 'use strict'; (function() { - var app = angular.module("app"); + const app = angular.module("app"); - var USER_URI = '/api/user'; + const USER_URI = '/api/user'; app.service("ProfileService", function ProfileService($mdDialog, HttpService, AuthService, MessageService, UserService) { const service = this; @@ -65,20 +65,20 @@ const isAdmin = institution => user.isAdmin(institution.key); - const deleteInstitution = (institution_key) => { + const deleteInstitution = (institutionKey) => { return new Promise(resolve => { - UserService.deleteInstitution(institution_key) + UserService.deleteInstitution(institutionKey) .then(_ => { - removeConection(institution_key); + removeConection(institutionKey); resolve(); }); }); }; - const removeConection = (institution_key) => { + const removeConection = (institutionKey) => { if (_.size(user.institutions) > 1) { - user.removeInstitution(institution_key); - user.removeProfile(institution_key); + user.removeInstitution(institutionKey); + user.removeProfile(institutionKey); AuthService.save(); } else { AuthService.logout(); From 038d74a3e5e6367acf7c42f23e8baa75abb00d4e Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Tue, 12 Feb 2019 17:18:22 -0300 Subject: [PATCH 171/606] Fixing merge --- backend/handlers/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/handlers/__init__.py b/backend/handlers/__init__.py index 473f5b1b8..34e4f1810 100644 --- a/backend/handlers/__init__.py +++ b/backend/handlers/__init__.py @@ -64,7 +64,6 @@ invite_hierarchy_collection_handler, invite_user_collection_handler, invite_institution_handler, invite_user_handler, institution_parent_handler, institution_children_handler, event_followers_handler, feature_toggle_handler -]] ] __all__ = [prop for handler in handlers for prop in handler.__all__] From 74a82d427487b95c41f20029f064faa33a8b5af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 12 Feb 2019 17:29:52 -0300 Subject: [PATCH 172/606] Add error status to mobile message --- frontend/error/error.html | 2 +- frontend/error/errorController.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/error/error.html b/frontend/error/error.html index 65cea2f65..137877e25 100644 --- a/frontend/error/error.html +++ b/frontend/error/error.html @@ -39,6 +39,6 @@
    - +
    \ No newline at end of file diff --git a/frontend/error/errorController.js b/frontend/error/errorController.js index 044c01385..b6498d7f9 100644 --- a/frontend/error/errorController.js +++ b/frontend/error/errorController.js @@ -18,5 +18,7 @@ } errorCtrl.isMobileScreen = () => Utils.isMobileScreen(); + + errorCtrl.getMobileMsg = () => "Erro " + errorCtrl.status + ": " + errorCtrl.msg; }); })(); \ No newline at end of file From 259b306ee6c5cafa788cf261a2976ce4512fc9fb Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 13 Feb 2019 08:57:55 -0300 Subject: [PATCH 173/606] fix post dialog css --- frontend/home/post_dialog.html | 2 +- frontend/post/create_post.css | 38 +++++++++++++++++++++++++++++++--- frontend/styles/custom.css | 13 ------------ 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/frontend/home/post_dialog.html b/frontend/home/post_dialog.html index cfe7675b5..83821f8db 100644 --- a/frontend/home/post_dialog.html +++ b/frontend/home/post_dialog.html @@ -1,4 +1,4 @@ - + diff --git a/frontend/post/create_post.css b/frontend/post/create_post.css index b3693be20..5a8bbdd19 100644 --- a/frontend/post/create_post.css +++ b/frontend/post/create_post.css @@ -1,6 +1,5 @@ .save-post-dialog { display: grid; - height: 100%; padding: 8px; overflow: scroll; } @@ -162,8 +161,6 @@ } .create-post-actions { - position: absolute; - bottom: 50px; width: 85%; } @@ -241,6 +238,19 @@ } } +.dialog-transparent-without-shadow { + background-color: rgba(0, 0, 0, 0); + box-shadow: 0 0 0; +} + +@media screen and (max-width: 960px) { + .dialog-transparent-without-shadow { + max-width: 100%; + max-height: 100%; + border-radius: 0; + } +} + @media screen and (max-width: 600px) { .create-post-title-placeholder { font-size: 12px !important; @@ -249,6 +259,28 @@ .create-post-text { font-size: 12px !important; } + + .save-post-dialog { + height: 100%; + } + + .dialog-transparent-without-shadow { + height: 100%; + } +} + +@media screen and (min-width: 601px) { + .save-post-dialog { + overflow: auto; + } + + .create-post-container-resp { + width: 91%; + } + + .dialog-transparent-without-shadow { + width: 50%; + } } .no-padding { diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index 2b4433883..aa7e11f65 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -894,19 +894,6 @@ md-radio-button.md-default-theme.md-checked .md-off, md-radio-button.md-checked box-shadow:0 0 12px #9E9E9E; } -.dialog-transparent-without-shadow { - background-color: rgba(0, 0, 0, 0); - box-shadow: 0 0 0; -} - -@media screen and (max-width: 960px) { - .dialog-transparent-without-shadow { - max-width: 100%; - max-height: 100%; - border-radius: 0; - } -} - .share-post{ max-height: 250px; overflow: auto; From efb429f7f1510302597056d2544074c8a8226c9b Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 13 Feb 2019 09:36:14 -0300 Subject: [PATCH 174/606] fix create post card width --- frontend/post/create_post.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/frontend/post/create_post.css b/frontend/post/create_post.css index 5a8bbdd19..79df71166 100644 --- a/frontend/post/create_post.css +++ b/frontend/post/create_post.css @@ -274,12 +274,8 @@ overflow: auto; } - .create-post-container-resp { - width: 91%; - } - .dialog-transparent-without-shadow { - width: 50%; + width: 60%; } } From ad9d6220b2748e4b33af4c37b07411f374dd000b Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 13 Feb 2019 10:02:28 -0300 Subject: [PATCH 175/606] General setup --- frontend/index.html | 2 ++ frontend/sw.js | 2 +- frontend/toolbar/defaultToolbar.component.js | 17 +++++++++++++++++ frontend/toolbar/default_toolbar_mobile.css | 0 frontend/toolbar/default_toolbar_mobile.html | 6 ++++++ 5 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 frontend/toolbar/defaultToolbar.component.js create mode 100644 frontend/toolbar/default_toolbar_mobile.css create mode 100644 frontend/toolbar/default_toolbar_mobile.html diff --git a/frontend/index.html b/frontend/index.html index 269c4885f..a7f75617d 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -68,6 +68,7 @@ + @@ -285,5 +286,6 @@ + diff --git a/frontend/sw.js b/frontend/sw.js index 4bca0fe8a..90d6dd802 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'master'; + const CACHE_SUFIX = 'spread-custom-toolbar'; let messaging; diff --git a/frontend/toolbar/defaultToolbar.component.js b/frontend/toolbar/defaultToolbar.component.js new file mode 100644 index 000000000..9459eefa0 --- /dev/null +++ b/frontend/toolbar/defaultToolbar.component.js @@ -0,0 +1,17 @@ +'use strict'; + +(function () { + const app = angular.module("app"); + + app.component("defaultToolbar", { + templateUrl: 'app/toolbar/default_toolbar_mobile.html', + controller: ['$mdSidenav', 'STATES', '$state', 'SCREEN_SIZES', + '$timeout', DefaultToolbarController], + controllerAs: 'defaultToolbarCtrl', + bindings: {} + }); + + function DefaultToolbarController() { + const defaultToolbarCtrl = this; + } +})(); \ No newline at end of file diff --git a/frontend/toolbar/default_toolbar_mobile.css b/frontend/toolbar/default_toolbar_mobile.css new file mode 100644 index 000000000..e69de29bb diff --git a/frontend/toolbar/default_toolbar_mobile.html b/frontend/toolbar/default_toolbar_mobile.html new file mode 100644 index 000000000..eb0444f25 --- /dev/null +++ b/frontend/toolbar/default_toolbar_mobile.html @@ -0,0 +1,6 @@ + +
    + +
    +     \ No newline at end of file From 69122b456d2a8d055b84494b252a6441f4c1d7be Mon Sep 17 00:00:00 2001 From: MaianaBt Date: Wed, 13 Feb 2019 10:18:18 -0300 Subject: [PATCH 176/606] changed properties css acordding displays --- .../descriptionInst/description_inst.css | 24 ++++++++++++------- .../descriptionInst/edit_description.html | 4 ++-- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/frontend/institution/descriptionInst/description_inst.css b/frontend/institution/descriptionInst/description_inst.css index ac43ebf0b..7b27ef9a2 100644 --- a/frontend/institution/descriptionInst/description_inst.css +++ b/frontend/institution/descriptionInst/description_inst.css @@ -1,15 +1,17 @@ #textarea-edit-description{ + height: 20em !important; border-style: solid; border-width: 1px; border-color: black; border-radius: 5px; + padding: 0.5em; + margin-top: 0.7em; } #label-edit-description{ font-weight: bold; font-size: 25px; color:black; - margin-bottom: 10px; } .description-inst{ @@ -19,20 +21,28 @@ .button-confirm-describe{ justify-self: end; + margin: 0em; } .dialog-edit-description{ - padding: 2em 1em; + padding: 2em 1em 1em 1em; display: grid; - grid-template-rows: 23em 5em; + grid-template-rows: 22em 3.5em; width: 16em; } +.margin-bottom-zero{ + margin-bottom: 0px; +} + @media screen and (max-height: 580px) and (max-width: 325px){ .dialog-edit-description{ grid-template-rows: 20em 3em; width: 13em; - } + } + #textarea-edit-description{ + height: 18.5em !important; + } } @media screen and (min-height: 580px) and (max-height:680px) and (max-width: 365px){ @@ -40,8 +50,4 @@ grid-template-rows: 21em 3em; width: 15em; } -} - -/* @media screen and (min-height: 681px) and (max-height:880px){ - -} */ \ No newline at end of file +} \ No newline at end of file diff --git a/frontend/institution/descriptionInst/edit_description.html b/frontend/institution/descriptionInst/edit_description.html index 369377a64..d1d1815cf 100644 --- a/frontend/institution/descriptionInst/edit_description.html +++ b/frontend/institution/descriptionInst/edit_description.html @@ -1,7 +1,7 @@
    - + - From 83d205fb6f98fd1337a293397cd40594d833fdfa Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 13 Feb 2019 10:51:34 -0300 Subject: [PATCH 177/606] Fix sideMenu new design to only appear on mobile --- frontend/sideMenu/sideMenu.component.js | 31 ++++++++++++++++++++++--- frontend/sideMenu/side_menu.html | 15 ++++++------ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/frontend/sideMenu/sideMenu.component.js b/frontend/sideMenu/sideMenu.component.js index 293db173b..f935e77d4 100644 --- a/frontend/sideMenu/sideMenu.component.js +++ b/frontend/sideMenu/sideMenu.component.js @@ -100,10 +100,22 @@ return type === sideMenuCtrl.type; }; - sideMenuCtrl.isColorPickerActive = false; + sideMenuCtrl._isColorPickerActive = false; sideMenuCtrl.toggleColorPicker = () => { - sideMenuCtrl.isColorPickerActive = !sideMenuCtrl.isColorPickerActive; + sideMenuCtrl._isColorPickerActive = !sideMenuCtrl._isColorPickerActive; + } + + sideMenuCtrl.getCurrentInstitutionProfile = () => { + return _.find(sideMenuCtrl.user.institution_profiles, ['institution_key', sideMenuCtrl.user.current_institution.key]); + } + + sideMenuCtrl.institutionButtonAction = (profile) => { + // Color picker should only open by clicking on institution + // when it's mobile and the color picker is active + sideMenuCtrl.isMobileScreen && sideMenuCtrl.isColorPickerActive ? + sideMenuCtrl.openColorPicker(profile) : + sideMenuCtrl.changeInstitution(profile); } Object.defineProperty(sideMenuCtrl, 'currentMenuOption', { @@ -112,7 +124,20 @@ } }) - sideMenuCtrl.openColorPicker = (institution) => { + Object.defineProperty(sideMenuCtrl, 'isColorPickerActive', { + get: function() { + // Color icons (instead of institution avatar) should aways be active in desktop + return sideMenuCtrl.isMobileScreen ? sideMenuCtrl._isColorPickerActive : true; + } + }); + + Object.defineProperty(sideMenuCtrl, 'isMobileScreen', { + get: function() { + return Utils.isMobileScreen(); + }, + }); + + sideMenuCtrl.openColorPicker = (institution = sideMenuCtrl.getCurrentInstitutionProfile()) => { $mdDialog.show({ controller: "ColorPickerController", controllerAs: "colorPickerCtrl", diff --git a/frontend/sideMenu/side_menu.html b/frontend/sideMenu/side_menu.html index 9875238bf..d144a4955 100644 --- a/frontend/sideMenu/side_menu.html +++ b/frontend/sideMenu/side_menu.html @@ -18,17 +18,18 @@ - - - {{ profile.institution.name }} - - - brightness_1 + + + brightness_1 {{ profile.institution.name }} - + + color_lens + GERENCIAR CORES + + {{ sideMenuCtrl.currentMenuOption.icon }} {{ sideMenuCtrl.currentMenuOption.text }} From 5588ac46e68667c775ca1300bc25b9908caedc78 Mon Sep 17 00:00:00 2001 From: MaianaBt Date: Wed, 13 Feb 2019 10:54:30 -0300 Subject: [PATCH 178/606] Added documentation --- .../descriptionInst/descriptionController.js | 7 ++++++- frontend/utils/hideNavbar.js | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/frontend/institution/descriptionInst/descriptionController.js b/frontend/institution/descriptionInst/descriptionController.js index 8464fb0b6..ac7cf0c6a 100644 --- a/frontend/institution/descriptionInst/descriptionController.js +++ b/frontend/institution/descriptionInst/descriptionController.js @@ -11,7 +11,9 @@ descriptionCtrl.currentInstitutionKey = institutionKey; observer = ObserverRecorderService.register(descriptionCtrl.institution); }; - + + /** Save changes of institution and emit event. + */ descriptionCtrl.save = () => { var patch = ObserverRecorderService.generate(observer); InstitutionService.update(descriptionCtrl.currentInstitutionKey, patch).then( @@ -26,6 +28,7 @@ app.controller("DescriptionInstController", function DescriptionInstController($state, InstitutionService, $rootScope){ const descriptionCtrl = this; descriptionCtrl.isLoading = false; + descriptionCtrl.$onInit = () => { descriptionCtrl.isLoading = true; InstitutionService.getInstitution($state.params.institutionKey).then(function(institution){ @@ -35,6 +38,8 @@ }) }; + /** Listenner edit description inst event, and should refrash institution. + */ $rootScope.$on('EDIT_DESCRIPTION_INST', () => { descriptionCtrl.isLoading = true; InstitutionService.getInstitution($state.params.institutionKey).then(function(institution){ diff --git a/frontend/utils/hideNavbar.js b/frontend/utils/hideNavbar.js index c00ee6aa9..a320c5725 100644 --- a/frontend/utils/hideNavbar.js +++ b/frontend/utils/hideNavbar.js @@ -3,7 +3,7 @@ (function () { const app = angular.module('app'); - app.directive('hideNavbar', ['STATES','$state', function(STATES, $state) { + app.directive('hideNavbar', ['$rootScope', 'STATES','$state', function($rootScope, STATES, $state) { return { restrict: 'A', link: function(scope, element, attrs) { @@ -22,7 +22,7 @@ */ scope.initialToolbarDisplayState = function initialToolbarDisplayState(){ const shouldHideBottomToolbar = !scope.isBottomToolbarAllowed() || - scope.INSTITUTION_STATES.includes($state.current.name); + STATES.INST_TIMELINE === $state.current.name; if (!scope.isStateAllowedTopMobile) scope.hideElement(scope.topTollbar); if (shouldHideBottomToolbar) scope.hideElement(scope.bottomToolbar); } @@ -78,6 +78,12 @@ } + /** Observer to state change and definy how initial state of toolbar. * + */ + $rootScope.$on('$stateChangeStart', function(){ + scope.initialToolbarDisplayState(); + }) + scope.isStateAllowedTopMobile = scope.isTopToolbarAllowed(); scope.isStateAllowedBottom = scope.isBottomToolbarAllowed(); From 36bfe1da0a51dd42a519e6be1aeaaa0415174275 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 13 Feb 2019 11:23:25 -0300 Subject: [PATCH 179/606] Inserting toolbar in event's page --- frontend/event/event_details_small_page.html | 2 ++ frontend/toolbar/defaultToolbar.component.js | 12 +++++++++--- frontend/toolbar/default_toolbar_mobile.css | 3 +++ frontend/toolbar/default_toolbar_mobile.html | 8 +++++--- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/frontend/event/event_details_small_page.html b/frontend/event/event_details_small_page.html index aaeb75c47..60836b158 100644 --- a/frontend/event/event_details_small_page.html +++ b/frontend/event/event_details_small_page.html @@ -1,3 +1,5 @@ + +
    diff --git a/frontend/toolbar/defaultToolbar.component.js b/frontend/toolbar/defaultToolbar.component.js index 9459eefa0..97c9b7e5a 100644 --- a/frontend/toolbar/defaultToolbar.component.js +++ b/frontend/toolbar/defaultToolbar.component.js @@ -5,13 +5,19 @@ app.component("defaultToolbar", { templateUrl: 'app/toolbar/default_toolbar_mobile.html', - controller: ['$mdSidenav', 'STATES', '$state', 'SCREEN_SIZES', - '$timeout', DefaultToolbarController], + controller: ['SCREEN_SIZES', DefaultToolbarController], controllerAs: 'defaultToolbarCtrl', bindings: {} }); - function DefaultToolbarController() { + function DefaultToolbarController(SCREEN_SIZES) { const defaultToolbarCtrl = this; + + /** + * Returns true if the application is being used by a mobile + */ + defaultToolbarCtrl.isMobileScreen = () => { + return Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE); + }; } })(); \ No newline at end of file diff --git a/frontend/toolbar/default_toolbar_mobile.css b/frontend/toolbar/default_toolbar_mobile.css index e69de29bb..9e1d90d81 100644 --- a/frontend/toolbar/default_toolbar_mobile.css +++ b/frontend/toolbar/default_toolbar_mobile.css @@ -0,0 +1,3 @@ +.default-toolbar-mobile { + display: grid; +} \ No newline at end of file diff --git a/frontend/toolbar/default_toolbar_mobile.html b/frontend/toolbar/default_toolbar_mobile.html index eb0444f25..55604b817 100644 --- a/frontend/toolbar/default_toolbar_mobile.html +++ b/frontend/toolbar/default_toolbar_mobile.html @@ -1,6 +1,8 @@ -
    - + layout-align="center" layout="row" ng-if="defaultToolbarCtrl.isMobileScreen()" class="default-toolbar-mobile"> +
    + + +
    \ No newline at end of file From f40964c166c118dd6dff2785c3b6a74b9255ca55 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 13 Feb 2019 12:17:32 -0300 Subject: [PATCH 180/606] added tests to profile service --- .../test/specs/user/profileServiceSpec.js | 70 ++++++++++++++++--- frontend/user/profileService.js | 17 +++-- 2 files changed, 69 insertions(+), 18 deletions(-) diff --git a/frontend/test/specs/user/profileServiceSpec.js b/frontend/test/specs/user/profileServiceSpec.js index 7f4a1ddfe..07999a7a4 100644 --- a/frontend/test/specs/user/profileServiceSpec.js +++ b/frontend/test/specs/user/profileServiceSpec.js @@ -1,21 +1,38 @@ 'use strict'; -(describe('Test ProfileService', function() { +(fdescribe('Test ProfileService', function() { - var httpBackend, mdDialog, profileService; + const USER_URI = '/api/user'; + let mdDialog, profileService, httpService, scope, + authService, deferred, messageService; + + let user, institution; + + const setupModels = () => { + user = new User({ + key: 'user-key' + }); + + institution = new Institution({ + key: 'inst-key' + }); + }; beforeEach(module('app')); - beforeEach(inject(function($mdDialog, $httpBackend, ProfileService) { + beforeEach(inject(function($mdDialog, ProfileService, HttpService, + AuthService, $q, MessageService, $rootScope) { mdDialog = $mdDialog; - httpBackend = $httpBackend; profileService = ProfileService; - })); + httpService = HttpService; + authService = AuthService; + messageService = MessageService; + scope = $rootScope.$new(); + deferred = $q.defer(); - afterEach(function() { - httpBackend.verifyNoOutstandingExpectation(); - httpBackend.verifyNoOutstandingRequest(); - }); + setupModels(); + authService.login(user); + })); describe('showProfile()', function() { @@ -26,4 +43,39 @@ expect(mdDialog.show).toHaveBeenCalled(); }); }); + + describe('editProfile()', () => { + it('should send a patch request', () => { + const data = {name: 'anotherName'}; + spyOn(JSON, 'parse').and.returnValue(data); + spyOn(httpService, 'patch'); + profileService.editProfile(data); + expect(httpService.patch).toHaveBeenCalledWith(USER_URI, data); + }); + }); + + describe('removeProfile()', () => { + beforeEach(() => { + spyOn(authService, 'getCurrentUser').and.returnValue(user); + spyOn(profileService, '_hasMoreThanOneInstitution').and.returnValue(true); + spyOn(mdDialog, 'show').and.returnValue(deferred.promise); + spyOn(mdDialog, 'confirm').and.callThrough(); + spyOn(profileService, '_deleteInstitution'); + spyOn(messageService, 'showToast'); + }); + + it(`should show a confirm dialog and remove + the conection between user and institution `, () => { + spyOn(user, 'isAdmin').and.returnValue(false); + + deferred.resolve(); + profileService.removeProfile({}, institution); + scope.$apply(); + + expect(profileService._hasMoreThanOneInstitution).toHaveBeenCalled(); + expect(mdDialog.confirm).toHaveBeenCalled(); + expect(mdDialog.show).toHaveBeenCalled(); + expect(profileService._deleteInstitution).toHaveBeenCalledWith(institution.key); + }); + }); })); \ No newline at end of file diff --git a/frontend/user/profileService.js b/frontend/user/profileService.js index f9665c160..8f149ef9a 100644 --- a/frontend/user/profileService.js +++ b/frontend/user/profileService.js @@ -41,19 +41,20 @@ }; service.removeProfile = (event, institution) => { - if (!isAdmin(institution)) { + if (!user.isAdmin(institution.key)) { + const textContent = service._hasMoreThanOneInstitution() ? HAS_MORE_THAN_ONE_INSTITUTION_MSG : HAS_ONLY_ONE_INSTITUTION_MSG; const confirm = $mdDialog.confirm(); confirm .clickOutsideToClose(false) .title('Remover vínculo com ' + institution.name) - .textContent(hasMoreThanOneInstitution() ? HAS_MORE_THAN_ONE_INSTITUTION_MSG : HAS_ONLY_ONE_INSTITUTION_MSG) + .textContent(textContent) .ariaLabel('Remover instituicao') .targetEvent(event) .ok('Sim') .cancel('Não'); const promise = $mdDialog.show(confirm); promise.then(function () { - deleteInstitution(institution.key); + service._deleteInstitution(institution.key); }, function () { MessageService.showToast('Cancelado'); }); @@ -63,19 +64,17 @@ } }; - const isAdmin = institution => user.isAdmin(institution.key); - - const deleteInstitution = (institutionKey) => { + service._deleteInstitution = (institutionKey) => { return new Promise(resolve => { UserService.deleteInstitution(institutionKey) .then(_ => { - removeConection(institutionKey); + service._removeConection(institutionKey); resolve(); }); }); }; - const removeConection = (institutionKey) => { + service._removeConection = (institutionKey) => { if (_.size(user.institutions) > 1) { user.removeInstitution(institutionKey); user.removeProfile(institutionKey); @@ -85,7 +84,7 @@ } } - const hasMoreThanOneInstitution = () => { + service._hasMoreThanOneInstitution = () => { return user.institutions.length > 1; }; From f5720fea6e73967babb204710eea6e8c4a850015 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 13 Feb 2019 14:19:33 -0300 Subject: [PATCH 181/606] ended tests for profileService and fixed tests for institution_profile, on server --- .../model_test/institution_profile_test.py | 5 +- .../test/specs/user/profileServiceSpec.js | 57 +++++++++++++++++-- frontend/user/profileService.js | 10 ++-- 3 files changed, 62 insertions(+), 10 deletions(-) diff --git a/backend/test/model_test/institution_profile_test.py b/backend/test/model_test/institution_profile_test.py index 5fe4f4c04..240be271e 100644 --- a/backend/test/model_test/institution_profile_test.py +++ b/backend/test/model_test/institution_profile_test.py @@ -24,6 +24,7 @@ def test_make(self): institution = mocks.create_institution() institution.name = 'institution_name' institution.photo_url = 'photo_url.com' + institution.acronym = 'inst' institution.put() self.data_profile['institution_key'] = institution.key.urlsafe() profile = InstitutionProfile.create(self.data_profile) @@ -37,7 +38,9 @@ def test_make(self): 'branch_line': '888', 'institution': { 'name': 'institution_name'.decode('utf8'), - 'photo_url': 'photo_url.com'.decode('utf8') + 'photo_url': 'photo_url.com'.decode('utf8'), + 'acronym': 'inst', + 'key': institution.key.urlsafe() } } diff --git a/frontend/test/specs/user/profileServiceSpec.js b/frontend/test/specs/user/profileServiceSpec.js index 07999a7a4..f041fadad 100644 --- a/frontend/test/specs/user/profileServiceSpec.js +++ b/frontend/test/specs/user/profileServiceSpec.js @@ -1,10 +1,10 @@ 'use strict'; -(fdescribe('Test ProfileService', function() { +(describe('Test ProfileService', function() { const USER_URI = '/api/user'; let mdDialog, profileService, httpService, scope, - authService, deferred, messageService; + authService, deferred, messageService, userService; let user, institution; @@ -21,7 +21,7 @@ beforeEach(module('app')); beforeEach(inject(function($mdDialog, ProfileService, HttpService, - AuthService, $q, MessageService, $rootScope) { + AuthService, $q, MessageService, $rootScope, UserService) { mdDialog = $mdDialog; profileService = ProfileService; httpService = HttpService; @@ -29,6 +29,7 @@ messageService = MessageService; scope = $rootScope.$new(); deferred = $q.defer(); + userService = UserService; setupModels(); authService.login(user); @@ -65,17 +66,63 @@ }); it(`should show a confirm dialog and remove - the conection between user and institution `, () => { - spyOn(user, 'isAdmin').and.returnValue(false); + the connection between user and institution `, () => { + spyOn(profileService, '_isAdmin').and.returnValue(false); deferred.resolve(); profileService.removeProfile({}, institution); scope.$apply(); + expect(profileService._isAdmin).toHaveBeenCalledWith(institution); expect(profileService._hasMoreThanOneInstitution).toHaveBeenCalled(); expect(mdDialog.confirm).toHaveBeenCalled(); expect(mdDialog.show).toHaveBeenCalled(); expect(profileService._deleteInstitution).toHaveBeenCalledWith(institution.key); }); + + it(`should show a confirm dialog and remove + the connection between user and institution `, () => { + spyOn(profileService, '_isAdmin').and.returnValue(true); + + profileService.removeProfile({}, institution); + + expect(mdDialog.confirm).not.toHaveBeenCalled(); + expect(mdDialog.show).not.toHaveBeenCalled(); + const msg = 'Desvínculo não permitido. Você é administrador dessa instituição.'; + expect(messageService.showToast).toHaveBeenCalledWith(msg); + }); + }); + + describe('_deleteInstitution', () => { + it(`should call deleteInstitution and _removeConnection`, () => { + spyOn(userService, 'deleteInstitution').and.returnValue(deferred.promise); + spyOn(profileService, '_removeConnection'); + deferred.resolve(); + profileService._deleteInstitution(institution.key); + scope.$apply(); + + expect(userService.deleteInstitution).toHaveBeenCalledWith(institution.key); + expect(profileService._removeConnection).toHaveBeenCalledWith(institution.key); + }); + }); + + describe('_removeConnection', () => { + it("should save the user modifications if it has more than one institution", () => { + spyOn(profileService, '_hasMoreThanOneInstitution').and.returnValue(true); + spyOn(authService, 'save'); + + profileService._removeConnection(institution.key); + + expect(authService.save).toHaveBeenCalled(); + }) + + it("should logout the user if it does not have more than one institution", () => { + spyOn(profileService, '_hasMoreThanOneInstitution').and.returnValue(false); + spyOn(authService, 'logout'); + + profileService._removeConnection(institution.key); + + expect(authService.logout).toHaveBeenCalled(); + }) }); })); \ No newline at end of file diff --git a/frontend/user/profileService.js b/frontend/user/profileService.js index 8f149ef9a..ff0955e0b 100644 --- a/frontend/user/profileService.js +++ b/frontend/user/profileService.js @@ -40,8 +40,10 @@ return HttpService.patch(USER_URI, data); }; + service._isAdmin = institution => user.isAdmin(institution.key); + service.removeProfile = (event, institution) => { - if (!user.isAdmin(institution.key)) { + if (!service._isAdmin(institution)) { const textContent = service._hasMoreThanOneInstitution() ? HAS_MORE_THAN_ONE_INSTITUTION_MSG : HAS_ONLY_ONE_INSTITUTION_MSG; const confirm = $mdDialog.confirm(); confirm @@ -68,14 +70,14 @@ return new Promise(resolve => { UserService.deleteInstitution(institutionKey) .then(_ => { - service._removeConection(institutionKey); + service._removeConnection(institutionKey); resolve(); }); }); }; - service._removeConection = (institutionKey) => { - if (_.size(user.institutions) > 1) { + service._removeConnection = (institutionKey) => { + if (service._hasMoreThanOneInstitution()) { user.removeInstitution(institutionKey); user.removeProfile(institutionKey); AuthService.save(); From b6e6149eb64ad649b882704d28784dd769ad8946 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 13 Feb 2019 14:20:00 -0300 Subject: [PATCH 182/606] Fix new colorpicker dialog to only show on mobile --- frontend/home/color_picker.html | 54 ++++++++++++------------- frontend/home/color_picker_mobile.html | 30 ++++++++++++++ frontend/sideMenu/sideMenu.component.js | 3 +- 3 files changed, 57 insertions(+), 30 deletions(-) create mode 100644 frontend/home/color_picker_mobile.html diff --git a/frontend/home/color_picker.html b/frontend/home/color_picker.html index 082f31eed..d1a42a5d7 100644 --- a/frontend/home/color_picker.html +++ b/frontend/home/color_picker.html @@ -1,30 +1,26 @@ - - -
    - Selecione uma cor -
    -
    - - check_circle - -
    -
    -
    - - CANCELAR - - - ALTERAR - -
    + +
    + +

    Selecione uma cor:

    + + + + + check_circle + + + + + +
    + + Cancelar + + + Aplicar + +
    +
    - -     + \ No newline at end of file diff --git a/frontend/home/color_picker_mobile.html b/frontend/home/color_picker_mobile.html new file mode 100644 index 000000000..082f31eed --- /dev/null +++ b/frontend/home/color_picker_mobile.html @@ -0,0 +1,30 @@ + + +
    + Selecione uma cor +
    +
    + + check_circle + +
    +
    +
    + + CANCELAR + + + ALTERAR + +
    +
    +     +     diff --git a/frontend/sideMenu/sideMenu.component.js b/frontend/sideMenu/sideMenu.component.js index f935e77d4..802dc4eb0 100644 --- a/frontend/sideMenu/sideMenu.component.js +++ b/frontend/sideMenu/sideMenu.component.js @@ -141,7 +141,8 @@ $mdDialog.show({ controller: "ColorPickerController", controllerAs: "colorPickerCtrl", - templateUrl: 'app/home/color_picker.html', + templateUrl: Utils.selectFieldBasedOnScreenSize('app/home/color_picker.html', + 'app/home/color_picker_mobile.html'), parent: angular.element(document.body), clickOutsideToClose: true, locals: { From f31d2b639711d15e5d582ae24a4ad8f58ca7695e Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 13 Feb 2019 14:20:49 -0300 Subject: [PATCH 183/606] Fix mobile sideMenu toggleColorPicker * Opening colorPicker dialog will revert back to institution change action on mobile --- frontend/sideMenu/sideMenu.component.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/sideMenu/sideMenu.component.js b/frontend/sideMenu/sideMenu.component.js index 802dc4eb0..1225421e5 100644 --- a/frontend/sideMenu/sideMenu.component.js +++ b/frontend/sideMenu/sideMenu.component.js @@ -149,7 +149,8 @@ user : sideMenuCtrl.user, institution, }, - bindToController: true + bindToController: true, + onComplete: function() { sideMenuCtrl._isColorPickerActive = false }, }); }; } From c015402552e69306ba975e6ede62b6a4faca462a Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 13 Feb 2019 14:33:43 -0300 Subject: [PATCH 184/606] Fix desktop colorpicker dialog --- frontend/home/color_picker.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/home/color_picker.html b/frontend/home/color_picker.html index d1a42a5d7..04353edd0 100644 --- a/frontend/home/color_picker.html +++ b/frontend/home/color_picker.html @@ -5,9 +5,9 @@

    Selecione uma cor:

    - - check_circle + check_circle From c9e386a76199ed25d29a041e04477e27efd7f55a Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 13 Feb 2019 14:38:11 -0300 Subject: [PATCH 185/606] Resolving issues --- .../test/event_handlers_tests/event_handler_test.py | 8 ++++---- frontend/event/event.js | 4 +--- frontend/event/eventDetailsDirective.js | 10 +++++----- frontend/event/eventService.js | 8 ++++---- frontend/event/event_details.html | 2 +- frontend/post/postDetailsDirective.js | 6 ++---- .../test/specs/event/eventDetailsControllerSpec.js | 4 ++-- 7 files changed, 19 insertions(+), 23 deletions(-) diff --git a/backend/test/event_handlers_tests/event_handler_test.py b/backend/test/event_handlers_tests/event_handler_test.py index 37312a989..e95431539 100644 --- a/backend/test/event_handlers_tests/event_handler_test.py +++ b/backend/test/event_handlers_tests/event_handler_test.py @@ -50,7 +50,7 @@ def setUp(cls): @patch('handlers.event_handler.enqueue_task') @patch('util.login_service.verify_token', return_value={'email': 'user@gmail.com'}) - def test_delete_by_author(self, verify_token, mock_method): + def test_delete_by_author(self, verify_token, enqueue_task): """Test the event_handler's delete method when user is author.""" self.user.add_permissions( ['edit_post', 'remove_post'], self.event.key.urlsafe()) @@ -69,7 +69,7 @@ def test_delete_by_author(self, verify_token, mock_method): 'title': self.event.title } - mock_method.assert_called_with('multiple-notification', not_params) + enqueue_task.assert_called_with('multiple-notification', not_params) # Refresh event self.event = self.event.key.get() @@ -174,7 +174,7 @@ def test_patch(self, verify_token): @patch('handlers.event_handler.enqueue_task') @patch('util.login_service.verify_token', return_value={'email': 'user@gmail.com'}) - def test_pacth_datetime(self, verify_token, mock_method): + def test_pacth_datetime(self, verify_token, enqueue_task): """Test pacth datetimes in event handler.""" json_edit = json.dumps([ {"op": "replace", "path": "/start_time", @@ -208,7 +208,7 @@ def test_pacth_datetime(self, verify_token, mock_method): 'title': self.event.title } - mock_method.assert_called_with('multiple-notification', not_params) + enqueue_task.assert_called_with('multiple-notification', not_params) @patch('util.login_service.verify_token', return_value={'email': 'user@gmail.com'}) def test_patch_on_event_outdated(self, verify_token): diff --git a/frontend/event/event.js b/frontend/event/event.js index 0abfb8aa3..6af6e5a95 100644 --- a/frontend/event/event.js +++ b/frontend/event/event.js @@ -30,8 +30,6 @@ Event.prototype.addFollower = function (userKey) { }; Event.prototype.removeFollower = function (userKey) { - _.remove(this.followers, followerKey => { - return followerKey === userKey; - }); + this.followers = this.followers.filter(currentFollower => {currentFollower !== userKey}); }; diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index 1b65a08de..dfec22ea1 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -51,10 +51,10 @@ } }; - eventCtrl.canChange = function canChange(event) { - if(event) { - const hasInstitutionPermission = eventCtrl.user.hasPermission('remove_posts', event.institution_key); - const hasEventPermission = eventCtrl.user.hasPermission('remove_post', event.key); + eventCtrl.canChange = function canChange() { + if (eventCtrl.event) { + const hasInstitutionPermission = eventCtrl.user.hasPermission('remove_posts', eventCtrl.event.institution_key); + const hasEventPermission = eventCtrl.user.hasPermission('remove_post', eventCtrl.event.key); return hasInstitutionPermission || hasEventPermission; } }; @@ -149,7 +149,7 @@ }; eventCtrl.isFollower = () => { - return eventCtrl.event && _.includes(eventCtrl.event.followers, eventCtrl.user.key); + return eventCtrl.event && eventCtrl.event.followers.includes(eventCtrl.user.key); }; eventCtrl.addFollower = () => { diff --git a/frontend/event/eventService.js b/frontend/event/eventService.js index d62fa5bb3..117dcf57a 100644 --- a/frontend/event/eventService.js +++ b/frontend/event/eventService.js @@ -40,12 +40,12 @@ return HttpService.get('app/utils/months.json'); }; - service.addFollower = function (event) { - return HttpService.post(`/api/events/${event}/followers`); + service.addFollower = function (eventKey) { + return HttpService.post(`/api/events/${eventKey}/followers`); }; - service.removeFollower = function (event) { - return HttpService.delete(`/api/events/${event}/followers`); + service.removeFollower = function (eventKey) { + return HttpService.delete(`/api/events/${eventKey}/followers`); }; }); })(); \ No newline at end of file diff --git a/frontend/event/event_details.html b/frontend/event/event_details.html index 3564451de..f067f09ad 100644 --- a/frontend/event/event_details.html +++ b/frontend/event/event_details.html @@ -51,7 +51,7 @@

    + cancel Cancelar evento diff --git a/frontend/post/postDetailsDirective.js b/frontend/post/postDetailsDirective.js index 4665524b5..0753f1d7d 100644 --- a/frontend/post/postDetailsDirective.js +++ b/frontend/post/postDetailsDirective.js @@ -281,7 +281,7 @@ postDetailsCtrl.isFollowingEvent = () => { const eventFollowers = (postDetailsCtrl.post.shared_event && postDetailsCtrl.post.shared_event.followers) || []; - return _.includes(eventFollowers, postDetailsCtrl.user.key); + return eventFollowers.includes(postDetailsCtrl.user.key); }; postDetailsCtrl.followEvent = () => { @@ -295,9 +295,7 @@ postDetailsCtrl.unFollowEvent = () => { EventService.removeFollower(postDetailsCtrl.post.shared_event.key).then(() => { - _.remove(postDetailsCtrl.post.shared_event.followers, follower => { - return follower.key === postDetailsCtrl.user.key; - }); + postDetailsCtrl.post.shared_event.followers = postDetailsCtrl.post.shared_event.followers.filter(follower => follower !== postDetailsCtrl.user.key); MessageService.showToast('Você não receberá as atualizações desse evento.'); }).catch((error) => { console.error(error); diff --git a/frontend/test/specs/event/eventDetailsControllerSpec.js b/frontend/test/specs/event/eventDetailsControllerSpec.js index 4b1f80285..55bdcc64c 100644 --- a/frontend/test/specs/event/eventDetailsControllerSpec.js +++ b/frontend/test/specs/event/eventDetailsControllerSpec.js @@ -281,7 +281,7 @@ eventCtrl.addFollower(); scope.$apply(); - expect(eventService.addFollower).toHaveBeenCalled(); + expect(eventService.addFollower).toHaveBeenCalledWith(eventCtrl.event); expect(messageService.showToast).toHaveBeenCalled(); expect(eventCtrl.event.addFollower).toHaveBeenCalled(); expect(eventCtrl.event.followers).toEqual([user.key]); @@ -300,7 +300,7 @@ eventCtrl.removeFollower(); scope.$apply(); - expect(eventService.removeFollower).toHaveBeenCalled(); + expect(eventService.removeFollower).toHaveBeenCalledWith(eventCtrl.event); expect(messageService.showToast).toHaveBeenCalled(); expect(eventCtrl.event.removeFollower).toHaveBeenCalled(); }); From 78506af57f958caff9522d4755f9bb0f6d2e7625 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 13 Feb 2019 14:45:26 -0300 Subject: [PATCH 186/606] fixing the tests --- frontend/test/specs/event/eventDetailsControllerSpec.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/test/specs/event/eventDetailsControllerSpec.js b/frontend/test/specs/event/eventDetailsControllerSpec.js index 55bdcc64c..7df3d075e 100644 --- a/frontend/test/specs/event/eventDetailsControllerSpec.js +++ b/frontend/test/specs/event/eventDetailsControllerSpec.js @@ -193,8 +193,9 @@ eventCtrl.user.permissions = {}; eventCtrl.user.permissions['remove_post'] = {}; eventCtrl.user.permissions['remove_post'][event.key] = true; - - let returnedValue = eventCtrl.canChange(event); + eventCtrl.event = event; + + let returnedValue = eventCtrl.canChange(); expect(returnedValue).toBeTruthy(); eventCtrl.user.permissions = {}; @@ -281,7 +282,7 @@ eventCtrl.addFollower(); scope.$apply(); - expect(eventService.addFollower).toHaveBeenCalledWith(eventCtrl.event); + expect(eventService.addFollower).toHaveBeenCalledWith(eventCtrl.event.key); expect(messageService.showToast).toHaveBeenCalled(); expect(eventCtrl.event.addFollower).toHaveBeenCalled(); expect(eventCtrl.event.followers).toEqual([user.key]); @@ -300,7 +301,7 @@ eventCtrl.removeFollower(); scope.$apply(); - expect(eventService.removeFollower).toHaveBeenCalledWith(eventCtrl.event); + expect(eventService.removeFollower).toHaveBeenCalledWith(eventCtrl.event.key); expect(messageService.showToast).toHaveBeenCalled(); expect(eventCtrl.event.removeFollower).toHaveBeenCalled(); }); From 63df599eb41fb2bbcba4e16f5bf29361b953ccfd Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 13 Feb 2019 14:48:41 -0300 Subject: [PATCH 187/606] Compare institution profiles by institution_key --- frontend/home/colorPickerController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/home/colorPickerController.js b/frontend/home/colorPickerController.js index 4d1ba7055..2561b1f71 100644 --- a/frontend/home/colorPickerController.js +++ b/frontend/home/colorPickerController.js @@ -28,7 +28,7 @@ function loadProfile() { colorPickerCtrl.newUser = _.cloneDeep(colorPickerCtrl.user); - colorPickerCtrl.institution = _.find(colorPickerCtrl.newUser.institution_profiles, i => _.isEqual(i, institution)); + colorPickerCtrl.institution = _.find(colorPickerCtrl.newUser.institution_profiles, ['institution_key', institution.institution_key]); } function loadColors() { From 973dd42c4c167790e18dbacf33d32e8f8bfcc510 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 13 Feb 2019 15:09:06 -0300 Subject: [PATCH 188/606] Add jsdoc to sideMenu component new methods --- frontend/sideMenu/sideMenu.component.js | 43 +++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/frontend/sideMenu/sideMenu.component.js b/frontend/sideMenu/sideMenu.component.js index 1225421e5..9f5111397 100644 --- a/frontend/sideMenu/sideMenu.component.js +++ b/frontend/sideMenu/sideMenu.component.js @@ -100,37 +100,74 @@ return type === sideMenuCtrl.type; }; + /** + * Store (internally) colorPicker's active state, + * allowing a single dynamic view for both mobile and desktop. + * When it's on: avatar is replaced with that institution's color; + * clicking on a institution changes that to current; + * last button on menu shows "Voltar" and toggles this variable; + * When it's off: institution's avatar is shown; + * clicking on a institution shows a dialog to pick a new color for that; + * last button on menu shows "Gerenciar cores". + */ sideMenuCtrl._isColorPickerActive = false; + /** + * Toggle colorPicker's active state. + */ sideMenuCtrl.toggleColorPicker = () => { sideMenuCtrl._isColorPickerActive = !sideMenuCtrl._isColorPickerActive; } + /** + * Gets user's current_institution profile. + * Needed to provide a default profile to #openColorPicker (desktop behavior). + */ sideMenuCtrl.getCurrentInstitutionProfile = () => { return _.find(sideMenuCtrl.user.institution_profiles, ['institution_key', sideMenuCtrl.user.current_institution.key]); } + /** + * Calls the correct function based on if it's a mobile screen, + * and current colorPicker's active state. + * The color picker dialog should only open here when on mobile + * AND the color picker is active. + * Otherwise, that should be made the current institution on the user. + * + * @param {Object} profile - institution profile to be made current or have its color changed + */ sideMenuCtrl.institutionButtonAction = (profile) => { - // Color picker should only open by clicking on institution - // when it's mobile and the color picker is active sideMenuCtrl.isMobileScreen && sideMenuCtrl.isColorPickerActive ? sideMenuCtrl.openColorPicker(profile) : sideMenuCtrl.changeInstitution(profile); } + /** + * Defines a property .currentMenuOption, + * returning the current button based on colorPicker's active state. + */ Object.defineProperty(sideMenuCtrl, 'currentMenuOption', { get: function() { return sideMenuCtrl.isColorPickerActive ? backButton : colorPickerButton; } }) + /** + * Defines a property .isColorPickerActive, + * that always return true on desktop. + * On mobile, maps to internal _isColorPickerActive variable. + */ Object.defineProperty(sideMenuCtrl, 'isColorPickerActive', { get: function() { - // Color icons (instead of institution avatar) should aways be active in desktop return sideMenuCtrl.isMobileScreen ? sideMenuCtrl._isColorPickerActive : true; } }); + /** + * Defines a property .isMobileScreen, + * shorthand for Utils.isMobileScreen(). + * Needed by the view to provide adequate buttons on desktop and mobile. + */ Object.defineProperty(sideMenuCtrl, 'isMobileScreen', { get: function() { return Utils.isMobileScreen(); From ea1810d7dd9e3ae0a4c4f2439d872daac9ca129b Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 13 Feb 2019 15:28:22 -0300 Subject: [PATCH 189/606] applyed array inline annotation on controllers --- .../configProfile/configProfileController.js | 16 +++++++++++----- .../user/editProfile/editProfileController.js | 14 +++++++++----- frontend/user/profileService.js | 16 ++++++++++------ .../user/userProfiles/userProfiles.component.js | 4 ++-- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index 673fc964c..8db430257 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -1,10 +1,16 @@ 'use strict'; (function () { - const app = angular.module("app"); - - app.controller("ConfigProfileController", function ConfigProfileController($state, STATES, $stateParams, ProfileService, - CropImageService, AuthService, UserService, ImageService, $rootScope, SCREEN_SIZES, MessageService, $mdDialog, ObserverRecorderService) { + angular + .module("app") + .controller("ConfigProfileController", [ + '$state', 'STATES', '$stateParams', 'ProfileService', 'CropImageService', 'AuthService', + 'UserService', 'ImageService', '$rootScope', 'SCREEN_SIZES', 'MessageService', '$mdDialog', 'ObserverRecorderService', + ConfigProfileController + ]); + + function ConfigProfileController($state, STATES, $stateParams, ProfileService, CropImageService, AuthService, + UserService, ImageService, $rootScope, SCREEN_SIZES, MessageService, $mdDialog, ObserverRecorderService) { const configProfileCtrl = this; @@ -190,5 +196,5 @@ }); return promise; } - }); + }; })(); \ No newline at end of file diff --git a/frontend/user/editProfile/editProfileController.js b/frontend/user/editProfile/editProfileController.js index 7ae754bf6..984563048 100644 --- a/frontend/user/editProfile/editProfileController.js +++ b/frontend/user/editProfile/editProfileController.js @@ -1,10 +1,14 @@ 'use strict'; (function () { - const app = angular.module("app"); - - app.controller("EditProfileController", function EditProfileController(profile, ProfileService, - AuthService, $mdDialog, MessageService, ObserverRecorderService) { + angular + .module("app") + .controller("EditProfileController", [ + 'profile', 'ProfileService', 'AuthService', '$mdDialog', 'MessageService', 'ObserverRecorderService', + EditProfileController + ]); + + function EditProfileController(profile, ProfileService, AuthService, $mdDialog, MessageService, ObserverRecorderService) { const editProfileCtrl = this; editProfileCtrl.phoneRegex = "[0-9]{2}[\\s][0-9]{4,5}[-][0-9]{4,5}"; @@ -51,5 +55,5 @@ function isValidProfile() { return !_.isEmpty(editProfileCtrl.profile.office); } - }); + }; })(); \ No newline at end of file diff --git a/frontend/user/profileService.js b/frontend/user/profileService.js index ff0955e0b..b8581bab8 100644 --- a/frontend/user/profileService.js +++ b/frontend/user/profileService.js @@ -1,12 +1,16 @@ 'use strict'; (function() { - const app = angular.module("app"); - - const USER_URI = '/api/user'; - - app.service("ProfileService", function ProfileService($mdDialog, HttpService, AuthService, MessageService, UserService) { + angular + .module("app") + .service("ProfileService", [ + '$mdDialog', 'HttpService', 'AuthService', 'MessageService', 'UserService', + ProfileService + ]); + + function ProfileService($mdDialog, HttpService, AuthService, MessageService, UserService) { const service = this; + const USER_URI = '/api/user'; const HAS_ONLY_ONE_INSTITUTION_MSG = "Esta é a única instituição ao qual você é vinculado." + " Ao remover o vínculo você não poderá mais acessar o sistema," + @@ -90,5 +94,5 @@ return user.institutions.length > 1; }; - }); + }; })(); \ No newline at end of file diff --git a/frontend/user/userProfiles/userProfiles.component.js b/frontend/user/userProfiles/userProfiles.component.js index a47464bb7..29b088959 100644 --- a/frontend/user/userProfiles/userProfiles.component.js +++ b/frontend/user/userProfiles/userProfiles.component.js @@ -5,7 +5,7 @@ .module("app") .component("userProfiles", { templateUrl: 'app/user/userProfiles/user_profiles.html', - controller: userProfileController, + controller: [userProfileController], controllerAs: 'userProfileCtrl', bindings: { profiles: '<', @@ -14,7 +14,7 @@ } }) - function userProfileController($mdDialog) { + function userProfileController() { const userProfileCtrl = this; userProfileCtrl.getImage = profile => { From 04e4cc31e22f8a93898ed1c366fc31e8a21c6656 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 13 Feb 2019 16:03:16 -0300 Subject: [PATCH 190/606] finishing toolbar general layout --- frontend/event/eventDetailsDirective.js | 8 +++++++ frontend/event/event_details_small_page.html | 2 +- frontend/toolbar/defaultToolbar.component.js | 16 ++++++++++--- frontend/toolbar/default_toolbar_mobile.css | 3 +++ frontend/toolbar/default_toolbar_mobile.html | 24 ++++++++++++++++---- 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index 9a2e4f9c5..30bcf3c6e 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -148,6 +148,14 @@ return new Date(isoTime).getHours(); }; + eventCtrl.generateToolbarMenuOptions = () => { + return [ + { title: 'Obter link', icon: 'link', action: () => { } }, + { title: 'Compartilhar', icon: 'share', action: () => { } }, + { title: 'Receber atualizações', icon: 'bookmark', action: () => { } } + ] + }; + /** * This function receives the event key, makes a * request to the backend, and returns the event diff --git a/frontend/event/event_details_small_page.html b/frontend/event/event_details_small_page.html index 60836b158..227000174 100644 --- a/frontend/event/event_details_small_page.html +++ b/frontend/event/event_details_small_page.html @@ -1,4 +1,4 @@ - +
    diff --git a/frontend/toolbar/defaultToolbar.component.js b/frontend/toolbar/defaultToolbar.component.js index 97c9b7e5a..9dc8f489d 100644 --- a/frontend/toolbar/defaultToolbar.component.js +++ b/frontend/toolbar/defaultToolbar.component.js @@ -5,12 +5,14 @@ app.component("defaultToolbar", { templateUrl: 'app/toolbar/default_toolbar_mobile.html', - controller: ['SCREEN_SIZES', DefaultToolbarController], + controller: ['SCREEN_SIZES', '$window', DefaultToolbarController], controllerAs: 'defaultToolbarCtrl', - bindings: {} + bindings: { + menuOptions: '=' + } }); - function DefaultToolbarController(SCREEN_SIZES) { + function DefaultToolbarController(SCREEN_SIZES, $window) { const defaultToolbarCtrl = this; /** @@ -19,5 +21,13 @@ defaultToolbarCtrl.isMobileScreen = () => { return Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE); }; + + defaultToolbarCtrl.goBack = () => { + $window.history.back(); + }; + + defaultToolbarCtrl.$onInit = () => { + console.log(defaultToolbarCtrl.menuOptions); + }; } })(); \ No newline at end of file diff --git a/frontend/toolbar/default_toolbar_mobile.css b/frontend/toolbar/default_toolbar_mobile.css index 9e1d90d81..d54d77a7e 100644 --- a/frontend/toolbar/default_toolbar_mobile.css +++ b/frontend/toolbar/default_toolbar_mobile.css @@ -1,3 +1,6 @@ .default-toolbar-mobile { display: grid; + grid-template-columns: 50% 50%; + grid-template-rows: 100%; + width: 100%; } \ No newline at end of file diff --git a/frontend/toolbar/default_toolbar_mobile.html b/frontend/toolbar/default_toolbar_mobile.html index 55604b817..9476ff61d 100644 --- a/frontend/toolbar/default_toolbar_mobile.html +++ b/frontend/toolbar/default_toolbar_mobile.html @@ -1,8 +1,24 @@ -
    - - + layout-align="center" layout="row" ng-if="defaultToolbarCtrl.isMobileScreen()"> +
    + + keyboard_arrow_left +
    + + + more_vert + + + + + {{option.icon}} + + {{option.title}} + + + +
    \ No newline at end of file From 15b1ae03cbe41b8699157adb2317bcd87742dba8 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 13 Feb 2019 17:23:45 -0300 Subject: [PATCH 191/606] Change let variables to const --- .../test/specs/home/colorPickerControllerSpec.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/test/specs/home/colorPickerControllerSpec.js b/frontend/test/specs/home/colorPickerControllerSpec.js index 934eb68e2..a9789295a 100644 --- a/frontend/test/specs/home/colorPickerControllerSpec.js +++ b/frontend/test/specs/home/colorPickerControllerSpec.js @@ -12,7 +12,7 @@ 'color' : 'teal', }; - let secondInstitution = { + const secondInstitution = { 'email' : 'institution2@gmail.com', 'key': '1234567', 'institution_key' : '1234567', @@ -66,17 +66,17 @@ }); it('should change first institutions color', function(done) { - let change = { + const change = { 'color' : 'blue', 'email' : 'institution@gmail.com', 'key': '123456', 'institution_key' : '123456' }; colorPickerCtrl.newUser.institution_profiles = [change, secondInstitution]; - let diff = jsonpatch.compare(colorPickerCtrl.user, colorPickerCtrl.newUser); + const diff = jsonpatch.compare(colorPickerCtrl.user, colorPickerCtrl.newUser); httpBackend.expect('PATCH', '/api/user').respond(200); - let promise = colorPickerCtrl.saveColor(); + const promise = colorPickerCtrl.saveColor(); promise.should.be.fulfilled.then(function() { expect(colorPickerCtrl.user).toEqual(colorPickerCtrl.newUser); expect(colorPickerCtrl.user.institution_profiles[0]).toEqual(change); @@ -88,7 +88,7 @@ }); it('should change second institutions color', (done) => { - let change = { + const change = { 'color': 'red', 'email' : 'institution2@gmail.com', 'key': '1234567', @@ -96,10 +96,10 @@ } colorPickerCtrl.newUser.institution_profiles = [institution, change]; - let diff = jsonpatch.compare(colorPickerCtrl.user, colorPickerCtrl.newUser); + const diff = jsonpatch.compare(colorPickerCtrl.user, colorPickerCtrl.newUser); httpBackend.expect('PATCH', '/api/user').respond(200); - let promise = colorPickerCtrl.saveColor(); + const promise = colorPickerCtrl.saveColor(); promise.should.be.fulfilled.then(function() { expect(colorPickerCtrl.user).toEqual(colorPickerCtrl.newUser); expect(colorPickerCtrl.user.institution_profiles[1]).toEqual(change); From 2c688f6b35ba9965d00ea692d2d5babf99cac62e Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 13 Feb 2019 17:25:38 -0300 Subject: [PATCH 192/606] Solving issues --- backend/service_messages.py | 2 +- frontend/event/eventDetailsDirective.js | 20 +++++++---- frontend/event/eventService.js | 8 +++++ frontend/post/postDetailsDirective.js | 7 ++-- .../specs/event/eventDetailsControllerSpec.js | 33 +++++++++++++++++++ frontend/test/specs/event/eventServiceSpec.js | 8 ++--- .../specs/post/postDetailsControllerSpec.js | 12 +++---- 7 files changed, 69 insertions(+), 21 deletions(-) diff --git a/backend/service_messages.py b/backend/service_messages.py index 7994f861c..ce16038de 100644 --- a/backend/service_messages.py +++ b/backend/service_messages.py @@ -61,7 +61,7 @@ def create_system_message(receiver_institution_key=None): def create_entity(entity_key): """Create a short entity with only key.""" entity = { - "key": entity_key, + "key": entity_key } return entity diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index dfec22ea1..fdb981c72 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -51,6 +51,9 @@ } }; + /** + * Checks if the user has permission to change the event. + */ eventCtrl.canChange = function canChange() { if (eventCtrl.event) { const hasInstitutionPermission = eventCtrl.user.hasPermission('remove_posts', eventCtrl.event.institution_key); @@ -148,25 +151,30 @@ return new Date(isoTime).getHours(); }; + /** + * Checks if the user is following the event. + */ eventCtrl.isFollower = () => { return eventCtrl.event && eventCtrl.event.followers.includes(eventCtrl.user.key); }; + /** + * Add the user as a event's follower + */ eventCtrl.addFollower = () => { - EventService.addFollower(eventCtrl.event.key).then(() => { + return EventService.addFollower(eventCtrl.event.key).then(() => { eventCtrl.event.addFollower(eventCtrl.user.key); MessageService.showToast('Você receberá as atualizações desse evento.'); - }).catch((error) => { - console.error(error); }); }; + /** + * Remove the user from the event's followers list + */ eventCtrl.removeFollower = () => { - EventService.removeFollower(eventCtrl.event.key).then(() => { + return EventService.removeFollower(eventCtrl.event.key).then(() => { eventCtrl.event.removeFollower(eventCtrl.user.key); MessageService.showToast('Você não receberá as atualizações desse evento.'); - }).catch((error) => { - console.error(error); }); }; diff --git a/frontend/event/eventService.js b/frontend/event/eventService.js index 117dcf57a..c40425cc2 100644 --- a/frontend/event/eventService.js +++ b/frontend/event/eventService.js @@ -40,10 +40,18 @@ return HttpService.get('app/utils/months.json'); }; + /** + * Make the request to add the user as event's follower + * {String} eventKey -- the event urlsafe key. + */ service.addFollower = function (eventKey) { return HttpService.post(`/api/events/${eventKey}/followers`); }; + /** + * Make the request to remove the user from event's followers list + * {String} eventKey -- the event urlsafe key. + */ service.removeFollower = function (eventKey) { return HttpService.delete(`/api/events/${eventKey}/followers`); }; diff --git a/frontend/post/postDetailsDirective.js b/frontend/post/postDetailsDirective.js index 0753f1d7d..341b2aaab 100644 --- a/frontend/post/postDetailsDirective.js +++ b/frontend/post/postDetailsDirective.js @@ -275,6 +275,9 @@ return Utils.isLargerThanTheScreen(postDetailsCtrl.post.title) ? 'break' : 'no-break'; }; + /** + * Checks if the post is actually an event that has been shared. + */ postDetailsCtrl.isSharedEvent = () => { return postDetailsCtrl.post.shared_event; }; @@ -288,8 +291,6 @@ EventService.addFollower(postDetailsCtrl.post.shared_event.key).then(() => { postDetailsCtrl.post.shared_event.followers.push(postDetailsCtrl.user.key); MessageService.showToast('Você receberá as atualizações desse evento.'); - }).catch((error) => { - console.error(error); }); }; @@ -297,8 +298,6 @@ EventService.removeFollower(postDetailsCtrl.post.shared_event.key).then(() => { postDetailsCtrl.post.shared_event.followers = postDetailsCtrl.post.shared_event.followers.filter(follower => follower !== postDetailsCtrl.user.key); MessageService.showToast('Você não receberá as atualizações desse evento.'); - }).catch((error) => { - console.error(error); }); }; diff --git a/frontend/test/specs/event/eventDetailsControllerSpec.js b/frontend/test/specs/event/eventDetailsControllerSpec.js index 7df3d075e..af01a20ff 100644 --- a/frontend/test/specs/event/eventDetailsControllerSpec.js +++ b/frontend/test/specs/event/eventDetailsControllerSpec.js @@ -287,6 +287,23 @@ expect(eventCtrl.event.addFollower).toHaveBeenCalled(); expect(eventCtrl.event.followers).toEqual([user.key]); }); + + it('should not add the user as follower when the service crashes', () => { + spyOn(eventService, 'addFollower').and.callFake(() => { + return q.reject(); + }); + + eventCtrl.event = new Event({ key: 'aopskdopas-OKAPODKAOP', followers: [] }); + spyOn(eventCtrl.event, 'addFollower').and.callThrough(); + + const promise = eventCtrl.addFollower(); + + promise.catch(() => { + expect(eventService.addFollower).toHaveBeenCalledWith(eventCtrl.event.key); + expect(eventCtrl.event.addFollower).not.toHaveBeenCalled(); + expect(eventCtrl.event.followers).toEqual([]); + }); + }); }); describe('removeFollower()', () => { @@ -305,5 +322,21 @@ expect(messageService.showToast).toHaveBeenCalled(); expect(eventCtrl.event.removeFollower).toHaveBeenCalled(); }); + + it('should not add the user as follower when the service crashes', () => { + spyOn(eventService, 'removeFollower').and.callFake(() => { + return q.reject(); + }); + + eventCtrl.event = new Event({ key: 'aopskdopas-OKAPODKAOP', followers: [] }); + spyOn(eventCtrl.event, 'removeFollower').and.callThrough(); + + const promise = eventCtrl.removeFollower(); + + promise.catch(() => { + expect(eventService.removeFollower).toHaveBeenCalledWith(eventCtrl.event.key); + expect(eventCtrl.event.removeFollower).not.toHaveBeenCalled(); + }); + }); }); })); \ No newline at end of file diff --git a/frontend/test/specs/event/eventServiceSpec.js b/frontend/test/specs/event/eventServiceSpec.js index 09f4401fc..014778464 100644 --- a/frontend/test/specs/event/eventServiceSpec.js +++ b/frontend/test/specs/event/eventServiceSpec.js @@ -138,9 +138,9 @@ it('should call post', () => { spyOn($http, 'post'); - service.addFollower(); + service.addFollower('aposkpdoskpodkapd'); - expect($http.post).toHaveBeenCalled(); + expect($http.post).toHaveBeenCalledWith('/api/events/aposkpdoskpodkapd/followers'); }); }); @@ -148,9 +148,9 @@ it('should call delete', () => { spyOn($http, 'delete'); - service.removeFollower(); + service.removeFollower('aposkpdoskpodkapd'); - expect($http.delete).toHaveBeenCalled(); + expect($http.delete).toHaveBeenCalledWith('/api/events/aposkpdoskpodkapd/followers'); }); }); }); diff --git a/frontend/test/specs/post/postDetailsControllerSpec.js b/frontend/test/specs/post/postDetailsControllerSpec.js index 221a4bcff..058ac398a 100644 --- a/frontend/test/specs/post/postDetailsControllerSpec.js +++ b/frontend/test/specs/post/postDetailsControllerSpec.js @@ -637,14 +637,14 @@ }); spyOn(messageService, 'showToast'); postDetailsCtrl.post = new Post({ - shared_event: new Event({followers: []}) + shared_event: new Event({followers: [], key: 'akaspo'}) }); postDetailsCtrl.followEvent(); scope.$apply(); - expect(eventService.addFollower).toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalled(); + expect(eventService.addFollower).toHaveBeenCalledWith('akaspo'); + expect(messageService.showToast).toHaveBeenCalledWith('Você receberá as atualizações desse evento.'); expect(postDetailsCtrl.post.shared_event.followers).toEqual([user.key]); }); }); @@ -656,14 +656,14 @@ }); spyOn(messageService, 'showToast'); postDetailsCtrl.post = new Post({ - shared_event: new Event({ followers: [postDetailsCtrl.user.key] }) + shared_event: new Event({ followers: [postDetailsCtrl.user.key], key:'aposkd' }) }); postDetailsCtrl.unFollowEvent(); scope.$apply(); - expect(eventService.removeFollower).toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalled(); + expect(eventService.removeFollower).toHaveBeenCalledWith('aposkd'); + expect(messageService.showToast).toHaveBeenCalledWith('Você não receberá as atualizações desse evento.'); }); }); From de3506cad5204bb03a7aafd8d323f686684ff10d Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Wed, 13 Feb 2019 17:44:04 -0300 Subject: [PATCH 193/606] changed add button collor on timeline --- frontend/home/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/home/home.html b/frontend/home/home.html index 916f9945f..7118b3fbb 100644 --- a/frontend/home/home.html +++ b/frontend/home/home.html @@ -97,7 +97,7 @@ + md-colors="{background: 'light-green-600'}"> add From 7e7c22bea6172c860d16fb7b5fb98b2470d084e2 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Wed, 13 Feb 2019 17:54:30 -0300 Subject: [PATCH 194/606] changed bottom bar event icon --- frontend/main/main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/main/main.html b/frontend/main/main.html index 2f56b17ee..256196fb7 100644 --- a/frontend/main/main.html +++ b/frontend/main/main.html @@ -80,7 +80,7 @@

    Verifique seu email para confirmar sua conta.

    - event + date_range

    Eventos

    From 272abb83272454ec36a701c76d118d36511f9852 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Feb 2019 09:32:33 -0300 Subject: [PATCH 195/606] removed invalid stylesheet link --- frontend/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/index.html b/frontend/index.html index dad4ea4cf..63bfdd6b8 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -37,7 +37,6 @@ - From 5c0535e753da045f7a4357b058b782648666bbf9 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Thu, 14 Feb 2019 09:47:32 -0300 Subject: [PATCH 196/606] Adding correct verification to show message --- frontend/event/events_mobile.html | 2 +- frontend/search/search_event_mobile.html | 54 ++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 frontend/search/search_event_mobile.html diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index 52b5f0697..05c1ed35b 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -4,7 +4,7 @@
    - +

    Nenhum evento a ser exibido.
    diff --git a/frontend/search/search_event_mobile.html b/frontend/search/search_event_mobile.html new file mode 100644 index 000000000..c85412840 --- /dev/null +++ b/frontend/search/search_event_mobile.html @@ -0,0 +1,54 @@ + +
    + + clear + + PESQUISAR +
    +
    +
    + + + + +
    +
    +
    + Pesquisa avançada +
    +
    + + + + {{actuation_area.name}} + + + + + + + {{nature.name}} + + + + + + + {{state.nome}} + + + +
    +
    + + CANCELAR + + + PESQUISAR + +
    +     \ No newline at end of file From 7cc181f5f159baa78eb3e6a108eb94bd9cf6a6e7 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Feb 2019 09:53:31 -0300 Subject: [PATCH 197/606] fixed the transition to config profile page --- frontend/main/mainController.js | 2 +- frontend/user/configProfile/configProfileController.js | 4 ++-- frontend/user/profileController.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/main/mainController.js b/frontend/main/mainController.js index e4e525aae..22924443b 100644 --- a/frontend/main/mainController.js +++ b/frontend/main/mainController.js @@ -179,7 +179,7 @@ (function main() { if (mainCtrl.user.name === 'Unknown') { - $state.go(STATES.CONFIG_PROFILE); + $state.go(STATES.CONFIG_PROFILE, {userKey: mainCtrl.user.key}); } notificationListener(); mainCtrl.getPendingTasks(); diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index 8db430257..dd378737a 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -40,8 +40,8 @@ configProfileCtrl._checkUserName = () => { if (configProfileCtrl.user.name === 'Unknown') { - delete configProfileCtrl.user.name; - delete configProfileCtrl.newUser.name; + configProfileCtrl.user.name = ""; + configProfileCtrl.newUser.name = ""; } } diff --git a/frontend/user/profileController.js b/frontend/user/profileController.js index a66d91fec..f6a2bb36a 100644 --- a/frontend/user/profileController.js +++ b/frontend/user/profileController.js @@ -30,7 +30,7 @@ }; profileCtrl.goToConfigProfile = function goToConfigProfile() { - $state.go(STATES.CONFIG_PROFILE); + $state.go(STATES.CONFIG_PROFILE, {userKey: profileCtrl.user.key}); $mdDialog.cancel(); }; From 821dceb2feea793343f1ba913658cfd0fdb48a1a Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Feb 2019 10:03:37 -0300 Subject: [PATCH 198/606] removed the user cpf data from the profile page --- frontend/user/configProfile/config_profile_mobile.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/user/configProfile/config_profile_mobile.html b/frontend/user/configProfile/config_profile_mobile.html index 5bc35381c..939a89463 100644 --- a/frontend/user/configProfile/config_profile_mobile.html +++ b/frontend/user/configProfile/config_profile_mobile.html @@ -42,8 +42,6 @@
    e-mail:

    {{ configProfileCtrl.showProperty(configProfileCtrl.user.email[0]) }}

    - cpf: -

    {{ configProfileCtrl.showProperty(configProfileCtrl.user.cpf) }}

    From 103cbc19c4958857e0ccbdbf56d0a367e1791c40 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Feb 2019 11:10:04 -0300 Subject: [PATCH 199/606] refact functions that return promises --- .../configProfile/configProfileController.js | 50 ++++++++----------- frontend/user/profileService.js | 25 ++++------ 2 files changed, 32 insertions(+), 43 deletions(-) diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index dd378737a..ae8faa19d 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -4,13 +4,13 @@ angular .module("app") .controller("ConfigProfileController", [ - '$state', 'STATES', '$stateParams', 'ProfileService', 'CropImageService', 'AuthService', + '$state', 'STATES', '$stateParams', 'ProfileService', 'CropImageService', 'AuthService', '$q', 'UserService', 'ImageService', '$rootScope', 'SCREEN_SIZES', 'MessageService', '$mdDialog', 'ObserverRecorderService', ConfigProfileController ]); function ConfigProfileController($state, STATES, $stateParams, ProfileService, CropImageService, AuthService, - UserService, ImageService, $rootScope, SCREEN_SIZES, MessageService, $mdDialog, ObserverRecorderService) { + $q, UserService, ImageService, $rootScope, SCREEN_SIZES, MessageService, $mdDialog, ObserverRecorderService) { const configProfileCtrl = this; @@ -91,36 +91,28 @@ }; configProfileCtrl._saveImage = () => { - return new Promise((resolve) => { - if(configProfileCtrl.photo_user) { - ImageService.saveImage(configProfileCtrl.photo_user) - .then(function (data) { - configProfileCtrl.user.photo_url = data.url; - configProfileCtrl.user.uploaded_images.push(data.url); - resolve(); - }) - } else { - resolve(); - } - }) + if(configProfileCtrl.photo_user) { + return ImageService.saveImage(configProfileCtrl.photo_user) + .then(function (data) { + configProfileCtrl.user.photo_url = data.url; + configProfileCtrl.user.uploaded_images.push(data.url); + }) + } + return $q.when(); } configProfileCtrl._saveUser = () => { - return new Promise((resolve) => { - if (configProfileCtrl.newUser.isValid()) { - updateUser(); - const patch = ObserverRecorderService.generate(observer); - UserService.save(patch) - .then(() => { - AuthService.save(); - MessageService.showToast("Edição concluída com sucesso"); - resolve(); - }); - } else { - MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); - resolve(); - } - }); + if (configProfileCtrl.newUser.isValid()) { + updateUser(); + const patch = ObserverRecorderService.generate(observer); + return UserService.save(patch) + .then(() => { + AuthService.save(); + MessageService.showToast("Edição concluída com sucesso"); + }); + } + MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); + return $q.when(); } function updateUser() { diff --git a/frontend/user/profileService.js b/frontend/user/profileService.js index b8581bab8..47a43385e 100644 --- a/frontend/user/profileService.js +++ b/frontend/user/profileService.js @@ -58,26 +58,23 @@ .targetEvent(event) .ok('Sim') .cancel('Não'); - const promise = $mdDialog.show(confirm); - promise.then(function () { - service._deleteInstitution(institution.key); - }, function () { - MessageService.showToast('Cancelado'); - }); - return promise; + + return $mdDialog.show(confirm) + .then(function () { + service._deleteInstitution(institution.key); + }, function () { + MessageService.showToast('Cancelado'); + }); } else { MessageService.showToast('Desvínculo não permitido. Você é administrador dessa instituição.'); } }; service._deleteInstitution = (institutionKey) => { - return new Promise(resolve => { - UserService.deleteInstitution(institutionKey) - .then(_ => { - service._removeConnection(institutionKey); - resolve(); - }); - }); + return UserService.deleteInstitution(institutionKey) + .then(_ => { + service._removeConnection(institutionKey); + }); }; service._removeConnection = (institutionKey) => { From 5476762dc4c7ae561a561975372ad085fad78a91 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Thu, 14 Feb 2019 11:22:29 -0300 Subject: [PATCH 200/606] Finishing event setup and adding the toolbar in the post page --- frontend/event/eventDetailsDirective.js | 21 +++-- frontend/event/event_details_small_page.html | 2 +- frontend/post/postPageController.js | 87 +++++++++++++++++++- frontend/post/post_page.html | 6 +- frontend/toolbar/default_toolbar_mobile.html | 14 ++-- 5 files changed, 113 insertions(+), 17 deletions(-) diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index 30bcf3c6e..098c9c71d 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -3,15 +3,16 @@ var app = angular.module('app'); app.controller("EventDetailsController", function EventDetailsController(MessageService, EventService, - $state, $mdDialog, AuthService, STATES, SCREEN_SIZES) { + $state, $mdDialog, AuthService, STATES, SCREEN_SIZES, ngClipboard) { var eventCtrl = this; eventCtrl.user = AuthService.getCurrentUser(); eventCtrl.isLoadingEvents = true; eventCtrl.showImage = true; + eventCtrl.defaultToolbarOptions = generateToolbarMenuOptions(); - eventCtrl.share = function share(ev, event) { + eventCtrl.share = function share(ev) { $mdDialog.show({ controller: "SharePostController", controllerAs: "sharePostCtrl", @@ -21,7 +22,7 @@ clickOutsideToClose: true, locals: { user: eventCtrl.user, - post: event, + post: eventCtrl.event, addPost: false } }); @@ -148,10 +149,16 @@ return new Date(isoTime).getHours(); }; - eventCtrl.generateToolbarMenuOptions = () => { + eventCtrl.copyLink = function copyLink() { + var url = Utils.generateLink(`/event/${eventCtrl.event.key}/details`); + ngClipboard.toClipboard(url); + MessageService.showToast("O link foi copiado"); + }; + + function generateToolbarMenuOptions() { return [ - { title: 'Obter link', icon: 'link', action: () => { } }, - { title: 'Compartilhar', icon: 'share', action: () => { } }, + { title: 'Obter link', icon: 'link', action: () => { eventCtrl.copyLink() } }, + { title: 'Compartilhar', icon: 'share', action: () => { eventCtrl.share('$event') } }, { title: 'Receber atualizações', icon: 'bookmark', action: () => { } } ] }; @@ -171,7 +178,7 @@ $state.go(STATES.HOME); }); } - + eventCtrl.$onInit = function() { if ($state.params.eventKey) return loadEvent($state.params.eventKey); diff --git a/frontend/event/event_details_small_page.html b/frontend/event/event_details_small_page.html index 227000174..e0dda3715 100644 --- a/frontend/event/event_details_small_page.html +++ b/frontend/event/event_details_small_page.html @@ -1,4 +1,4 @@ - +
    diff --git a/frontend/post/postPageController.js b/frontend/post/postPageController.js index a02a3f5fd..4649d5b8c 100644 --- a/frontend/post/postPageController.js +++ b/frontend/post/postPageController.js @@ -3,11 +3,16 @@ var app = angular.module('app'); - app.controller("PostPageController", function PostPageController(PostService, $state, STATES) { + app.controller("PostPageController", function PostPageController(PostService, $state, + STATES, MessageService, ngClipboard, AuthService, $mdDialog) { var postCtrl = this; postCtrl.post = null; + postCtrl.defaultToolbarOptions = generateToolbarOptions(); + + postCtrl.user = AuthService.getCurrentUser(); + postCtrl.isHiden = function isHiden() { var isDeleted = postCtrl.post.state == 'deleted'; var hasNoComments = postCtrl.post.number_of_comments === 0; @@ -17,6 +22,86 @@ return postCtrl.post.state === 'deleted' && hasNoActivity; }; + postCtrl.copyLink = function copyLink() { + var url = Utils.generateLink('/post/' + postCtrl.post.key); + ngClipboard.toClipboard(url); + MessageService.showToast("O link foi copiado"); + }; + + postCtrl.reloadPost = function reloadPost() { + var type_survey = postCtrl.post.type_survey; + postCtrl.post.type_survey = ''; + var promise = PostService.getPost(postCtrl.post.key); + promise.then(function success(response) { + response.data_comments = Object.values(response.data_comments); + postCtrl.post = response; + postCtrl.isLoadingComments = false; + }, function error(response) { + postCtrl.post.type_survey = type_survey; + postCtrl.isLoadingComments = true; + }); + return promise; + }; + + postCtrl.share = function share(event) { + const post = getOriginalPost(postCtrl.post); + $mdDialog.show({ + controller: "SharePostController", + controllerAs: "sharePostCtrl", + templateUrl: 'app/post/share_post_dialog.html', + parent: angular.element(document.body), + targetEvent: event, + clickOutsideToClose: true, + locals: { + user: postCtrl.user, + post: post, + addPost: true + } + }); + }; + + postCtrl.addSubscriber = function addSubscriber() { + PostService.addSubscriber(postCtrl.post.key).then(function success() { + MessageService.showToast('Esse post foi marcado como de seu interesse.'); + postCtrl.post.subscribers.push(postCtrl.user.key); + }); + }; + + postCtrl.removeSubscriber = function removeSubscriber() { + PostService.removeSubscriber(postCtrl.post.key).then(function success() { + MessageService.showToast('Esse post foi removido dos posts de seu interesse.'); + _.remove(postCtrl.post.subscribers, function (userKey) { + return userKey === postCtrl.user.key; + }); + }, function error(response) { + $state.go($state.current); + }); + }; + + postCtrl.isSubscriber = function isSubscriber() { + return postCtrl.post && _.includes(postCtrl.post.subscribers, postCtrl.user.key); + }; + + function getOriginalPost(post) { + if (post.shared_post) { + return post.shared_post; + } else if (post.shared_event) { + return post.shared_event; + } + return post; + } + + function generateToolbarOptions() { + return [ + { title: 'Obter link', icon: 'link', action: () => { postCtrl.copyLink() } }, + { title: 'Atualizar post', icon: 'refresh', action: () => { postCtrl.reloadPost() } }, + { title: 'Compartilhar', icon: 'share', action: () => { postCtrl.share('$event') } }, + { title: 'Receber atualizações', icon: 'bookmark', action: () => { postCtrl.addSubscriber() }, hide: () => postCtrl.isSubscriber() }, + { title: 'Não receber atualizações', icon: 'bookmark', + action: () => { postCtrl.removeSubscriber() }, hide: () => !postCtrl.isSubscriber() } + ]; + } + function loadPost(postKey) { var promise = PostService.getPost(postKey); promise.then(function success(response) { diff --git a/frontend/post/post_page.html b/frontend/post/post_page.html index 183d3452d..8e86b89d4 100644 --- a/frontend/post/post_page.html +++ b/frontend/post/post_page.html @@ -1,10 +1,12 @@ + +
    -
    +
    -
    +
    diff --git a/frontend/toolbar/default_toolbar_mobile.html b/frontend/toolbar/default_toolbar_mobile.html index 9476ff61d..fa5daa25a 100644 --- a/frontend/toolbar/default_toolbar_mobile.html +++ b/frontend/toolbar/default_toolbar_mobile.html @@ -10,12 +10,14 @@ more_vert - - - - {{option.icon}} - - {{option.title}} + + +
    + + {{option.icon}} + + {{option.title}} +
    From 5e8639fcff6bcdebab8c42afc59db778882d6218 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Feb 2019 15:18:09 -0300 Subject: [PATCH 201/606] jsDoc to ProfileService --- frontend/user/profileService.js | 34 ++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/frontend/user/profileService.js b/frontend/user/profileService.js index 47a43385e..50f1ed828 100644 --- a/frontend/user/profileService.js +++ b/frontend/user/profileService.js @@ -23,6 +23,12 @@ const user = AuthService.getCurrentUser(); + /** + * It opens a dialog to show the user profile + * @param {string} userKey - key of the user which profile is going to be showed + * @param {object} ev - event + * @param {string} institutionKey - institution key related to the profile + */ service.showProfile = function showProfile(userKey, ev, institutionKey) { $mdDialog.show({ templateUrl: Utils.selectFieldBasedOnScreenSize('app/user/profile.html', @@ -39,13 +45,27 @@ }); }; + /** + * Sends a patch request with the edited fields from profile + * @param {object} data - The pach data with the profile modifications + */ service.editProfile = function editProfile(data) { data = JSON.parse(angular.toJson(data)); return HttpService.patch(USER_URI, data); }; + /** + * Checks if the current user is admin of the given institution + * @param {object} institution + */ service._isAdmin = institution => user.isAdmin(institution.key); + /** + * If the user is not admin of the institution from which she wants to delete the profile, + * a dialog is openned, and she must confirm weather she wants to proceed with the deletion or not. + * @param {object} event + * @param {object} institution - institution related to the profile the user wants to remove + */ service.removeProfile = (event, institution) => { if (!service._isAdmin(institution)) { const textContent = service._hasMoreThanOneInstitution() ? HAS_MORE_THAN_ONE_INSTITUTION_MSG : HAS_ONLY_ONE_INSTITUTION_MSG; @@ -69,7 +89,11 @@ MessageService.showToast('Desvínculo não permitido. Você é administrador dessa instituição.'); } }; - + /** + * Sends a delete request to remomve the given institution from + * the list of institution which she belongs to. + * @param {string} institutionKey - key of the institution that is going to be removed + */ service._deleteInstitution = (institutionKey) => { return UserService.deleteInstitution(institutionKey) .then(_ => { @@ -77,6 +101,11 @@ }); }; + /** + * Removes the profile and its related institution from + * the curent user, than save the changes + * @param {string} institutionKey - key of the institution related to the removed profile + */ service._removeConnection = (institutionKey) => { if (service._hasMoreThanOneInstitution()) { user.removeInstitution(institutionKey); @@ -87,6 +116,9 @@ } } + /** + * Checks if the user belongs to more than one institution + */ service._hasMoreThanOneInstitution = () => { return user.institutions.length > 1; }; From 5e6f9a5731cc62d0dfb1e82177807e0748020b4b Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Feb 2019 15:30:41 -0300 Subject: [PATCH 202/606] editProfile jsDoc --- .../user/editProfile/editProfileController.js | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/frontend/user/editProfile/editProfileController.js b/frontend/user/editProfile/editProfileController.js index 984563048..d793ec7ef 100644 --- a/frontend/user/editProfile/editProfileController.js +++ b/frontend/user/editProfile/editProfileController.js @@ -15,6 +15,10 @@ let profileObserver = {}; let oldProfile; + /** + * Sets up the current user, the profile that is going to be edited + * and the abserver that will capture the changes to create a patch object + */ editProfileCtrl.$onInit = () => { editProfileCtrl.user = AuthService.getCurrentUser(); editProfileCtrl.profile = profile; @@ -22,10 +26,18 @@ profileObserver = ObserverRecorderService.register(editProfileCtrl.user); }; + /** + * Gets the institution name and abreviates it + * if is longer than 67 characters + */ editProfileCtrl.getInstName = () => { return Utils.limitString(editProfileCtrl.profile.institution.name, 67); }; + /** + * Save the changes done in the current profile + * if all of its fields are corrected filled + */ editProfileCtrl.edit = function edit() { if (isValidProfile()) { var patch = ObserverRecorderService.generate(profileObserver); @@ -42,16 +54,27 @@ } }; + /** + * Calls the removeProfile function to remove the current profile + * @param {object} event - javascript event + */ editProfileCtrl.removeProfile = (event) => { ProfileService.removeProfile(event, profile.institution); }; + /** + * Closes the profile and restores the profile to its orinal state + * if some changes were done, but not saved + */ editProfileCtrl.closeDialog = function closeDialog() { const indexOfProfile = editProfileCtrl.user.institution_profiles.indexOf(editProfileCtrl.profile); editProfileCtrl.user.institution_profiles[indexOfProfile] = oldProfile; $mdDialog.hide(); }; + /** + * Check if the profile has the field office filled + */ function isValidProfile() { return !_.isEmpty(editProfileCtrl.profile.office); } From 5d7e931c1307bea4a9e4dd1eb78ab3d76618bcca Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Thu, 14 Feb 2019 15:32:38 -0300 Subject: [PATCH 203/606] Adding some jsdoc and tests --- frontend/event/eventDetailsDirective.js | 18 +++++-- frontend/post/postPageController.js | 54 ++++++++++++++----- .../specs/event/eventDetailsControllerSpec.js | 29 +++++++++- .../toolbar/defaultToolbarControllerSpec.js | 33 ++++++++++++ frontend/toolbar/defaultToolbar.component.js | 12 +++-- 5 files changed, 123 insertions(+), 23 deletions(-) create mode 100644 frontend/test/specs/toolbar/defaultToolbarControllerSpec.js diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index 098c9c71d..02e64a610 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -10,7 +10,7 @@ eventCtrl.user = AuthService.getCurrentUser(); eventCtrl.isLoadingEvents = true; eventCtrl.showImage = true; - eventCtrl.defaultToolbarOptions = generateToolbarMenuOptions(); + eventCtrl.share = function share(ev) { $mdDialog.show({ @@ -136,7 +136,7 @@ eventCtrl.isDeleted = () => { return eventCtrl.event ? eventCtrl.event.state === 'deleted' : true; - } + }; /** * This function receives a date in iso format, @@ -149,14 +149,20 @@ return new Date(isoTime).getHours(); }; + /** + * Copies the event's link to the clipboard. + */ eventCtrl.copyLink = function copyLink() { var url = Utils.generateLink(`/event/${eventCtrl.event.key}/details`); ngClipboard.toClipboard(url); MessageService.showToast("O link foi copiado"); }; - function generateToolbarMenuOptions() { - return [ + /** + * Constructs a list with the menu options. + */ + eventCtrl.generateToolbarMenuOptions = function generateToolbarMenuOptions() { + eventCtrl.defaultToolbarOptions = [ { title: 'Obter link', icon: 'link', action: () => { eventCtrl.copyLink() } }, { title: 'Compartilhar', icon: 'share', action: () => { eventCtrl.share('$event') } }, { title: 'Receber atualizações', icon: 'bookmark', action: () => { } } @@ -180,8 +186,10 @@ } eventCtrl.$onInit = function() { - if ($state.params.eventKey) + if ($state.params.eventKey) { + eventCtrl.generateToolbarMenuOptions(); return loadEvent($state.params.eventKey); + } }; }); diff --git a/frontend/post/postPageController.js b/frontend/post/postPageController.js index 4649d5b8c..9742c2904 100644 --- a/frontend/post/postPageController.js +++ b/frontend/post/postPageController.js @@ -22,17 +22,24 @@ return postCtrl.post.state === 'deleted' && hasNoActivity; }; + /** + * It copies the post's url to the clipboard + */ postCtrl.copyLink = function copyLink() { var url = Utils.generateLink('/post/' + postCtrl.post.key); ngClipboard.toClipboard(url); MessageService.showToast("O link foi copiado"); }; + /** + * Refreshes the post. + * If + */ postCtrl.reloadPost = function reloadPost() { var type_survey = postCtrl.post.type_survey; postCtrl.post.type_survey = ''; - var promise = PostService.getPost(postCtrl.post.key); - promise.then(function success(response) { + return PostService.getPost(postCtrl.post.key) + .then(function success(response) { response.data_comments = Object.values(response.data_comments); postCtrl.post = response; postCtrl.isLoadingComments = false; @@ -40,11 +47,14 @@ postCtrl.post.type_survey = type_survey; postCtrl.isLoadingComments = true; }); - return promise; }; + /** + * Open up a dialog that allows the user to share + * the post. + */ postCtrl.share = function share(event) { - const post = getOriginalPost(postCtrl.post); + const post = getOriginalPost(); $mdDialog.show({ controller: "SharePostController", controllerAs: "sharePostCtrl", @@ -60,6 +70,11 @@ }); }; + /** + * Add the user to the post's subscribers list + * what makes him to receive the notifications realated + * to the post. + */ postCtrl.addSubscriber = function addSubscriber() { PostService.addSubscriber(postCtrl.post.key).then(function success() { MessageService.showToast('Esse post foi marcado como de seu interesse.'); @@ -67,6 +82,10 @@ }); }; + /** + * Removes the user from the post's subscribers list + * peventing him of receive notifications related to the post. + */ postCtrl.removeSubscriber = function removeSubscriber() { PostService.removeSubscriber(postCtrl.post.key).then(function success() { MessageService.showToast('Esse post foi removido dos posts de seu interesse.'); @@ -78,19 +97,30 @@ }); }; + /** + * Checks if the user is in the post's subscribers list + */ postCtrl.isSubscriber = function isSubscriber() { - return postCtrl.post && _.includes(postCtrl.post.subscribers, postCtrl.user.key); + return postCtrl.post && postCtrl.post.subscribers.includes(postCtrl.user.key); }; - function getOriginalPost(post) { - if (post.shared_post) { - return post.shared_post; - } else if (post.shared_event) { - return post.shared_event; + /** + * If the post comes from another + * it returns the shared one, otherwise + * the post is returned. + */ + function getOriginalPost() { + if (postCtrl.post.shared_post) { + return postCtrl.post.shared_post; + } else if (postCtrl.post.shared_event) { + return postCtrl.post.shared_event; } - return post; + return postCtrl.post; } + /** + * Constructs a list with the menu options. + */ function generateToolbarOptions() { return [ { title: 'Obter link', icon: 'link', action: () => { postCtrl.copyLink() } }, @@ -101,7 +131,7 @@ action: () => { postCtrl.removeSubscriber() }, hide: () => !postCtrl.isSubscriber() } ]; } - + function loadPost(postKey) { var promise = PostService.getPost(postKey); promise.then(function success(response) { diff --git a/frontend/test/specs/event/eventDetailsControllerSpec.js b/frontend/test/specs/event/eventDetailsControllerSpec.js index 709d4d76b..afd790eeb 100644 --- a/frontend/test/specs/event/eventDetailsControllerSpec.js +++ b/frontend/test/specs/event/eventDetailsControllerSpec.js @@ -2,7 +2,7 @@ (describe('Test EventDetailsController', function () { - let eventCtrl, scope, httpBackend, rootScope, deffered, eventService, messageService, mdDialog, state; + let eventCtrl, scope, httpBackend, rootScope, deffered, eventService, messageService, mdDialog, state, clipboard; const splab = { name: 'Splab', key: '098745' }, @@ -38,7 +38,7 @@ beforeEach(module('app')); beforeEach(inject(function ($controller, $httpBackend, $http, $q, AuthService, - $rootScope, EventService, MessageService, $mdDialog, $state) { + $rootScope, EventService, MessageService, $mdDialog, $state, ngClipboard) { scope = $rootScope.$new(); httpBackend = $httpBackend; rootScope = $rootScope; @@ -47,6 +47,7 @@ messageService = MessageService; mdDialog = $mdDialog; state = $state; + clipboard = ngClipboard; AuthService.login(user); eventCtrl = $controller('EventDetailsController', { @@ -250,4 +251,28 @@ expect(returnedHours).toEqual(hours); }); }); + + describe('copyLink()', () => { + it('should call toClipboard', () => { + spyOn(clipboard, 'toClipboard'); + spyOn(messageService, 'showToast'); + + eventCtrl.event = new Event({key: 'aposdkspoakdposa'}); + eventCtrl.copyLink(); + + expect(clipboard.toClipboard).toHaveBeenCalled(); + expect(messageService.showToast).toHaveBeenCalled(); + }); + }); + + describe('generateToolbarMenuOptions()', () => { + it('should set defaultToolbarOptions', () => { + expect(eventCtrl.defaultToolbarOptions).toBeFalsy(); + + eventCtrl.generateToolbarMenuOptions(); + + expect(eventCtrl.defaultToolbarOptions).toBeTruthy(); + expect(eventCtrl.defaultToolbarOptions.length).toEqual(3); + }); + }); })); \ No newline at end of file diff --git a/frontend/test/specs/toolbar/defaultToolbarControllerSpec.js b/frontend/test/specs/toolbar/defaultToolbarControllerSpec.js new file mode 100644 index 000000000..292e3a0a1 --- /dev/null +++ b/frontend/test/specs/toolbar/defaultToolbarControllerSpec.js @@ -0,0 +1,33 @@ +'use strict'; + +describe('DefaultToolbarController test', () => { + beforeEach(module('app')); + + let scope, defaultToolbarCtrl, window; + + beforeEach(inject(function ($componentController, $rootScope, SCREEN_SIZES, $window) { + scope = $rootScope.$new(); + window = $window; + defaultToolbarCtrl = $componentController('defaultToolbar', null, { + scope: scope, + SCREEN_SIZES: SCREEN_SIZES, + $window: window + }); + })); + + describe('isMobileScreen()', () => { + it('should call isMobileScreen', () => { + spyOn(Utils, 'isMobileScreen'); + defaultToolbarCtrl.isMobileScreen(); + expect(Utils.isMobileScreen).toHaveBeenCalled(); + }); + }); + + describe('goBack()', () => { + it('should call back()', () => { + spyOn(window.history, 'back'); + defaultToolbarCtrl.goBack(); + expect(window.history.back).toHaveBeenCalled(); + }); + }); +}); \ No newline at end of file diff --git a/frontend/toolbar/defaultToolbar.component.js b/frontend/toolbar/defaultToolbar.component.js index 9dc8f489d..db9eb1dae 100644 --- a/frontend/toolbar/defaultToolbar.component.js +++ b/frontend/toolbar/defaultToolbar.component.js @@ -3,6 +3,11 @@ (function () { const app = angular.module("app"); + /** + * Generic component that lives in some pages that doesn't need + * the main toolbar. Only for mobile. + * {object} menuOptions -- Some options the user can choose when the menu is clicked + */ app.component("defaultToolbar", { templateUrl: 'app/toolbar/default_toolbar_mobile.html', controller: ['SCREEN_SIZES', '$window', DefaultToolbarController], @@ -22,12 +27,11 @@ return Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE); }; + /** + * Redirect the user to the previous page. + */ defaultToolbarCtrl.goBack = () => { $window.history.back(); }; - - defaultToolbarCtrl.$onInit = () => { - console.log(defaultToolbarCtrl.menuOptions); - }; } })(); \ No newline at end of file From d14dbdaa8afe934769cfff9d0106976dd8c51c8c Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Thu, 14 Feb 2019 15:43:35 -0300 Subject: [PATCH 204/606] Adding some jsdoc and instantiating the shared_event in postDetailsCtrl --- frontend/event/eventDetailsDirective.js | 2 +- frontend/post/postDetailsDirective.js | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index fdb981c72..83f8ff04f 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -159,7 +159,7 @@ }; /** - * Add the user as a event's follower + * Add the user as an event's follower */ eventCtrl.addFollower = () => { return EventService.addFollower(eventCtrl.event.key).then(() => { diff --git a/frontend/post/postDetailsDirective.js b/frontend/post/postDetailsDirective.js index 341b2aaab..387427c50 100644 --- a/frontend/post/postDetailsDirective.js +++ b/frontend/post/postDetailsDirective.js @@ -282,21 +282,33 @@ return postDetailsCtrl.post.shared_event; }; + /** + * Checks if the user is following the event, if so + * the user will receive notifications related to the event. + */ postDetailsCtrl.isFollowingEvent = () => { const eventFollowers = (postDetailsCtrl.post.shared_event && postDetailsCtrl.post.shared_event.followers) || []; return eventFollowers.includes(postDetailsCtrl.user.key); }; + /** + * Add the user as an event's follower. + * Thus, the user will receive notifications related to the event. + */ postDetailsCtrl.followEvent = () => { EventService.addFollower(postDetailsCtrl.post.shared_event.key).then(() => { - postDetailsCtrl.post.shared_event.followers.push(postDetailsCtrl.user.key); + postDetailsCtrl.post.shared_event.addFollower(postDetailsCtrl.user.key); MessageService.showToast('Você receberá as atualizações desse evento.'); }); }; + /** + * Remove the user from the event's followers list. + * Thus, the user won't receive any notification related to the event. + */ postDetailsCtrl.unFollowEvent = () => { EventService.removeFollower(postDetailsCtrl.post.shared_event.key).then(() => { - postDetailsCtrl.post.shared_event.followers = postDetailsCtrl.post.shared_event.followers.filter(follower => follower !== postDetailsCtrl.user.key); + postDetailsCtrl.post.shared_event.removeFollower(postDetailsCtrl.user.key); MessageService.showToast('Você não receberá as atualizações desse evento.'); }); }; @@ -543,6 +555,12 @@ Utils.limitString(text, LIMIT_POST_CHARACTERS) : text; } + postDetailsCtrl.$onInit = () => { + if (postDetailsCtrl.isSharedEvent()) { + postDetailsCtrl.post.shared_event = new Event(postDetailsCtrl.post.shared_event); + } + }; + postDetailsCtrl.$postLink = function() { if($state.params.focus){ window.location.href= window.location.href + '#comment-input'; From d013c2b3ea0ada79b4a3f5b59e881020a9184405 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Feb 2019 15:55:58 -0300 Subject: [PATCH 205/606] fixed tests and replaced the use of deffered promise by q.when --- .../test/specs/main/mainControllerSpec.js | 5 +-- .../specs/user/configProfileControllerSpec.js | 34 +++++++------------ .../specs/user/editProfileControllerSpec.js | 9 +++-- .../test/specs/user/profileControllerSpec.js | 4 ++- .../test/specs/user/profileServiceSpec.js | 10 +++--- 5 files changed, 27 insertions(+), 35 deletions(-) diff --git a/frontend/test/specs/main/mainControllerSpec.js b/frontend/test/specs/main/mainControllerSpec.js index db050fafa..07eb285f4 100644 --- a/frontend/test/specs/main/mainControllerSpec.js +++ b/frontend/test/specs/main/mainControllerSpec.js @@ -110,7 +110,8 @@ invites: [], institutions: [otherInstitution], permissions: {}, - state: 'active' + state: 'active', + key: 'user-key' }; authService.getCurrentUser = function() { @@ -121,7 +122,7 @@ mainCtrl = createCtrl(); - expect(state.go).toHaveBeenCalledWith(states.CONFIG_PROFILE); + expect(state.go).toHaveBeenCalledWith(states.CONFIG_PROFILE, {userKey: unknownUser.key}); }); it("should create observer", function() { diff --git a/frontend/test/specs/user/configProfileControllerSpec.js b/frontend/test/specs/user/configProfileControllerSpec.js index f8327c378..024133110 100644 --- a/frontend/test/specs/user/configProfileControllerSpec.js +++ b/frontend/test/specs/user/configProfileControllerSpec.js @@ -1,8 +1,8 @@ 'use strict'; (describe('Test ConfigProfileController', function() { - let configCtrl, httpBackend, scope, userService, createCrtl, state, deferred, - authService, imageService, mdDialog, cropImageService, states, messageService, + let configCtrl, q, scope, userService, createCrtl, + authService, imageService, mdDialog, cropImageService, messageService, stateParams, observerRecorderService; let institution, other_institution, user, newUser, authUser; @@ -47,17 +47,13 @@ beforeEach(module('app')); - beforeEach(inject(function($controller, $httpBackend, $rootScope, $q, $state, STATES, - $mdDialog, UserService, AuthService, ImageService, CropImageService, MessageService, - $stateParams, ObserverRecorderService) { + beforeEach(inject(function($controller, $q, $rootScope, $mdDialog, UserService, + AuthService, ImageService, CropImageService, MessageService, $stateParams, ObserverRecorderService) { - httpBackend = $httpBackend; + q = $q; scope = $rootScope.$new(); - state = $state; - states = STATES; imageService = ImageService; mdDialog = $mdDialog; - deferred = $q.defer(); userService = UserService; cropImageService = CropImageService; messageService = MessageService; @@ -129,12 +125,12 @@ expect(configCtrl.newUser.name).toBe(newUser.name); }); - it("should delete user and newUser name prop when it is 'UnKnown'", () => { + it("should set the user and newUser name to an empty string when it is 'UnKnown'", () => { configCtrl.user = {...user, name:'Unknown'}; configCtrl.newUser = {...configCtrl.user}; configCtrl._checkUserName(); - expect(configCtrl.user.name).toBeUndefined(); - expect(configCtrl.newUser.name).toBeUndefined(); + expect(configCtrl.user.name).toBe(""); + expect(configCtrl.newUser.name).toBe(""); }); }); @@ -161,9 +157,8 @@ it('Should set a new image to the user', function() { const imageInput = createImage(100); const imageOutput = createImage(800); - spyOn(imageService, 'compress').and.returnValue(deferred.promise); + spyOn(imageService, 'compress').and.returnValue(q.when(imageOutput)); spyOn(imageService, 'readFile'); - deferred.resolve(imageOutput); configCtrl.addImage(imageInput); scope.$apply(); expect(imageService.compress).toHaveBeenCalledWith(imageInput, 800); @@ -195,10 +190,9 @@ describe('finish()', function(){ it('Should call _saveImage and _saveUser', function() { - spyOn(configCtrl, '_saveImage').and.returnValue(deferred.promise); - spyOn(configCtrl, '_saveUser').and.returnValue(deferred.promise); + spyOn(configCtrl, '_saveImage').and.returnValue(q.when()); + spyOn(configCtrl, '_saveUser').and.returnValue(q.when()); configCtrl.loadingSubmission = true; - deferred.resolve(); configCtrl.finish(); scope.$apply(); @@ -216,9 +210,8 @@ const data = {url: 'img-url'}; configCtrl.photo_user = userImage; expect(configCtrl.user.photo_url).toBeUndefined(); - spyOn(imageService, 'saveImage').and.returnValue(deferred.promise); + spyOn(imageService, 'saveImage').and.returnValue(q.when(data)); spyOn(configCtrl.user.uploaded_images, 'push'); - deferred.resolve(data); configCtrl._saveImage(); scope.$apply(); @@ -242,10 +235,9 @@ const patch = {name: 'newName'}; spyOn(configCtrl.newUser, 'isValid').and.returnValue(true); spyOn(observerRecorderService, 'generate').and.returnValue(patch); - spyOn(userService, 'save').and.returnValue(deferred.promise); + spyOn(userService, 'save').and.returnValue(q.when()); spyOn(authService, 'save'); spyOn(messageService, 'showToast'); - deferred.resolve(); configCtrl._saveUser(); scope.$apply(); diff --git a/frontend/test/specs/user/editProfileControllerSpec.js b/frontend/test/specs/user/editProfileControllerSpec.js index 5f75a1736..68f54948e 100644 --- a/frontend/test/specs/user/editProfileControllerSpec.js +++ b/frontend/test/specs/user/editProfileControllerSpec.js @@ -2,8 +2,8 @@ (describe('Test EditProfileController', function() { - let scope, mdDialog, authService, profileService, messageService, - editProfileCtrl, observerRecorderService, userToEdit, deferred; + let scope, mdDialog, authService, profileService, messageService, q, + editProfileCtrl, observerRecorderService, userToEdit; let institution, user, profile; @@ -41,7 +41,7 @@ profileService = ProfileService; scope = $rootScope.$new(); mdDialog = $mdDialog; - deferred = $q.defer(); + q = $q; authService = AuthService; observerRecorderService = ObserverRecorderService; messageService = MessageService; @@ -88,11 +88,10 @@ it('should call editProfile() and save()', function() { const patch = {...profile, office: 'developer'}; spyOn(observerRecorderService, 'generate').and.returnValue(patch); - spyOn(profileService, 'editProfile').and.returnValue(deferred.promise); + spyOn(profileService, 'editProfile').and.returnValue(q.when()); spyOn(authService, 'save'); spyOn(messageService, 'showToast'); spyOn(mdDialog, 'hide'); - deferred.resolve(); editProfileCtrl.edit(); scope.$apply(); diff --git a/frontend/test/specs/user/profileControllerSpec.js b/frontend/test/specs/user/profileControllerSpec.js index 38bda0bab..8f744d1f4 100644 --- a/frontend/test/specs/user/profileControllerSpec.js +++ b/frontend/test/specs/user/profileControllerSpec.js @@ -33,6 +33,7 @@ }); }; profileCtrl = createCtrl(); + })); describe('goToConfigProfile()', function() { @@ -40,11 +41,12 @@ beforeEach(function() { spyOn(mdDialog, 'cancel'); spyOn(state, 'go'); + profileCtrl.user = user; profileCtrl.goToConfigProfile(); }); it('should call state.go()', function() { - expect(state.go).toHaveBeenCalledWith(states.CONFIG_PROFILE); + expect(state.go).toHaveBeenCalledWith(states.CONFIG_PROFILE, {userKey: user.key}); }); it('should call mdDialog.cancel()', function() { diff --git a/frontend/test/specs/user/profileServiceSpec.js b/frontend/test/specs/user/profileServiceSpec.js index f041fadad..cdce1711f 100644 --- a/frontend/test/specs/user/profileServiceSpec.js +++ b/frontend/test/specs/user/profileServiceSpec.js @@ -4,7 +4,7 @@ const USER_URI = '/api/user'; let mdDialog, profileService, httpService, scope, - authService, deferred, messageService, userService; + authService, q, messageService, userService; let user, institution; @@ -28,7 +28,7 @@ authService = AuthService; messageService = MessageService; scope = $rootScope.$new(); - deferred = $q.defer(); + q = $q; userService = UserService; setupModels(); @@ -59,7 +59,7 @@ beforeEach(() => { spyOn(authService, 'getCurrentUser').and.returnValue(user); spyOn(profileService, '_hasMoreThanOneInstitution').and.returnValue(true); - spyOn(mdDialog, 'show').and.returnValue(deferred.promise); + spyOn(mdDialog, 'show').and.returnValue(q.when()); spyOn(mdDialog, 'confirm').and.callThrough(); spyOn(profileService, '_deleteInstitution'); spyOn(messageService, 'showToast'); @@ -69,7 +69,6 @@ the connection between user and institution `, () => { spyOn(profileService, '_isAdmin').and.returnValue(false); - deferred.resolve(); profileService.removeProfile({}, institution); scope.$apply(); @@ -95,9 +94,8 @@ describe('_deleteInstitution', () => { it(`should call deleteInstitution and _removeConnection`, () => { - spyOn(userService, 'deleteInstitution').and.returnValue(deferred.promise); + spyOn(userService, 'deleteInstitution').and.returnValue(q.when()); spyOn(profileService, '_removeConnection'); - deferred.resolve(); profileService._deleteInstitution(institution.key); scope.$apply(); From 6bc8728ddc1cced5f634fd33edcb7d85fe33a031 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Thu, 14 Feb 2019 17:29:05 -0300 Subject: [PATCH 206/606] Creating the search event class --- backend/models/event.py | 6 ++ backend/search_module/search_event.py | 134 ++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 backend/search_module/search_event.py diff --git a/backend/models/event.py b/backend/models/event.py index 5c7679ad2..4d1da8e8f 100644 --- a/backend/models/event.py +++ b/backend/models/event.py @@ -4,6 +4,7 @@ from google.appengine.ext import ndb from custom_exceptions import FieldException from models import Address +from search_module import SearchEvent __all__ = ['Event'] @@ -164,6 +165,11 @@ def make(event): 'institution_acronym': event.institution_acronym } + def _post_put_hook(self, future): + """This method is called after each Institution.put().""" + search_event = SearchEvent() + search_event.createDocument(future.get_result().get()) + def __setattr__(self, attr, value): """ Method of set attributes. diff --git a/backend/search_module/search_event.py b/backend/search_module/search_event.py new file mode 100644 index 000000000..914213181 --- /dev/null +++ b/backend/search_module/search_event.py @@ -0,0 +1,134 @@ +# -*- coding: utf-8 -*- +"""Search Institution.""" + +from google.appengine.api import search +from . import SearchDocument +from utils import text_normalize +from datetime import datetime + +__all__ = ['SearchEvent'] + +def event_has_changes(fields, entity): + """It returns True when there is a change + to make in entity's document. + """ + address = entity.address + + for field in fields: + if hasattr(entity, field.name) and field.value != getattr(entity, field.name): + return True + elif hasattr(address, field.name) and field.value != getattr(address, field.name): + return True + + return False + +class SearchEvent(SearchDocument): + """Search institution's model.""" + + def __init__(self): + """Init method.""" + self.index_name = 'event' + + def createDocument(self, event): + """Create a document. + + Keyword arguments: + event -- It wrapps the attributes that will be used in document. + All of them are self descriptive and + relationed to the event. + """ + index = search.Index(name=self.index_name) + doc = index.get(event.key.urlsafe()) + if doc is None or doc is type(None): + + content = { + 'id': event.key.urlsafe(), + 'institution_name': event.institution_name, + 'institution_acronym': event.institution_acronym, + 'country': event.address and event.address.country, + 'federal_state': institution.address and institution.address.federal_state, + 'city': event.address and event.address.city + } + # Make the structure of the document by setting the fields and its id. + document = search.Document( + # The document's id is the same of the event's one, + # what makes the search easier. + doc_id=content['id'], + fields=[ + search.TextField(name='institution_name', value=content['institution_name']), + search.TextField(name='institution_acronym', value=content['institution_acronym']), + search.TextField(name='country', value=content['country']), + search.TextField(name='federal_state', value=content['federal_state']), + search.TextField(name='city', value=content['city']) + ] + ) + self.saveDocument(document) + else: + self.updateDocument(event) + + def getDocuments(self, value, state): + """Retrieve the documents and return them processed.""" + query_string = self.makeQueryStr(value, state) + index = search.Index(self.index_name) + query_options = search.QueryOptions( + returned_fields=['institution_name', 'institution_acronym', + 'country', 'federal_state', 'city'] + ) + query = search.Query( + query_string=query_string, options=query_options) + documents = index.search(query) + return self.processDocuments(documents) + + def makeQueryStr(self, value, state): + """Make the query string. + + Keyword arguments: + value -- value to be searched + state -- represents the current event's state. + """ + state_string = self.create_state_string(state) + fields_values_string = self.create_field_values_string(value) + + query_string = "(%s) AND %s" % (fields_values_string, state_string) if fields_values_string else state_string + return query_string + + def create_state_string(self, state): + """Create a string formed by state.""" + states = state.split(",") + state_string = "" + for i in xrange(0, len(states), 1): + if(i == 0): + state_string += states[i] + else: + state_string += " OR " + states[i] + + state_string = "state: %s" % state_string + return state_string + + def create_field_values_string(self, value): + """Create a string formed by fields and values. + + If value is empty the method will return an empty string + which means that the query will be only by the state + and the fields won't be considered. + """ + # add a new field here + fields = ['institution_name', 'institution_acronym', + 'country', 'federal_state', 'city'] + fields_values = [] + + if value: + for field in fields: + field_value = '%s: "%s"' % (field, value) + fields_values.append(field_value) + + fields_values_string = " OR ".join(fields_values) if fields_values else "" + return text_normalize(fields_values_string) + + def updateDocument(self, entity, has_changes=institution_has_changes): + """Update a Document. + + When an entity changes its fields, this function + updates the previous document. + """ + super(SearchInstitution, self).updateDocument(entity, has_changes) From 55bfe9bf030a43b5d5c3f1a323c8524462459b14 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Thu, 14 Feb 2019 17:31:51 -0300 Subject: [PATCH 207/606] Adding jsdoc and tests --- frontend/post/postPageController.js | 19 ++-- .../test/specs/post/postPageControllerSpec.js | 103 +++++++++++++++++- 2 files changed, 108 insertions(+), 14 deletions(-) diff --git a/frontend/post/postPageController.js b/frontend/post/postPageController.js index 9742c2904..faf53e94d 100644 --- a/frontend/post/postPageController.js +++ b/frontend/post/postPageController.js @@ -9,8 +9,6 @@ postCtrl.post = null; - postCtrl.defaultToolbarOptions = generateToolbarOptions(); - postCtrl.user = AuthService.getCurrentUser(); postCtrl.isHiden = function isHiden() { @@ -32,8 +30,8 @@ }; /** - * Refreshes the post. - * If + * Refreshes the post by retrieving it from + * the server once again. */ postCtrl.reloadPost = function reloadPost() { var type_survey = postCtrl.post.type_survey; @@ -121,8 +119,8 @@ /** * Constructs a list with the menu options. */ - function generateToolbarOptions() { - return [ + postCtrl.generateToolbarOptions = function generateToolbarOptions() { + postCtrl.defaultToolbarOptions = [ { title: 'Obter link', icon: 'link', action: () => { postCtrl.copyLink() } }, { title: 'Atualizar post', icon: 'refresh', action: () => { postCtrl.reloadPost() } }, { title: 'Compartilhar', icon: 'share', action: () => { postCtrl.share('$event') } }, @@ -130,8 +128,8 @@ { title: 'Não receber atualizações', icon: 'bookmark', action: () => { postCtrl.removeSubscriber() }, hide: () => !postCtrl.isSubscriber() } ]; - } - + }; + function loadPost(postKey) { var promise = PostService.getPost(postKey); promise.then(function success(response) { @@ -143,6 +141,9 @@ return promise; } - loadPost($state.params.key); + postCtrl.$onInit = () => { + loadPost($state.params.key); + postCtrl.generateToolbarOptions(); + }; }); })(); \ No newline at end of file diff --git a/frontend/test/specs/post/postPageControllerSpec.js b/frontend/test/specs/post/postPageControllerSpec.js index 0672ffc09..b9008766d 100644 --- a/frontend/test/specs/post/postPageControllerSpec.js +++ b/frontend/test/specs/post/postPageControllerSpec.js @@ -2,7 +2,7 @@ (describe('Test PostPageController', function () { - var postCtrl, scope, httpBackend, postService, state; + let postCtrl, scope, httpBackend, postService, state, clipboard, messageService, mdDialog, q; var institutions = [ { name: 'Splab', key: '098745' }, @@ -13,18 +13,29 @@ 'title': 'Shared Post', 'text': 'This post will be shared', 'photo_url': null, - 'key': '12300' + 'key': '12300', + subscribers: [] }, institutions[1].institution_key); beforeEach(module('app')); - beforeEach(inject(function ($controller, $httpBackend, PostService, $state) { + beforeEach(inject(function ($controller, $httpBackend, PostService, $state, ngClipboard, + MessageService, $mdDialog, $q, AuthService, $rootScope) { httpBackend = $httpBackend; state = $state; postService = PostService; + clipboard = ngClipboard; + messageService = MessageService; + mdDialog = $mdDialog; + q = $q; + scope = $rootScope.$new(); httpBackend.when('GET', "main/main.html").respond(200); httpBackend.when('GET', "home/home.html").respond(200); + AuthService.getCurrentUser = function () { + return new User({key: 'aopsdkopdaskospdpokdskop'}); + }; + spyOn(postService, 'getPost').and.callFake(function () { return { then: function (callback) { @@ -36,10 +47,11 @@ state.params.key = post.key postCtrl = $controller('PostPageController', { PostService: postService, - state: state + state: state, + scope: scope }); - + postCtrl.$onInit(); })); afterEach(function () { @@ -78,4 +90,85 @@ expect(result).toEqual(true); }); }); + + describe('copyLink()', () => { + it('should call toClipboard', () => { + spyOn(Utils, 'generateLink'); + spyOn(clipboard, 'toClipboard'); + spyOn(messageService, 'showToast'); + + postCtrl.copyLink(); + + expect(Utils.generateLink).toHaveBeenCalled(); + expect(clipboard.toClipboard).toHaveBeenCalled(); + expect(messageService.showToast).toHaveBeenCalled(); + }); + }); + + describe('reloadPost()', () => { + + }); + + describe('share()', () => { + it('should call show', () => { + spyOn(mdDialog, 'show'); + + postCtrl.share('$event'); + + expect(mdDialog.show).toHaveBeenCalled(); + }); + }); + + describe('addSubscriber()', () => { + it('should call addSubscriber', () => { + spyOn(postService, 'addSubscriber').and.callFake(() => { + return q.when(); + }); + spyOn(messageService, 'showToast'); + + postCtrl.addSubscriber(); + scope.$apply(); + + expect(postService.addSubscriber).toHaveBeenCalled(); + expect(messageService.showToast).toHaveBeenCalled(); + expect(postCtrl.post.subscribers).toEqual([postCtrl.user.key]); + }); + }); + + describe('removeSubscriber()', () => { + it('should call removeSubscriber', () => { + spyOn(postService, 'removeSubscriber').and.callFake(() => { + return q.when(); + }); + spyOn(messageService, 'showToast'); + + postCtrl.removeSubscriber(); + scope.$apply(); + + expect(postService.removeSubscriber).toHaveBeenCalled(); + expect(messageService.showToast).toHaveBeenCalled(); + }); + }); + + describe('isSubscriber()', () => { + it('should be truthy', () => { + postCtrl.post.subscribers.push(postCtrl.user.key); + expect(postCtrl.isSubscriber()).toBeTruthy(); + }); + + it('should be falsy', () => { + postCtrl.post.subscribers = []; + expect(postCtrl.isSubscriber()).toBeFalsy(); + }); + }); + + describe('generateToolbarOptions()', () => { + it('should set defaultToolbrOptions', () => { + postCtrl.defaultToolbarOptions = []; + + postCtrl.generateToolbarOptions(); + + expect(postCtrl.defaultToolbarOptions.length).toEqual(5); + }); + }); })); \ No newline at end of file From 509b8cb84a60adcbc7c46cbb77ede0461d1bd30b Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Fri, 15 Feb 2019 09:53:03 -0300 Subject: [PATCH 208/606] Fixing the merge and adding follow event function --- frontend/event/eventDetailsDirective.js | 5 +++- .../specs/event/eventDetailsControllerSpec.js | 28 +++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index e6025c868..facfb43f1 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -169,11 +169,14 @@ eventCtrl.defaultToolbarOptions = [ { title: 'Obter link', icon: 'link', action: () => { eventCtrl.copyLink() } }, { title: 'Compartilhar', icon: 'share', action: () => { eventCtrl.share('$event') } }, - { title: 'Receber atualizações', icon: 'bookmark', action: () => { } } + { title: 'Receber atualizações', icon: 'visibility', action: () => { eventCtrl.addFollower() }, hide: () => eventCtrl.isFollower() }, + { title: 'Não receber atualizações', icon: 'visibility_off', action: () => { eventCtrl.removeFollower() }, hide: () => !eventCtrl.isFollower() }, ] }; /** + * Checks if the user is following the event. + */ eventCtrl.isFollower = () => { return eventCtrl.event && eventCtrl.event.followers.includes(eventCtrl.user.key); }; diff --git a/frontend/test/specs/event/eventDetailsControllerSpec.js b/frontend/test/specs/event/eventDetailsControllerSpec.js index d8962246f..d29c594a3 100644 --- a/frontend/test/specs/event/eventDetailsControllerSpec.js +++ b/frontend/test/specs/event/eventDetailsControllerSpec.js @@ -275,11 +275,35 @@ expect(eventCtrl.defaultToolbarOptions).toBeTruthy(); expect(eventCtrl.defaultToolbarOptions.length).toEqual(3); + }); + }); + + describe('isFollower()', () => { + beforeEach(() => { + eventCtrl.event = new Event({ + followers: [] + }); + }); + + it('should return true when the user is following the event', () => { + eventCtrl.event.addFollower(user.key); + expect(eventCtrl.isFollower()).toEqual(true); + }); + + it('should return false when the user is not following the event', () => { + expect(eventCtrl.isFollower()).toEqual(false); + }); + }); + + describe('addFollower()', () => { + it('should call addFollower', () => { + spyOn(eventService, 'addFollower').and.callFake(() => { + return q.when(); }); spyOn(messageService, 'showToast'); eventCtrl.event = new Event({ key: 'aopskdopas-OKAPODKAOP', followers: [] }); spyOn(eventCtrl.event, 'addFollower').and.callThrough(); - + eventCtrl.addFollower(); scope.$apply(); @@ -298,7 +322,7 @@ spyOn(eventCtrl.event, 'addFollower').and.callThrough(); const promise = eventCtrl.addFollower(); - + promise.catch(() => { expect(eventService.addFollower).toHaveBeenCalledWith(eventCtrl.event.key); expect(eventCtrl.event.addFollower).not.toHaveBeenCalled(); From c5d5d42c0eb3d5ff1ecba27bd2583e8539d61151 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Fri, 15 Feb 2019 10:52:24 -0300 Subject: [PATCH 209/606] modified push notification permission flow --- frontend/auth/authService.js | 4 +--- frontend/home/homeController.js | 10 +++++----- frontend/test/specs/home/homeControllerSpec.js | 8 ++++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/frontend/auth/authService.js b/frontend/auth/authService.js index b242af4aa..df0aca173 100644 --- a/frontend/auth/authService.js +++ b/frontend/auth/authService.js @@ -130,9 +130,7 @@ if (user.emailVerified) { return user.getIdToken(true).then(function(idToken) { return service.setupUser(idToken, user.emailVerified).then(function success(userInfo) { - return PushNotificationService.requestNotificationPermission(service.getCurrentUser()).finally(() => { - return userInfo; - }); + return userInfo; }); }); } else { diff --git a/frontend/home/homeController.js b/frontend/home/homeController.js index 8390154ed..43dc180a0 100644 --- a/frontend/home/homeController.js +++ b/frontend/home/homeController.js @@ -4,7 +4,7 @@ var app = angular.module("app"); app.controller("HomeController", function HomeController(AuthService, $mdDialog, - $state, EventService, ProfileService, $rootScope, POST_EVENTS, STATES) { + $state, EventService, ProfileService, $rootScope, POST_EVENTS, STATES, PushNotificationService) { var homeCtrl = this; var LIMITE_EVENTS = 5; @@ -13,8 +13,6 @@ homeCtrl.followingInstitutions = []; homeCtrl.isLoadingPosts = true; homeCtrl.showMessageOfEmptyEvents = true; - - homeCtrl.user = AuthService.getCurrentUser(); homeCtrl.eventInProgress = function eventInProgress(event) { var end_time = event.end_time; @@ -122,10 +120,12 @@ $rootScope.$broadcast(eventType, post); } - (function main() { + homeCtrl.$onInit = () => { + homeCtrl.user = AuthService.getCurrentUser(); loadEvents(); getFollowingInstitutions(); registerPostEvents(); - })(); + return PushNotificationService.requestNotificationPermission(homeCtrl.user); + }; }); })(); \ No newline at end of file diff --git a/frontend/test/specs/home/homeControllerSpec.js b/frontend/test/specs/home/homeControllerSpec.js index 529f89560..a57ea1e81 100644 --- a/frontend/test/specs/home/homeControllerSpec.js +++ b/frontend/test/specs/home/homeControllerSpec.js @@ -2,7 +2,7 @@ (describe('Test HomeController', function() { - let homeCtrl, httpBackend, scope, createCtrl, mdDialog, state, states, http, postService; + let homeCtrl, httpBackend, scope, createCtrl, mdDialog, state, states, http, postService, pushNotService; var institutions = [{ acronym: 'Certbio', @@ -35,7 +35,7 @@ beforeEach(module('app')); beforeEach(inject(function($controller, $httpBackend, $rootScope, - PostService, $mdDialog, $state, AuthService, $http, STATES) { + PostService, $mdDialog, $state, AuthService, PushNotificationService, $http, STATES) { httpBackend = $httpBackend; http = $http; scope = $rootScope.$new(); @@ -43,6 +43,7 @@ state = $state; postService = PostService; states = STATES; + pushNotService = PushNotificationService; httpBackend.when('GET', "/api/events?page=0&limit=15").respond([event]); httpBackend.when('GET', 'main/main.html').respond(200); @@ -61,11 +62,14 @@ }; spyOn($rootScope, '$on').and.callThrough(); + spyOn(pushNotService, 'requestNotificationPermission'); homeCtrl = createCtrl(); + homeCtrl.$onInit(); httpBackend.flush(); expect($rootScope.$on).toHaveBeenCalled(); + expect(pushNotService.requestNotificationPermission).toHaveBeenCalledWith(new User(user)); })); afterEach(function() { From 4cf5c336f0a94e34ec79a44dbae4024f15b9293a Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Fri, 15 Feb 2019 11:20:16 -0300 Subject: [PATCH 210/606] modified dependecy notation[ --- frontend/auth/authService.js | 6 +++--- frontend/home/homeController.js | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/auth/authService.js b/frontend/auth/authService.js index df0aca173..5cdf12243 100644 --- a/frontend/auth/authService.js +++ b/frontend/auth/authService.js @@ -3,8 +3,8 @@ var app = angular.module("app"); - app.service("AuthService", function AuthService($q, $state, $window, UserService, - MessageService, PushNotificationService, STATES) { + app.service("AuthService", ['$q', '$state', '$window', 'UserService', 'MessageService', 'STATES', + function AuthService($q, $state, $window, UserService, MessageService, STATES) { var service = this; var authObj = firebase.auth(); @@ -257,5 +257,5 @@ } init(); - }); + }]); })(); \ No newline at end of file diff --git a/frontend/home/homeController.js b/frontend/home/homeController.js index 43dc180a0..d40f721e0 100644 --- a/frontend/home/homeController.js +++ b/frontend/home/homeController.js @@ -3,8 +3,10 @@ (function() { var app = angular.module("app"); - app.controller("HomeController", function HomeController(AuthService, $mdDialog, - $state, EventService, ProfileService, $rootScope, POST_EVENTS, STATES, PushNotificationService) { + app.controller("HomeController", ['AuthService', '$mdDialog', '$state', 'EventService', 'ProfileService', '$rootScope', + 'PushNotificationService', 'POST_EVENTS', 'STATES', + function HomeController(AuthService, $mdDialog, $state, EventService, ProfileService, $rootScope, + PushNotificationService, POST_EVENTS, STATES) { var homeCtrl = this; var LIMITE_EVENTS = 5; @@ -127,5 +129,5 @@ registerPostEvents(); return PushNotificationService.requestNotificationPermission(homeCtrl.user); }; - }); + }]); })(); \ No newline at end of file From c13d0225ec78064404fbc999ba1b98d819fd1f31 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Fri, 15 Feb 2019 11:36:05 -0300 Subject: [PATCH 211/606] Fixing some details --- frontend/event/create_event.html | 7 +-- frontend/event/eventDetailsDirective.js | 18 ++++--- frontend/event/event_details_small_page.html | 32 ------------ frontend/post/postPageController.js | 52 +++++++++++++++++-- frontend/post/post_details.html | 2 +- .../specs/event/eventDetailsControllerSpec.js | 2 +- .../test/specs/post/postPageControllerSpec.js | 10 ++++ 7 files changed, 74 insertions(+), 49 deletions(-) diff --git a/frontend/event/create_event.html b/frontend/event/create_event.html index d45027df8..4ecaf4fe1 100644 --- a/frontend/event/create_event.html +++ b/frontend/event/create_event.html @@ -1,9 +1,6 @@ + +
    -
    - - keyboard_arrow_left - -
    { eventCtrl.copyLink() } }, { title: 'Compartilhar', icon: 'share', action: () => { eventCtrl.share('$event') } }, { title: 'Receber atualizações', icon: 'visibility', action: () => { eventCtrl.addFollower() }, hide: () => eventCtrl.isFollower() }, - { title: 'Não receber atualizações', icon: 'visibility_off', action: () => { eventCtrl.removeFollower() }, hide: () => !eventCtrl.isFollower() }, + { title: 'Não receber atualizações', icon: 'visibility_off', action: () => { eventCtrl.removeFollower() }, + hide: () => !eventCtrl.isFollower() || eventCtrl.isEventAuthor() }, + { title: 'Cancelar evento', icon: 'cancel', action: () => { eventDetailsCtrl.confirmDeleteEvent('$event') }, hide: () => !eventCtrl.canChange() } ] }; @@ -211,6 +213,8 @@ function loadEvent(eventKey) { return EventService.getEvent(eventKey).then(function success(response) { eventCtrl.event = new Event(response); + console.log(response); + console.log(eventCtrl.user.key); }, function error(response) { MessageService.showToast(response); $state.go(STATES.HOME); diff --git a/frontend/event/event_details_small_page.html b/frontend/event/event_details_small_page.html index 0bb6ba6bf..e299aad1d 100644 --- a/frontend/event/event_details_small_page.html +++ b/frontend/event/event_details_small_page.html @@ -4,38 +4,6 @@
    {{ eventDetailsCtrl.event.title | uppercase}} - - - - - - share - Compartilhar evento - - - - - cancel - Cancelar evento - - - - - visibility - Receber Atualizações - - - - - visibility_off - Deixar de receber atualizações - - - -
    diff --git a/frontend/post/postPageController.js b/frontend/post/postPageController.js index faf53e94d..721d3513a 100644 --- a/frontend/post/postPageController.js +++ b/frontend/post/postPageController.js @@ -11,6 +11,8 @@ postCtrl.user = AuthService.getCurrentUser(); + const EDIT_POST_PERMISSION = 'edit_post'; + postCtrl.isHiden = function isHiden() { var isDeleted = postCtrl.post.state == 'deleted'; var hasNoComments = postCtrl.post.number_of_comments === 0; @@ -40,10 +42,8 @@ .then(function success(response) { response.data_comments = Object.values(response.data_comments); postCtrl.post = response; - postCtrl.isLoadingComments = false; }, function error(response) { postCtrl.post.type_survey = type_survey; - postCtrl.isLoadingComments = true; }); }; @@ -116,6 +116,47 @@ return postCtrl.post; } + postCtrl.edit = function edit(event) { + $mdDialog.show({ + controller: function DialogController() { }, + controllerAs: "controller", + templateUrl: 'app/home/post_dialog.html', + parent: angular.element(document.body), + targetEvent: event, + clickOutsideToClose: true, + locals: { + originalPost: postCtrl.post, + isEditing: true + }, + bindToController: true + }).then(function success(editedPost) { + postCtrl.post.title = editedPost.title; + postCtrl.post.text = editedPost.text; + postCtrl.post.photo_url = editedPost.photo_url; + postCtrl.post.pdf_files = editedPost.pdf_files; + postCtrl.post.video_url = editedPost.video_url; + }, function error() { }); + }; + + postCtrl.canEdit = function canEdit() { + const hasPermission = postCtrl.post && postCtrl.user.hasPermission(EDIT_POST_PERMISSION, postCtrl.post.key); + var isActiveInst = postCtrl.post && postCtrl.post.institution_state == "active"; + return hasPermission && postCtrl.post.state !== 'deleted' && isActiveInst && + !postCtrl.postHasActivity() && !postCtrl.isShared() && !postCtrl.post.type_survey; + }; + + postCtrl.postHasActivity = function postHasActivity() { + var hasNoComments = postCtrl.post.number_of_comments === 0; + var hasNoLikes = postCtrl.post.number_of_likes === 0; + + return !hasNoComments || !hasNoLikes; + }; + + postCtrl.isShared = function isShared() { + return postCtrl.post.shared_post || + postCtrl.post.shared_event; + }; + /** * Constructs a list with the menu options. */ @@ -126,10 +167,15 @@ { title: 'Compartilhar', icon: 'share', action: () => { postCtrl.share('$event') } }, { title: 'Receber atualizações', icon: 'bookmark', action: () => { postCtrl.addSubscriber() }, hide: () => postCtrl.isSubscriber() }, { title: 'Não receber atualizações', icon: 'bookmark', - action: () => { postCtrl.removeSubscriber() }, hide: () => !postCtrl.isSubscriber() } + action: () => { postCtrl.removeSubscriber() }, hide: () => !postCtrl.isSubscriber() || postCtrl.isPostAuthor() }, + { title: 'Editar postagem', icon: 'edit', action: () => { postCtrl.edit() }, hide: () => !postCtrl.canEdit() } ]; }; + postCtrl.isPostAuthor = function isPostAuthor() { + return postCtrl.post.author_key === postCtrl.user.key; + }; + function loadPost(postKey) { var promise = PostService.getPost(postKey); promise.then(function success(response) { diff --git a/frontend/post/post_details.html b/frontend/post/post_details.html index 344715525..540204248 100644 --- a/frontend/post/post_details.html +++ b/frontend/post/post_details.html @@ -41,7 +41,7 @@ - + more_vert diff --git a/frontend/test/specs/event/eventDetailsControllerSpec.js b/frontend/test/specs/event/eventDetailsControllerSpec.js index d29c594a3..bea867e86 100644 --- a/frontend/test/specs/event/eventDetailsControllerSpec.js +++ b/frontend/test/specs/event/eventDetailsControllerSpec.js @@ -274,7 +274,7 @@ eventCtrl.generateToolbarMenuOptions(); expect(eventCtrl.defaultToolbarOptions).toBeTruthy(); - expect(eventCtrl.defaultToolbarOptions.length).toEqual(3); + expect(eventCtrl.defaultToolbarOptions.length).toEqual(4); }); }); diff --git a/frontend/test/specs/post/postPageControllerSpec.js b/frontend/test/specs/post/postPageControllerSpec.js index b9008766d..4f0f79123 100644 --- a/frontend/test/specs/post/postPageControllerSpec.js +++ b/frontend/test/specs/post/postPageControllerSpec.js @@ -171,4 +171,14 @@ expect(postCtrl.defaultToolbarOptions.length).toEqual(5); }); }); + + describe('reloadPost()', () => { + it('should call getPost', () => { + spyOn(Object, 'values'); + postCtrl.reloadPost(); + + expect(postService.getPost).toHaveBeenCalled(); + expect(Object.values).toHaveBeenCalled(); + }); + }); })); \ No newline at end of file From bde3793ec0db4c1c57d1a6de57ff41bd894017ee Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Fri, 15 Feb 2019 12:29:54 -0300 Subject: [PATCH 212/606] Adding a page to search events --- backend/search_module/__init__.py | 4 +- backend/search_module/search_event.py | 10 +-- frontend/app.js | 12 +++- frontend/search/search.css | 39 +++++++++++ frontend/search/search_event.html | 65 +++++++++++++++++++ .../toolbar/mainToolbarControllerSpec.js | 2 +- frontend/toolbar/mainToolbar.component.js | 6 +- frontend/toolbar/main_toolbar_mobile.html | 2 +- frontend/utils/statesConstants.js | 1 + 9 files changed, 130 insertions(+), 11 deletions(-) create mode 100644 frontend/search/search_event.html diff --git a/backend/search_module/__init__.py b/backend/search_module/__init__.py index 6febea5ad..4a2719c79 100644 --- a/backend/search_module/__init__.py +++ b/backend/search_module/__init__.py @@ -2,8 +2,8 @@ from .search_document import * from .search_institution import * from .search_user import * +from .search_event import * - -search_modules = [search_document, search_institution, search_user] +search_modules = [search_document, search_institution, search_user, search_event] __all__ = [prop for search_module in search_modules for prop in search_module.__all__] diff --git a/backend/search_module/search_event.py b/backend/search_module/search_event.py index 914213181..3f51409d0 100644 --- a/backend/search_module/search_event.py +++ b/backend/search_module/search_event.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -"""Search Institution.""" +"""Search Event.""" from google.appengine.api import search from . import SearchDocument @@ -23,7 +23,7 @@ def event_has_changes(fields, entity): return False class SearchEvent(SearchDocument): - """Search institution's model.""" + """Search event's model.""" def __init__(self): """Init method.""" @@ -46,7 +46,7 @@ def createDocument(self, event): 'institution_name': event.institution_name, 'institution_acronym': event.institution_acronym, 'country': event.address and event.address.country, - 'federal_state': institution.address and institution.address.federal_state, + 'federal_state': event.address and event.address.federal_state, 'city': event.address and event.address.city } # Make the structure of the document by setting the fields and its id. @@ -125,10 +125,10 @@ def create_field_values_string(self, value): fields_values_string = " OR ".join(fields_values) if fields_values else "" return text_normalize(fields_values_string) - def updateDocument(self, entity, has_changes=institution_has_changes): + def updateDocument(self, entity, has_changes=event_has_changes): """Update a Document. When an entity changes its fields, this function updates the previous document. """ - super(SearchInstitution, self).updateDocument(entity, has_changes) + super(SearchEvent, self).updateDocument(entity, has_changes) diff --git a/frontend/app.js b/frontend/app.js index 1d60d19ab..dcfa29b63 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -62,6 +62,15 @@ } } }) + .state(STATES.SEARCH_EVENT, { + url: "/search_event/:search_keyword", + views: { + user_content: { + templateUrl: "app/search/search_event.html", + controller: "SearchController as searchCtrl" + } + } + }) .state(STATES.HOME, { url: "/", views: { @@ -515,7 +524,8 @@ */ app.run(function mobileInterceptor($transitions, $state, STATES, SCREEN_SIZES) { const permitted_routes = [ - STATES.CREATE_EVENT + STATES.CREATE_EVENT, + STATES.SEARCH_EVENT ]; $transitions.onStart({ diff --git a/frontend/search/search.css b/frontend/search/search.css index 7b4a7ebb4..3b40673f5 100644 --- a/frontend/search/search.css +++ b/frontend/search/search.css @@ -88,4 +88,43 @@ #search-list-item div b { height: 2.8em; font-size: 0.75em; +} + +.search-event-input-margin { + margin: -0.4em 1.4em 0 1.2em; +} + +.search-event-input-name { + width: 90%; + margin-left: 1.2em; + font-size: 0.8em; +} + +.search-event-input { + border-color: #009688 !important; + margin-top: -1.2em; +} + +.search-event-title, .search-event-select-menu { + color: #004D40; + font-size: 0.8em; + margin-top: -0.1em; +} + +.search-event-title { + margin-left: 0.17em; +} + +.search-event-select-menu { + margin: -0.3em 0em -2.35em 1.6em; + font-size: 0.7em; +} + +.search-event-select-menu-size { + width: 96%; +} + +.search-event-title-margin { + margin-bottom: 2em; + margin-left: 0.8em; } \ No newline at end of file diff --git a/frontend/search/search_event.html b/frontend/search/search_event.html new file mode 100644 index 000000000..3037182b3 --- /dev/null +++ b/frontend/search/search_event.html @@ -0,0 +1,65 @@ + +
    + + clear + + PESQUISAR +
    +
    +

    Pesquisa avançada

    +
    + +

    INSTITUIÇÃO

    + +     +
    +
    +

    DATA DO EVENTO

    + + + {{ value }} + + +
    +
    +

    PAÍS

    + + + {{ value }} + + +
    +
    +

    ESTADO

    + + + {{ value }} + + +
    +
    +

    MUNICÍPIO

    + + + {{ value }} + + +
    +
    +
    + + CANCELAR + + + PESQUISAR + +
    +     \ No newline at end of file diff --git a/frontend/test/specs/toolbar/mainToolbarControllerSpec.js b/frontend/test/specs/toolbar/mainToolbarControllerSpec.js index f7fc322c1..8d9863a83 100644 --- a/frontend/test/specs/toolbar/mainToolbarControllerSpec.js +++ b/frontend/test/specs/toolbar/mainToolbarControllerSpec.js @@ -31,7 +31,7 @@ describe('MainToolbarController test', () => { it('should call state.go', () => { spyOn(state, 'go'); - mainToolbarCtrl.changeState('app.user.timeline', {}); + mainToolbarCtrl.changeState(); expect(state.go).toHaveBeenCalled(); }); diff --git a/frontend/toolbar/mainToolbar.component.js b/frontend/toolbar/mainToolbar.component.js index 1ddf99b9e..10cc6e261 100644 --- a/frontend/toolbar/mainToolbar.component.js +++ b/frontend/toolbar/mainToolbar.component.js @@ -40,7 +40,11 @@ * @param {object} params -- the state's params */ mainToolbarCtrl.changeState = (state, params) => { - $state.go(state, params); + if ($state.current.name === STATES.EVENTS) { + $state.go(STATES.SEARCH_EVENT, {search_keyword: ''}); + } else { + $state.go(STATES.SEARCH, {search_keyword: ''}); + } }; /** diff --git a/frontend/toolbar/main_toolbar_mobile.html b/frontend/toolbar/main_toolbar_mobile.html index 71744e11a..d92f95c0c 100644 --- a/frontend/toolbar/main_toolbar_mobile.html +++ b/frontend/toolbar/main_toolbar_mobile.html @@ -41,7 +41,7 @@
    + ng-click="mainToolbarCtrl.changeState()"> search
    diff --git a/frontend/utils/statesConstants.js b/frontend/utils/statesConstants.js index 46a0d8d44..4206cf88e 100644 --- a/frontend/utils/statesConstants.js +++ b/frontend/utils/statesConstants.js @@ -7,6 +7,7 @@ APP: "app", USER: "app.user", SEARCH: "app.user.search", + SEARCH_EVENT: "app.user.search_event", HOME: "app.user.home", USER_INSTITUTIONS: "app.user.institutions", EVENTS: "app.user.events", From 1b23074eb4bbceef0df817466dd119e873902148 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 18 Feb 2019 10:24:16 -0300 Subject: [PATCH 213/606] Finishing missing details and fixing tests --- frontend/event/create_event.html | 3 +-- frontend/event/event.css | 2 +- frontend/test/specs/event/eventDetailsControllerSpec.js | 4 ++-- frontend/test/specs/post/postPageControllerSpec.js | 2 +- frontend/toolbar/defaultToolbar.component.js | 3 ++- frontend/toolbar/default_toolbar_mobile.html | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/event/create_event.html b/frontend/event/create_event.html index 4ecaf4fe1..ee33d8fd1 100644 --- a/frontend/event/create_event.html +++ b/frontend/event/create_event.html @@ -1,6 +1,5 @@ - -
    +
    keyboard_arrow_left -
    +
    more_vert From c60efe798e178edd44fefb54340a055e3da396ea Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 18 Feb 2019 10:36:21 -0300 Subject: [PATCH 214/606] Adding some missing jsdoc --- frontend/post/postPageController.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/frontend/post/postPageController.js b/frontend/post/postPageController.js index 721d3513a..49400fa43 100644 --- a/frontend/post/postPageController.js +++ b/frontend/post/postPageController.js @@ -116,6 +116,9 @@ return postCtrl.post; } + /** + * Open up a dialog that allows the user to edit the post. + */ postCtrl.edit = function edit(event) { $mdDialog.show({ controller: function DialogController() { }, @@ -138,6 +141,10 @@ }, function error() { }); }; + /** + * Checks if the user can edit the post. For that, the user needs to have the + * permissions. Besides, the post and the institution can not be unavailable + */ postCtrl.canEdit = function canEdit() { const hasPermission = postCtrl.post && postCtrl.user.hasPermission(EDIT_POST_PERMISSION, postCtrl.post.key); var isActiveInst = postCtrl.post && postCtrl.post.institution_state == "active"; @@ -145,6 +152,9 @@ !postCtrl.postHasActivity() && !postCtrl.isShared() && !postCtrl.post.type_survey; }; + /** + * Checks if the post has any activity. It can be comments or likes. + */ postCtrl.postHasActivity = function postHasActivity() { var hasNoComments = postCtrl.post.number_of_comments === 0; var hasNoLikes = postCtrl.post.number_of_likes === 0; @@ -152,6 +162,9 @@ return !hasNoComments || !hasNoLikes; }; + /** + * Checks if the post came from another post or event by sharing. + */ postCtrl.isShared = function isShared() { return postCtrl.post.shared_post || postCtrl.post.shared_event; @@ -172,6 +185,9 @@ ]; }; + /** + * Checks if the current user is the post's author. + */ postCtrl.isPostAuthor = function isPostAuthor() { return postCtrl.post.author_key === postCtrl.user.key; }; From c25a6d4d7b5dd36463f3e125548428b18783c4a3 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 18 Feb 2019 10:40:27 -0300 Subject: [PATCH 215/606] reverting sw.js --- frontend/sw.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/sw.js b/frontend/sw.js index 90d6dd802..4bca0fe8a 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'spread-custom-toolbar'; + const CACHE_SUFIX = 'master'; let messaging; From 03d7e3857322db59e82ce0fb8fb2a67c3c94d680 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 18 Feb 2019 10:42:11 -0300 Subject: [PATCH 216/606] Create mobile design to survey --- frontend/styles/custom.css | 14 ++++++++------ frontend/survey/survey.css | 10 ++++++++++ frontend/survey/survey_details.html | 9 +++++++-- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index aa7e11f65..1f48f5dfd 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -696,12 +696,6 @@ a:active { border-radius: 50%; } -.survey-card{ - margin-top: -1px; - margin-left: 40px; - margin-right: 40px; -} - .sm-label { font-size: 0.9em; opacity: 0.75; @@ -866,6 +860,14 @@ md-radio-button.md-default-theme.md-checked .md-off, md-radio-button.md-checked .small-text { font-size: 15px; } + + .hyperlink { + color: #009688; + } + + .option { + margin: 0 12px; + } } @media only screen and (max-width: 450px) { diff --git a/frontend/survey/survey.css b/frontend/survey/survey.css index d39c0133b..fe4f801eb 100644 --- a/frontend/survey/survey.css +++ b/frontend/survey/survey.css @@ -38,6 +38,8 @@ .survey-card{ margin-top: -1px; + margin-left: 40px; + margin-right: 40px; } .survey-title-placeholder { @@ -65,6 +67,10 @@ grid-template-columns: auto 65px; } +.vote-btn { + display: grid; +} + @media screen and (max-width: 959px) { .survey-title-placeholder, { font-size: 0.84375em !important; @@ -193,6 +199,10 @@ .survey-title-placeholder, .survey-options { font-size: 0.75em !important; } + + .survey-card { + margin: 0; + } } @media screen and (max-width: 450px) { diff --git a/frontend/survey/survey_details.html b/frontend/survey/survey_details.html index c64e19e2d..71f60e6d7 100644 --- a/frontend/survey/survey_details.html +++ b/frontend/survey/survey_details.html @@ -13,7 +13,7 @@ + ng-class="surveyCtrl.votedOption(option) || option.selected ?'option-selected':''" class="option"> @@ -30,10 +30,15 @@ -
    +
    VOTAR
    +
    + + VOTAR + +
    From 90493171de46b2c31bb972637fbda8fd3c882ddd Mon Sep 17 00:00:00 2001 From: MaianaB Date: Mon, 18 Feb 2019 10:47:31 -0300 Subject: [PATCH 217/606] changed bottom toolbar --- frontend/utils/hideNavbar.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/frontend/utils/hideNavbar.js b/frontend/utils/hideNavbar.js index 268a0e96c..51db15e0a 100644 --- a/frontend/utils/hideNavbar.js +++ b/frontend/utils/hideNavbar.js @@ -23,10 +23,8 @@ scope.initialToolbarDisplayState = function initialToolbarDisplayState(){ const shouldHideBottomToolbar = !scope.isBottomToolbarAllowed() || STATES.INST_TIMELINE === $state.current.name; - console.log(shouldHideBottomToolbar, STATES.INST_TIMELINE === $state.current.name, STATES.INST_TIMELINE, $state.current.name); if (!scope.isStateAllowedTopMobile) scope.hideElement(scope.topTollbar); - else scope.topTollbar.display = 'block'; - if (shouldHideBottomToolbar) scope.hideElement(scope.bottomToolbar); + if (shouldHideBottomToolbar) scope.hideElement(scope.bottomToolbar) else scope.bottomToolbar.style.display = 'flex'; } @@ -84,11 +82,11 @@ } - /** Observer to state change and definy how initial state of toolbars + /** Observer to state change and definy how initial state of toolbar. * */ $transitions.onSuccess({ - to: () => {return true;} - }, () => { scope.initialToolbarDisplayState()}); + to: (state) => {return true;} + }, () => {scope.initialToolbarDisplayState()}); scope.isStateAllowedTopMobile = scope.isTopToolbarAllowed(); scope.isStateAllowedBottom = scope.isBottomToolbarAllowed(); From 530527eeb3c84a11c0b70a88d12fdbdfeb2f6180 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 18 Feb 2019 11:04:58 -0300 Subject: [PATCH 218/606] Hiding scroll in post page --- frontend/styles/custom.css | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index aa7e11f65..818dd3e4f 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -1156,6 +1156,7 @@ md-input-container:not(.md-input-invalid).md-input-has-value .inputEmail { #post-page-container { height: 100%; + overflow: hidden; } #post-content { From 360e334b46ed72fe681e08602e82c71a63d7517e Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 18 Feb 2019 11:19:45 -0300 Subject: [PATCH 219/606] Fix mobile post layout --- frontend/post/post_details.html | 4 ++-- frontend/post/timeline.html | 2 +- frontend/styles/custom.css | 27 +++++++++++++++++++-------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/frontend/post/post_details.html b/frontend/post/post_details.html index 251de6917..25a72cf5b 100644 --- a/frontend/post/post_details.html +++ b/frontend/post/post_details.html @@ -6,9 +6,9 @@
    + ng-hide="postDetailsCtrl.isHidden() || postDetailsCtrl.isPostEmpty()" style="margin: 8px 0;"> -
    +
    ENQUETE FINALIZADA | {{postDetailsCtrl.post.deadline | amUtc | amLocal | amCalendar:referenceTime:formats}}
    INSTITUIÇÃO DESATIVADA
    diff --git a/frontend/post/timeline.html b/frontend/post/timeline.html index e579e55bc..a41b04414 100644 --- a/frontend/post/timeline.html +++ b/frontend/post/timeline.html @@ -11,7 +11,7 @@

    Esta instituição ainda não possui publicações.

    refresh
    -
    +
    diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index 1f48f5dfd..3bc605fe5 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -716,10 +716,10 @@ a:active { margin-right: -16px; text-align: center; width: 78px; - height: 20px; + height: 17px; color: #616161; padding-top: 16px; - padding-bottom: 16px; + padding-bottom: 15px; } .percentage-selected{ @@ -856,6 +856,12 @@ md-radio-button.md-default-theme.md-checked .md-off, md-radio-button.md-checked border: 2px solid; } +.expired-survey { + background-color: rgba(190, 186, 186, 0.966); + text-align: center; + font-size: 15px; +} + @media only screen and (max-width: 600px) { .small-text { font-size: 15px; @@ -868,6 +874,17 @@ md-radio-button.md-default-theme.md-checked .md-off, md-radio-button.md-checked .option { margin: 0 12px; } + + .post-details-container { + display: block; + width: 100%; + overflow: hidden; + } + + .expired-survey { + font-size: 13px; + padding: 4px 0; + } } @media only screen and (max-width: 450px) { @@ -931,12 +948,6 @@ md-input-container:not(.md-input-invalid).md-input-has-value .inputEmail { border-width: 0 0 2px; } -.expired-survey { - background-color: rgba(190, 186, 186, 0.966); - text-align: center; - font-size: 15px; -} - .shared-survey{ padding-top :0px; margin-top : -25px; From 10605515313eeb929948244eee2b0a2e9bf4f777 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 18 Feb 2019 11:32:27 -0300 Subject: [PATCH 220/606] General fixes --- frontend/event/eventDetailsDirective.js | 4 +--- frontend/post/postDetailsDirective.js | 10 +++++++++- frontend/post/post_details.html | 2 +- frontend/test/specs/post/postDetailsControllerSpec.js | 10 ++++++++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index 20fa56825..fa8cdfbf8 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -172,7 +172,7 @@ { title: 'Receber atualizações', icon: 'visibility', action: () => { eventCtrl.addFollower() }, hide: () => eventCtrl.isFollower() }, { title: 'Não receber atualizações', icon: 'visibility_off', action: () => { eventCtrl.removeFollower() }, hide: () => !eventCtrl.isFollower() || eventCtrl.isEventAuthor() }, - { title: 'Cancelar evento', icon: 'cancel', action: () => { eventDetailsCtrl.confirmDeleteEvent('$event') }, hide: () => !eventCtrl.canChange() } + { title: 'Cancelar evento', icon: 'cancel', action: () => { eventCtrl.confirmDeleteEvent('$event') }, hide: () => !eventCtrl.canChange() } ] }; @@ -213,8 +213,6 @@ function loadEvent(eventKey) { return EventService.getEvent(eventKey).then(function success(response) { eventCtrl.event = new Event(response); - console.log(response); - console.log(eventCtrl.user.key); }, function error(response) { MessageService.showToast(response); $state.go(STATES.HOME); diff --git a/frontend/post/postDetailsDirective.js b/frontend/post/postDetailsDirective.js index 387427c50..aae0f96bd 100644 --- a/frontend/post/postDetailsDirective.js +++ b/frontend/post/postDetailsDirective.js @@ -4,7 +4,8 @@ var app = angular.module('app'); app.controller('PostDetailsController', function(PostService, AuthService, CommentService, $state, - $mdDialog, MessageService, ngClipboard, ProfileService, $rootScope, POST_EVENTS, STATES, EventService) { + $mdDialog, MessageService, ngClipboard, ProfileService, $rootScope, + POST_EVENTS, STATES, EventService, SCREEN_SIZES) { var postDetailsCtrl = this; @@ -550,6 +551,13 @@ return {background: color}; }; + /** + * Checks if the application is being used by a mobile device. + */ + postDetailsCtrl.isMobileScreen = () => { + return Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE); + }; + function adjustText(text){ return (!postDetailsCtrl.isPostPage && text) ? Utils.limitString(text, LIMIT_POST_CHARACTERS) : text; diff --git a/frontend/post/post_details.html b/frontend/post/post_details.html index 540204248..a3a6273a4 100644 --- a/frontend/post/post_details.html +++ b/frontend/post/post_details.html @@ -41,7 +41,7 @@ - + more_vert diff --git a/frontend/test/specs/post/postDetailsControllerSpec.js b/frontend/test/specs/post/postDetailsControllerSpec.js index 058ac398a..f4255a8c3 100644 --- a/frontend/test/specs/post/postDetailsControllerSpec.js +++ b/frontend/test/specs/post/postDetailsControllerSpec.js @@ -684,4 +684,14 @@ expect(postDetailsCtrl.isFollowingEvent()).toEqual(false); }); }); + + describe('isMobileScreen()', () => { + it('should call Utils.isMobileScreen', () => { + spyOn(Utils, 'isMobileScreen'); + + postDetailsCtrl.isMobileScreen(); + + expect(Utils.isMobileScreen).toHaveBeenCalled(); + }); + }); })); \ No newline at end of file From 5f657aa917850a5491ec616e030ffda2a8f184ef Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 18 Feb 2019 11:34:05 -0300 Subject: [PATCH 221/606] Remove md-colors --- frontend/post/post_details.html | 2 +- frontend/styles/custom.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/post/post_details.html b/frontend/post/post_details.html index 25a72cf5b..4abc8fa46 100644 --- a/frontend/post/post_details.html +++ b/frontend/post/post_details.html @@ -8,7 +8,7 @@ -
    +
    ENQUETE FINALIZADA | {{postDetailsCtrl.post.deadline | amUtc | amLocal | amCalendar:referenceTime:formats}}
    INSTITUIÇÃO DESATIVADA
    diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index 3bc605fe5..9483a93d8 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -884,6 +884,7 @@ md-radio-button.md-default-theme.md-checked .md-off, md-radio-button.md-checked .expired-survey { font-size: 13px; padding: 4px 0; + background-color: rgb(0, 150, 136) } } From 417e9073617665ee0e0eeff640e0eb890d3a8fe2 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 18 Feb 2019 11:56:14 -0300 Subject: [PATCH 222/606] Create verification if is mobile screen in home controller --- frontend/home/home.html | 3 ++- frontend/home/homeController.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/home/home.html b/frontend/home/home.html index 7118b3fbb..ee6872c51 100644 --- a/frontend/home/home.html +++ b/frontend/home/home.html @@ -10,7 +10,8 @@
    - +
    diff --git a/frontend/home/homeController.js b/frontend/home/homeController.js index 8390154ed..f2fb32f58 100644 --- a/frontend/home/homeController.js +++ b/frontend/home/homeController.js @@ -79,6 +79,10 @@ }); }; + homeCtrl.isMobileScreen = function isMobileScreen() { + return Utils.isMobileScreen(600); + }; + function getFollowingInstitutions() { homeCtrl.followingInstitutions = homeCtrl.user.follows; } From c6680e3d8673961d30aa7f21fcda90313ad069c7 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 18 Feb 2019 11:59:46 -0300 Subject: [PATCH 223/606] Fix post margin in desktop screens --- frontend/post/post_details.html | 2 +- frontend/styles/custom.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/post/post_details.html b/frontend/post/post_details.html index 4abc8fa46..02290b31f 100644 --- a/frontend/post/post_details.html +++ b/frontend/post/post_details.html @@ -6,7 +6,7 @@
    + ng-hide="postDetailsCtrl.isHidden() || postDetailsCtrl.isPostEmpty()" id="post-container">
    ENQUETE FINALIZADA | {{postDetailsCtrl.post.deadline | amUtc | amLocal | amCalendar:referenceTime:formats}} diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index 9483a93d8..90c6cf5b2 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -886,6 +886,10 @@ md-radio-button.md-default-theme.md-checked .md-off, md-radio-button.md-checked padding: 4px 0; background-color: rgb(0, 150, 136) } + + #post-container { + margin: 8px 0; + } } @media only screen and (max-width: 450px) { From e9f4733e9cad018133816343c71b79a1ede372ae Mon Sep 17 00:00:00 2001 From: MaianaB Date: Mon, 18 Feb 2019 12:22:31 -0300 Subject: [PATCH 224/606] fix tests --- frontend/toolbar/main_toolbar_mobile.html | 2 +- frontend/utils/hideNavbar.js | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/frontend/toolbar/main_toolbar_mobile.html b/frontend/toolbar/main_toolbar_mobile.html index 71744e11a..73b05debe 100644 --- a/frontend/toolbar/main_toolbar_mobile.html +++ b/frontend/toolbar/main_toolbar_mobile.html @@ -1,4 +1,4 @@ -
    diff --git a/frontend/utils/hideNavbar.js b/frontend/utils/hideNavbar.js index 51db15e0a..33dfafc71 100644 --- a/frontend/utils/hideNavbar.js +++ b/frontend/utils/hideNavbar.js @@ -21,11 +21,15 @@ /** Definy initial style of toolbars according the current state. */ scope.initialToolbarDisplayState = function initialToolbarDisplayState(){ - const shouldHideBottomToolbar = !scope.isBottomToolbarAllowed() || - STATES.INST_TIMELINE === $state.current.name; - if (!scope.isStateAllowedTopMobile) scope.hideElement(scope.topTollbar); - if (shouldHideBottomToolbar) scope.hideElement(scope.bottomToolbar) - else scope.bottomToolbar.style.display = 'flex'; + if(Utils.isMobileScreen(450)){ + const shouldHideBottomToolbar = !scope.isBottomToolbarAllowed() || + STATES.INST_TIMELINE === $state.current.name; + if (!scope.isStateAllowedTopMobile) scope.hideElement(scope.topTollbar); + if (shouldHideBottomToolbar) scope.hideElement(scope.bottomToolbar) + else{ + if(scope.bottomToolbar)scope.bottomToolbar.style.display = 'flex'; + } + } } /** Verify if current states is allowed to show top toolbar. @@ -85,7 +89,7 @@ /** Observer to state change and definy how initial state of toolbar. * */ $transitions.onSuccess({ - to: (state) => {return true;} + to: () => {return true;} }, () => {scope.initialToolbarDisplayState()}); scope.isStateAllowedTopMobile = scope.isTopToolbarAllowed(); From 91cfbd8bd2e80c36cbe1631479b5b6927398ce52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 18 Feb 2019 13:16:22 -0300 Subject: [PATCH 225/606] Add generic dialog component --- frontend/index.html | 4 +++ .../generic-dialog/gen-dialog.component.js | 31 +++++++++++++++++++ frontend/utils/generic-dialog/gen-dialog.css | 31 +++++++++++++++++++ frontend/utils/generic-dialog/gen-dialog.html | 16 ++++++++++ 4 files changed, 82 insertions(+) create mode 100644 frontend/utils/generic-dialog/gen-dialog.component.js create mode 100644 frontend/utils/generic-dialog/gen-dialog.css create mode 100644 frontend/utils/generic-dialog/gen-dialog.html diff --git a/frontend/index.html b/frontend/index.html index a0e0b050c..af3fa96b5 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -69,6 +69,7 @@ + @@ -286,5 +287,8 @@ + + + diff --git a/frontend/utils/generic-dialog/gen-dialog.component.js b/frontend/utils/generic-dialog/gen-dialog.component.js new file mode 100644 index 000000000..b8ead2673 --- /dev/null +++ b/frontend/utils/generic-dialog/gen-dialog.component.js @@ -0,0 +1,31 @@ +(function () { + 'use strict'; + + angular.module("app").component("genDialog", { + templateUrl: "app/utils/generic-dialog/gen-dialog.html", + controller: [ + '$mdDialog', + dialogController, + ], + controllerAs: "dialogCtrl", + bindings: { + title: "@", + subtitle: "@", + confirmAction: "<", + }, + transclude: true, + }); + + function dialogController($mdDialog) { + const dialogCtrl = this; + + dialogCtrl.$onInit = () => { + _.defaults(dialogCtrl, { + confirmAction: () => {}, + }); + }; + + dialogCtrl.cancelDialog = $mdDialog.cancel; + } + +})(); \ No newline at end of file diff --git a/frontend/utils/generic-dialog/gen-dialog.css b/frontend/utils/generic-dialog/gen-dialog.css new file mode 100644 index 000000000..7b40c4b71 --- /dev/null +++ b/frontend/utils/generic-dialog/gen-dialog.css @@ -0,0 +1,31 @@ +.dialog__container { + display: grid; + grid-template-areas: + "title" + "subtitle" + "content" + "buttons"; + padding: 2.5em 2em; +} + +.dialog__title { + grid-area: title; + display: flex; + text-align: center; + margin: 1em 0; +} + +.dialog__subtitle { + grid-area: subtitle; +} + +.dialog__content { + grid-area: content; +} + +.dialog__buttons { + grid-area: buttons; + display: flex; + flex-direction: row; + justify-content: flex-end; +} \ No newline at end of file diff --git a/frontend/utils/generic-dialog/gen-dialog.html b/frontend/utils/generic-dialog/gen-dialog.html new file mode 100644 index 000000000..b21d89900 --- /dev/null +++ b/frontend/utils/generic-dialog/gen-dialog.html @@ -0,0 +1,16 @@ + + + {{ dialogCtrl.title }} + {{ dialogCtrl.subtitle }} + + + +
    + + Cancelar + + + Confirmar + +
    +     \ No newline at end of file From 900a4230586b46c9231ed2dba96590c1275474de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 18 Feb 2019 13:24:34 -0300 Subject: [PATCH 226/606] Add generical dialog jsdoc --- .../utils/generic-dialog/gen-dialog.component.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/frontend/utils/generic-dialog/gen-dialog.component.js b/frontend/utils/generic-dialog/gen-dialog.component.js index b8ead2673..9aa3b5b1c 100644 --- a/frontend/utils/generic-dialog/gen-dialog.component.js +++ b/frontend/utils/generic-dialog/gen-dialog.component.js @@ -1,6 +1,20 @@ (function () { 'use strict'; + /** + * An generical dialog component that has a title, a subtitle, a cancel button + * and a confirm button. It receives as a binding the title, the subtitle and + * the confirm action. + * @class genDialog + * @example + * + * + *

    The dialog content

    + *

    It could be any HTML

    + * Including a component + *     + *     + */ angular.module("app").component("genDialog", { templateUrl: "app/utils/generic-dialog/gen-dialog.html", controller: [ From f70cc68122e276b937ed1139bd6e67db09f77c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 18 Feb 2019 14:23:42 -0300 Subject: [PATCH 227/606] Fix generic dialog component css --- frontend/utils/generic-dialog/gen-dialog.css | 11 +++++++---- frontend/utils/generic-dialog/gen-dialog.html | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/frontend/utils/generic-dialog/gen-dialog.css b/frontend/utils/generic-dialog/gen-dialog.css index 7b40c4b71..491362a50 100644 --- a/frontend/utils/generic-dialog/gen-dialog.css +++ b/frontend/utils/generic-dialog/gen-dialog.css @@ -5,18 +5,17 @@ "subtitle" "content" "buttons"; - padding: 2.5em 2em; + padding: 1.5em 2em 0; } .dialog__title { grid-area: title; - display: flex; - text-align: center; - margin: 1em 0; + margin: 0; } .dialog__subtitle { grid-area: subtitle; + padding: 0.5em 0; } .dialog__content { @@ -28,4 +27,8 @@ display: flex; flex-direction: row; justify-content: flex-end; +} + +.dialog__button { + margin: 1em 0; } \ No newline at end of file diff --git a/frontend/utils/generic-dialog/gen-dialog.html b/frontend/utils/generic-dialog/gen-dialog.html index b21d89900..1ffa6514e 100644 --- a/frontend/utils/generic-dialog/gen-dialog.html +++ b/frontend/utils/generic-dialog/gen-dialog.html @@ -6,10 +6,10 @@
    - + Cancelar - + Confirmar
    From dd04ef3fccb2b3103058cf06ecf3a0d2f08d381c Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 18 Feb 2019 14:30:57 -0300 Subject: [PATCH 228/606] Hide scrollbar on notification page --- frontend/home/home.html | 3 +-- frontend/home/homeController.js | 4 ---- frontend/notification/notifications_list_mobile.html | 4 ++-- frontend/notification/notifications_page.html | 3 ++- frontend/styles/custom.css | 4 ++++ 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/home/home.html b/frontend/home/home.html index ee6872c51..5c8504eb0 100644 --- a/frontend/home/home.html +++ b/frontend/home/home.html @@ -10,8 +10,7 @@
    - +
    diff --git a/frontend/home/homeController.js b/frontend/home/homeController.js index f2fb32f58..8390154ed 100644 --- a/frontend/home/homeController.js +++ b/frontend/home/homeController.js @@ -79,10 +79,6 @@ }); }; - homeCtrl.isMobileScreen = function isMobileScreen() { - return Utils.isMobileScreen(600); - }; - function getFollowingInstitutions() { homeCtrl.followingInstitutions = homeCtrl.user.follows; } diff --git a/frontend/notification/notifications_list_mobile.html b/frontend/notification/notifications_list_mobile.html index 8d24dc7b2..0cf64b0a8 100644 --- a/frontend/notification/notifications_list_mobile.html +++ b/frontend/notification/notifications_list_mobile.html @@ -1,4 +1,4 @@ - +
    @@ -26,4 +26,4 @@
    - \ No newline at end of file +
    \ No newline at end of file diff --git a/frontend/notification/notifications_page.html b/frontend/notification/notifications_page.html index e450321c6..3d425d4e4 100644 --- a/frontend/notification/notifications_page.html +++ b/frontend/notification/notifications_page.html @@ -28,7 +28,8 @@

    -
    +
    +
    \ No newline at end of file diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index 90c6cf5b2..3213968ea 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -890,6 +890,10 @@ md-radio-button.md-default-theme.md-checked .md-off, md-radio-button.md-checked #post-container { margin: 8px 0; } + + .hide-scrollbar-mobile::-webkit-scrollbar { + display: none; + } } @media only screen and (max-width: 450px) { From 1bc01bcd179e346931d7c616662e450fe6985ac9 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 18 Feb 2019 14:38:38 -0300 Subject: [PATCH 229/606] Extracting style to css' file --- .../specs/event/eventDetailsControllerSpec.js | 2 +- frontend/toolbar/default_toolbar_mobile.css | 16 ++++++++++++++++ frontend/toolbar/default_toolbar_mobile.html | 7 +++---- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/frontend/test/specs/event/eventDetailsControllerSpec.js b/frontend/test/specs/event/eventDetailsControllerSpec.js index 17a9cfe62..59e6f5bbf 100644 --- a/frontend/test/specs/event/eventDetailsControllerSpec.js +++ b/frontend/test/specs/event/eventDetailsControllerSpec.js @@ -169,7 +169,7 @@ var startTime = new Date('2018-01-13'); var endTime = new Date('2018-02-13'); - event.sta9rt_time = startTime; + event.start_time = startTime; event.end_time = endTime; eventCtrl.event = event; var result = eventCtrl.endInTheSameDay(); diff --git a/frontend/toolbar/default_toolbar_mobile.css b/frontend/toolbar/default_toolbar_mobile.css index d54d77a7e..21f7a0c3c 100644 --- a/frontend/toolbar/default_toolbar_mobile.css +++ b/frontend/toolbar/default_toolbar_mobile.css @@ -3,4 +3,20 @@ grid-template-columns: 50% 50%; grid-template-rows: 100%; width: 100%; +} + +.toolbar-back-button { + justify-self: start; + grid-column-start: 1; + grid-column-end: 2; +} + +.toolbar-back-button md-icon { + font-size: 2.5em; +} + +.default-toolbar-menu-container { + justify-self: end; + grid-column-start: 2; + grid-column-end: 3; } \ No newline at end of file diff --git a/frontend/toolbar/default_toolbar_mobile.html b/frontend/toolbar/default_toolbar_mobile.html index 04302b0b7..21729e553 100644 --- a/frontend/toolbar/default_toolbar_mobile.html +++ b/frontend/toolbar/default_toolbar_mobile.html @@ -1,11 +1,10 @@
    - - keyboard_arrow_left + + keyboard_arrow_left -
    +
    more_vert From 48d681a866fd729d067dd64a3c6f0fc58384f639 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 18 Feb 2019 14:44:09 -0300 Subject: [PATCH 230/606] hide scrollbar off regitstred instituions page and events page --- frontend/event/events_mobile.html | 4 ++-- frontend/institution/registered_institutions_mobile.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index 4f85a614d..8c98fdea2 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -1,6 +1,6 @@ -
    +
    @@ -8,7 +8,7 @@ text="Nenhum evento a ser exibido">
    - +
    diff --git a/frontend/institution/registered_institutions_mobile.html b/frontend/institution/registered_institutions_mobile.html index 064678e27..52c5e41ba 100644 --- a/frontend/institution/registered_institutions_mobile.html +++ b/frontend/institution/registered_institutions_mobile.html @@ -1,6 +1,6 @@ -
    +
    TODAS From 50f4598a5a96445087b5d25b099df6f9dbaf268e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 18 Feb 2019 14:47:54 -0300 Subject: [PATCH 231/606] Add pdf dialog on mobile --- frontend/pdfUpload/pdfService.js | 6 ++++++ frontend/post/pdfDialogMobile.html | 7 +++++++ frontend/post/pdfViewDirective.js | 11 +++++++++-- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 frontend/post/pdfDialogMobile.html diff --git a/frontend/pdfUpload/pdfService.js b/frontend/pdfUpload/pdfService.js index d648b0f34..a5236351d 100644 --- a/frontend/pdfUpload/pdfService.js +++ b/frontend/pdfUpload/pdfService.js @@ -79,6 +79,12 @@ return deferred.promise; }; + service.download = function download (url) { + var link = document.createElement('a'); + link.href = url; + link.click(); + }; + function isValidPdf(file) { if(file) { var correctType = file.type === PDF_TYPE; diff --git a/frontend/post/pdfDialogMobile.html b/frontend/post/pdfDialogMobile.html new file mode 100644 index 000000000..3bb012855 --- /dev/null +++ b/frontend/post/pdfDialogMobile.html @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/frontend/post/pdfViewDirective.js b/frontend/post/pdfViewDirective.js index 54e31169a..7169e17dc 100644 --- a/frontend/post/pdfViewDirective.js +++ b/frontend/post/pdfViewDirective.js @@ -14,7 +14,10 @@ pdfCtrl.pdfDialog = function(ev, pdf) { if(!pdfCtrl.isEditing) { $mdDialog.show({ - templateUrl: 'app/post/pdfDialog.html', + templateUrl: Utils.selectFieldBasedOnScreenSize( + 'app/post/pdfDialog.html', + 'app/post/pdfDialogMobile.html', + ), targetEvent: ev, clickOutsideToClose:true, locals: { @@ -61,8 +64,12 @@ }); } + ctrl.downloadPdf = () => { + PdfService.download(pdf.url); + }; + (function main() { - readPdf(); + if (!Utils.isMobileScreen()) readPdf(); })(); } }); From 908be069a8d5cb061f8ba0c018f64aa0820bc179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 18 Feb 2019 15:04:10 -0300 Subject: [PATCH 232/606] Add which pdf will be downloaded --- frontend/post/pdfDialogMobile.html | 10 ++++++++++ frontend/post/pdfViewDirective.js | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/frontend/post/pdfDialogMobile.html b/frontend/post/pdfDialogMobile.html index 3bb012855..dd2df476e 100644 --- a/frontend/post/pdfDialogMobile.html +++ b/frontend/post/pdfDialogMobile.html @@ -3,5 +3,15 @@ title="Download de PDF" subtitle="Você deseja baixar esse PDF?" confirm-action="ctrl.downloadPdf"> +
    +
    + + picture_as_pdf + +
    +
    +

    {{ctrl.pdf.name}}

    +
    +
    \ No newline at end of file diff --git a/frontend/post/pdfViewDirective.js b/frontend/post/pdfViewDirective.js index 7169e17dc..eaeaf7f4b 100644 --- a/frontend/post/pdfViewDirective.js +++ b/frontend/post/pdfViewDirective.js @@ -54,6 +54,7 @@ var ctrl = this; ctrl.pdfUrl = ""; ctrl.isLoadingPdf = true; + ctrl.pdf = pdf; function readPdf() { var readablePdf = {}; @@ -65,7 +66,7 @@ } ctrl.downloadPdf = () => { - PdfService.download(pdf.url); + PdfService.download(ctrl.pdf.url); }; (function main() { From 27bcbc34b607baaadb9b1385fb4866c3e33bb730 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 18 Feb 2019 15:12:14 -0300 Subject: [PATCH 233/606] general setup --- frontend/index.html | 2 ++ frontend/search/search_mobile.html | 7 +------ frontend/toolbar/whiteToolbar.component.js | 22 ++++++++++++++++++++++ frontend/toolbar/white_toolbar_mobile.css | 11 +++++++++++ frontend/toolbar/white_toolbar_mobile.html | 9 +++++++++ 5 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 frontend/toolbar/whiteToolbar.component.js create mode 100644 frontend/toolbar/white_toolbar_mobile.css create mode 100644 frontend/toolbar/white_toolbar_mobile.html diff --git a/frontend/index.html b/frontend/index.html index 05af1d1b1..a1f0652c7 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -72,6 +72,7 @@ + @@ -293,5 +294,6 @@ + diff --git a/frontend/search/search_mobile.html b/frontend/search/search_mobile.html index c85412840..a1055683a 100644 --- a/frontend/search/search_mobile.html +++ b/frontend/search/search_mobile.html @@ -1,10 +1,5 @@ -
    - - clear - - PESQUISAR -
    +
    diff --git a/frontend/toolbar/whiteToolbar.component.js b/frontend/toolbar/whiteToolbar.component.js new file mode 100644 index 000000000..f7a1f27a6 --- /dev/null +++ b/frontend/toolbar/whiteToolbar.component.js @@ -0,0 +1,22 @@ +'use strict'; + +(function () { + const app = angular.module("app"); + + app.component('whiteToolbar', { + templateUrl: 'app/toolbar/white_toolbar_mobile.html', + controller: ['$window', WhiteToolbarController], + controllerAs: 'whiteToolbarCtrl', + bindings: { + title: '@' + } + }); + + function WhiteToolbarController($window) { + const whiteToolbarCtrl = this; + + whiteToolbarCtrl.goBack = () => { + return $window.history.back(); + }; + } +})(); \ No newline at end of file diff --git a/frontend/toolbar/white_toolbar_mobile.css b/frontend/toolbar/white_toolbar_mobile.css new file mode 100644 index 000000000..904f4f2ce --- /dev/null +++ b/frontend/toolbar/white_toolbar_mobile.css @@ -0,0 +1,11 @@ +.white-toolbar-mobile { + background-color: white; + box-shadow: 0px 3px 6px grey; + height: 60px; + width: 100%; + font-size: 20px; + z-index: 2; + display: grid; + grid-template-rows: auto; + grid-template-columns: 30% 50% auto; +} \ No newline at end of file diff --git a/frontend/toolbar/white_toolbar_mobile.html b/frontend/toolbar/white_toolbar_mobile.html new file mode 100644 index 000000000..71febed9b --- /dev/null +++ b/frontend/toolbar/white_toolbar_mobile.html @@ -0,0 +1,9 @@ +
    + + keyboard_arrow_left + +
    + {{whiteToolbarCtrl.title}} +
    +
    \ No newline at end of file From 8bcf73842f20d25224a2192d91b2de69c2cfd4bd Mon Sep 17 00:00:00 2001 From: MaianaB Date: Mon, 18 Feb 2019 16:52:30 -0300 Subject: [PATCH 234/606] create test --- frontend/app.js | 5 +- frontend/index.html | 1 + .../descriptionInst/descriptionController.js | 27 +------ .../editDescriptionController.js | 27 +++++++ frontend/institution/institutionController.js | 3 +- .../editDescriptionControllerSpec.js | 79 +++++++++++++++++++ frontend/utils/hideNavbar.js | 29 +++++-- 7 files changed, 134 insertions(+), 37 deletions(-) create mode 100644 frontend/institution/descriptionInst/editDescriptionController.js create mode 100644 frontend/test/specs/institution/editDescriptionControllerSpec.js diff --git a/frontend/app.js b/frontend/app.js index 676e0a1af..0c60df219 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -527,7 +527,8 @@ */ app.run(function mobileInterceptor($transitions, $state, STATES, SCREEN_SIZES) { const permitted_routes = [ - STATES.CREATE_EVENT + STATES.CREATE_EVENT, + STATES.INST_DESCRIPTION ]; $transitions.onStart({ @@ -611,6 +612,6 @@ } (function main() { - //initServiceWorker(); + initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html index fc67b831d..f0560915b 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -234,6 +234,7 @@ + diff --git a/frontend/institution/descriptionInst/descriptionController.js b/frontend/institution/descriptionInst/descriptionController.js index ac7cf0c6a..a95c59919 100644 --- a/frontend/institution/descriptionInst/descriptionController.js +++ b/frontend/institution/descriptionInst/descriptionController.js @@ -1,30 +1,6 @@ (function(){ - var app = angular.module('app'); + const app = angular.module('app'); - app.controller("EditDescriptionController", function EditDescriptionController(institution, institutionKey, InstitutionService, - ObserverRecorderService, $rootScope, $mdDialog){ - const descriptionCtrl = this; - let observer; - - descriptionCtrl.$onInit = () => { - descriptionCtrl.institution = institution; - descriptionCtrl.currentInstitutionKey = institutionKey; - observer = ObserverRecorderService.register(descriptionCtrl.institution); - }; - - /** Save changes of institution and emit event. - */ - descriptionCtrl.save = () => { - var patch = ObserverRecorderService.generate(observer); - InstitutionService.update(descriptionCtrl.currentInstitutionKey, patch).then( - function success() { - $rootScope.$emit('EDIT_DESCRIPTION_INST'); - $mdDialog.hide(); - } - ); - } - }); - app.controller("DescriptionInstController", function DescriptionInstController($state, InstitutionService, $rootScope){ const descriptionCtrl = this; descriptionCtrl.isLoading = false; @@ -34,7 +10,6 @@ InstitutionService.getInstitution($state.params.institutionKey).then(function(institution){ descriptionCtrl.institution = institution; descriptionCtrl.isLoading = false; - }) }; diff --git a/frontend/institution/descriptionInst/editDescriptionController.js b/frontend/institution/descriptionInst/editDescriptionController.js new file mode 100644 index 000000000..6cd8a561e --- /dev/null +++ b/frontend/institution/descriptionInst/editDescriptionController.js @@ -0,0 +1,27 @@ +(function(){ + const app = angular.module('app'); + + app.controller("EditDescriptionController", function EditDescriptionController(institution, InstitutionService, + ObserverRecorderService, $rootScope, $mdDialog){ + const descriptionCtrl = this; + let observer; + + descriptionCtrl.$onInit = () => { + descriptionCtrl.institution = institution; + observer = ObserverRecorderService.register(descriptionCtrl.institution); + }; + + /** Save changes of institution and emit event. + */ + descriptionCtrl.save = () => { + const patch = ObserverRecorderService.generate(observer); + InstitutionService.update(descriptionCtrl.institution.key, patch).then( + function success() { + console.log("-------------------------") + $rootScope.$emit('EDIT_DESCRIPTION_INST'); + $mdDialog.hide(); + } + ); + } + }); +})(); \ No newline at end of file diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index 497e2f26d..c9744c199 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -275,8 +275,7 @@ targetEvent: ev, clickOutsideToClose:true, locals: { - institution: institutionCtrl.institution, - institutionKey: currentInstitutionKey + institution: institutionCtrl.institution }, controller: 'EditDescriptionController', controllerAs: 'descriptionCtrl' diff --git a/frontend/test/specs/institution/editDescriptionControllerSpec.js b/frontend/test/specs/institution/editDescriptionControllerSpec.js new file mode 100644 index 000000000..ccf631000 --- /dev/null +++ b/frontend/test/specs/institution/editDescriptionControllerSpec.js @@ -0,0 +1,79 @@ +'use strict'; + +describe('Test Edit Description Institution', function() { + beforeEach(module('app')); + + var data, institution, editDescriptionCtrl, httpBackend, + observerRecorderService, scope, state, mdDialog, institutionService; + + var user = new User({ + institutions: [], + follows: [] + }); + + const fakeCallback = function(){ + const fakeResponse = callback => callback(); + return { + then: fakeResponse, + catch: fakeResponse, + finally: fakeResponse + }; + }; + + beforeEach(inject(function($controller, $httpBackend, $rootScope, $state, AuthService, + ObserverRecorderService, $mdDialog, InstitutionService) { + httpBackend = $httpBackend; + scope = $rootScope.$new(); + state = $state; + mdDialog = $mdDialog; + institutionService = InstitutionService; + observerRecorderService = ObserverRecorderService; + + AuthService.login(user); + + institution = { + name: 'InstName', + address: { + street: 'StreetName', + number: 1, + neighbourhood: 'NeighbourhoddName', + city: 'CityName', + federal_state: 'FederalStateName', + country: 'Brasil' + }, + state: 'active', + leader: 'LeaderName', + legal_nature: 'Public', + actuation_area: 'Laboratory', + description: 'institutionDescription', + sent_invitations: [], + parent_institution: null, + children_institutions: [], + key: 'instKey' + }; + + institution = new Institution(data); + + state.params.institution = institution; + editDescriptionCtrl = $controller('EditDescriptionController',{ + scope: scope, + institutionService: institutionService, + institution: institution + }); + editDescriptionCtrl.$onInit(); + })); + + describe('save()', function () { + beforeEach(function() { + spyOn(institutionService, 'update').and.callFake(fakeCallback); + spyOn(mdDialog, 'hide').and.callThrough(); + }); + + it('should update and call functions', function () { + editDescriptionCtrl.institution.description = "edit description"; + editDescriptionCtrl.save(); + expect(institutionService.update).toHaveBeenCalled(); + expect(mdDialog.hide).toHaveBeenCalled(); + }); + }); +}); \ No newline at end of file diff --git a/frontend/utils/hideNavbar.js b/frontend/utils/hideNavbar.js index 33dfafc71..fc7bc412a 100644 --- a/frontend/utils/hideNavbar.js +++ b/frontend/utils/hideNavbar.js @@ -14,9 +14,20 @@ STATES.INST_MEMBERS, STATES.INST_REGISTRATION_DATA, STATES.INST_LINKS, STATES.INST_DESCRIPTION, STATES.CONFIG_PROFILE ]; + + scope.STATES_WITHOUT_TOP_TOOLBAR = scope.INSTITUTION_STATES; + scope.STATES_WITHOUT_BOTTOM_TOOLBAR = [ STATES.CREATE_EVENT ]; + + scope.STATES_DINAMICALLY_BOTTOM = [ + STATES.INST_TIMELINE + ]; + + scope.STATES_DINAMICALLY_TOP = [ + STATES.HOME + ]; /** Definy initial style of toolbars according the current state. */ @@ -35,15 +46,13 @@ /** Verify if current states is allowed to show top toolbar. */ scope.isTopToolbarAllowed = function isTopToolbarAllowed() { - let statesNotAllowed = [STATES.CREATE_EVENT]; - statesNotAllowed = statesNotAllowed.concat(scope.INSTITUTION_STATES); - return !statesNotAllowed.includes($state.current.name); + return !inStateArray(scope.STATES_WITHOUT_TOP_TOOLBAR); } /** Verify if current states is allowed to show bottom toolbar. */ scope.isBottomToolbarAllowed = function isBottomToolbarAllowed() { - return !scope.STATES_WITHOUT_BOTTOM_TOOLBAR.includes($state.current.name); + return !inStateArray(scope.STATES_WITHOUT_BOTTOM_TOOLBAR); } /** Set property CSS to hide element. @@ -65,8 +74,8 @@ const content = element[0]; const limitScrol = 30; - const hideTopDynamically = hideTop && scope.isStateAllowedTopMobile; - const hideBottomDynamically = hideBottom && scope.isStateAllowedBottom; + const hideTopDynamically = hideTop && inStateArray(scope.STATES_DINAMICALLY_TOP); + const hideBottomDynamically = hideBottom && inStateArray(scope.STATES_DINAMICALLY_BOTTOM); content.addEventListener('scroll', function() { const screenPosition = content.scrollTop; @@ -86,7 +95,13 @@ } - /** Observer to state change and definy how initial state of toolbar. * + /** Verify array includes current state. + */ + function inStateArray(array){ + return array.includes($state.current.name) + } + + /** Observer to state change and definy how initial state of toolbar. */ $transitions.onSuccess({ to: () => {return true;} From 73319d5a128fc103f217b58b6301dac7fd2b8958 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Mon, 18 Feb 2019 17:17:30 -0300 Subject: [PATCH 235/606] init push notification permission slide --- .jshintrc | 3 +- frontend/app.js | 2 +- frontend/home/homeController.js | 5 +-- .../notification/pushNotificationService.js | 12 ++++-- frontend/sw.js | 2 +- .../configProfile/configProfileController.js | 42 ++++++++++++++++++- .../configProfile/config_profile_mobile.html | 3 ++ 7 files changed, 59 insertions(+), 10 deletions(-) diff --git a/.jshintrc b/.jshintrc index 1404a8ba8..eca7516f7 100644 --- a/.jshintrc +++ b/.jshintrc @@ -24,5 +24,6 @@ "jsonpatch", "CryptoJS", "firebase" - ] + ], + "esversion": 6 } \ No newline at end of file diff --git a/frontend/app.js b/frontend/app.js index 648877ddd..a2a21c669 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -599,6 +599,6 @@ } (function main() { - initServiceWorker(); + // initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/home/homeController.js b/frontend/home/homeController.js index d40f721e0..d87963006 100644 --- a/frontend/home/homeController.js +++ b/frontend/home/homeController.js @@ -4,9 +4,9 @@ var app = angular.module("app"); app.controller("HomeController", ['AuthService', '$mdDialog', '$state', 'EventService', 'ProfileService', '$rootScope', - 'PushNotificationService', 'POST_EVENTS', 'STATES', + 'POST_EVENTS', 'STATES', function HomeController(AuthService, $mdDialog, $state, EventService, ProfileService, $rootScope, - PushNotificationService, POST_EVENTS, STATES) { + POST_EVENTS, STATES) { var homeCtrl = this; var LIMITE_EVENTS = 5; @@ -127,7 +127,6 @@ loadEvents(); getFollowingInstitutions(); registerPostEvents(); - return PushNotificationService.requestNotificationPermission(homeCtrl.user); }; }]); })(); \ No newline at end of file diff --git a/frontend/notification/pushNotificationService.js b/frontend/notification/pushNotificationService.js index cbb7abcf3..24899109d 100644 --- a/frontend/notification/pushNotificationService.js +++ b/frontend/notification/pushNotificationService.js @@ -65,7 +65,7 @@ service.requestNotificationPermission = function requestNotificationPermission(user) { service.currentUser = user; const isOnMobile = service._isMobile.any(); - if (messaging && !service._hasNotificationPermission() && isOnMobile) { + if (messaging && !service.hasNotificationPermission() && isOnMobile) { return messaging.requestPermission().then(() => { return messaging.getToken().then(token => { service._saveToken(token); @@ -78,6 +78,13 @@ return $q.when(); }; + /** + * + */ + service.unsubscribeUserNotification = () => { + service._saveToken(''); + }; + /** * It receives a token, starts a reference to * firebase's database and save the token. @@ -126,9 +133,8 @@ /** * Check if the user has already conceded the permission * using Notification object. - * @private */ - service._hasNotificationPermission = function hasNotificationPermission() { + service.hasNotificationPermission = function hasNotificationPermission() { const { permission } = Notification; return permission === "granted"; }; diff --git a/frontend/sw.js b/frontend/sw.js index 4bca0fe8a..3a1cf4bf1 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'master'; + const CACHE_SUFIX = 'modify-request-notification-permission-flow'; let messaging; diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index ae8faa19d..fd61973a0 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -6,11 +6,12 @@ .controller("ConfigProfileController", [ '$state', 'STATES', '$stateParams', 'ProfileService', 'CropImageService', 'AuthService', '$q', 'UserService', 'ImageService', '$rootScope', 'SCREEN_SIZES', 'MessageService', '$mdDialog', 'ObserverRecorderService', + 'PushNotificationService', ConfigProfileController ]); function ConfigProfileController($state, STATES, $stateParams, ProfileService, CropImageService, AuthService, - $q, UserService, ImageService, $rootScope, SCREEN_SIZES, MessageService, $mdDialog, ObserverRecorderService) { + $q, UserService, ImageService, $rootScope, SCREEN_SIZES, MessageService, $mdDialog, ObserverRecorderService, PushNotificationService) { const configProfileCtrl = this; @@ -24,6 +25,7 @@ configProfileCtrl.$onInit = () => { configProfileCtrl._setupUser(); + setPushNotificationModel(); } configProfileCtrl._setupUser = () => { @@ -188,5 +190,43 @@ }); return promise; } + + configProfileCtrl.pushChange = () => { + configProfileCtrl.pushNotification && subscribeUser(); + + !configProfileCtrl.pushNotification && unsubscribeUser(); + }; + + function setPushNotificationModel() { + configProfileCtrl.pushNotification = angular.copy(PushNotificationService.hasNotificationPermission()); + } + + function isPossiblePushNotification() { + const { permission } = Notification; + return permission !== "denied"; + } + + function unsubscribeUser() { + return PushNotificationService.unsubscribeUserNotification(); + } + + function subscribeUser() { + return isPossiblePushNotification() && + openDialog().then(() => PushNotificationService.requestNotificationPermission(configProfileCtrl.user)); + } + + function openDialog(event) { + const DIALOG_TEXT = ""; + const confirm = $mdDialog.confirm(); + confirm + .clickOutsideToClose(false) + .title('Permitir Notificação no dispositivo') + .textContent(DIALOG_TEXT) + .ariaLabel('Permitir Notificação no dispositivo') + .targetEvent(event) + .ok('Sim') + .cancel('Não'); + return $mdDialog.show(confirm); + } }; })(); \ No newline at end of file diff --git a/frontend/user/configProfile/config_profile_mobile.html b/frontend/user/configProfile/config_profile_mobile.html index 939a89463..6b43fb404 100644 --- a/frontend/user/configProfile/config_profile_mobile.html +++ b/frontend/user/configProfile/config_profile_mobile.html @@ -59,6 +59,9 @@     + +

    NOTIFICAÇÕES NO CELULAR

    +
    Date: Mon, 18 Feb 2019 21:12:53 -0300 Subject: [PATCH 236/606] Refactor pdf dialog show in PdfService --- frontend/institution/institutionController.js | 22 +++++---- frontend/pdfUpload/pdfService.js | 47 ++++++++++++++++++- frontend/post/pdfViewDirective.js | 40 +--------------- 3 files changed, 60 insertions(+), 49 deletions(-) diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index 373f4f393..82c3b155c 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -251,18 +251,20 @@ }; institutionCtrl.portfolioDialog = function(ev) { - $mdDialog.show({ - templateUrl: 'app/institution/portfolioDialog.html', - targetEvent: ev, - clickOutsideToClose:true, - locals: { - portfolioUrl: institutionCtrl.portfolioUrl - }, - controller: DialogController, - controllerAs: 'ctrl' - }); + PdfService.showPdfDialog(ev, getPortfolioPdfObj()); }; + function getPortfolioPdfObj() { + const pdfObj = { + name: institutionCtrl.institution.name, + url: institutionCtrl.institution.portfolio_url + }; + + console.log(pdfObj); + + return pdfObj; + } + institutionCtrl.openWebsite = function openWebsite() { var website = institutionCtrl.institution.website_url; website = Utils.addHttpsToUrl(website, [website]); diff --git a/frontend/pdfUpload/pdfService.js b/frontend/pdfUpload/pdfService.js index a5236351d..2a7d91c89 100644 --- a/frontend/pdfUpload/pdfService.js +++ b/frontend/pdfUpload/pdfService.js @@ -3,7 +3,7 @@ (function() { var app = angular.module('app'); - app.service("PdfService", function PdfService($q, $firebaseStorage, $http) { + app.service("PdfService", function PdfService($q, $firebaseStorage, $http, $mdDialog) { var service = this; var fileFolder = "files/"; var INDEX_FILE_NAME = 0; @@ -93,5 +93,50 @@ } return false; } + + service.showPdfDialog = function showPdfDialog (ev, pdf) { + $mdDialog.show({ + templateUrl: Utils.selectFieldBasedOnScreenSize( + 'app/post/pdfDialog.html', + 'app/post/pdfDialogMobile.html' + ), + targetEvent: ev, + clickOutsideToClose:true, + locals: { + pdf: pdf + }, + controller: PdfDialogController, + controllerAs: 'ctrl' + }); + }; + + function PdfDialogController($mdDialog, PdfService, $sce, pdf) { + var ctrl = this; + ctrl.pdfUrl = ""; + ctrl.isLoadingPdf = true; + ctrl.pdf = pdf; + + function readPdf() { + var readablePdf = {}; + service.getReadableURL(pdf.url, setPdfURL, readablePdf).then(function success() { + var trustedUrl = $sce.trustAsResourceUrl(readablePdf.url); + ctrl.pdfUrl = trustedUrl; + ctrl.isLoadingPdf = false; + }); + } + + ctrl.downloadPdf = () => { + PdfService.download(ctrl.pdf.url); + }; + + (function main() { + if (!Utils.isMobileScreen()) readPdf(); + })(); + } + + function setPdfURL(url, pdf) { + pdf.url = url; + } + }); })(); \ No newline at end of file diff --git a/frontend/post/pdfViewDirective.js b/frontend/post/pdfViewDirective.js index eaeaf7f4b..d27833846 100644 --- a/frontend/post/pdfViewDirective.js +++ b/frontend/post/pdfViewDirective.js @@ -3,7 +3,7 @@ var app = angular.module('app'); - app.controller('PdfController', function PdfController($mdDialog) { + app.controller('PdfController', function PdfController(PdfService) { var pdfCtrl = this; pdfCtrl.showFiles = function() { @@ -13,19 +13,7 @@ pdfCtrl.pdfDialog = function(ev, pdf) { if(!pdfCtrl.isEditing) { - $mdDialog.show({ - templateUrl: Utils.selectFieldBasedOnScreenSize( - 'app/post/pdfDialog.html', - 'app/post/pdfDialogMobile.html', - ), - targetEvent: ev, - clickOutsideToClose:true, - locals: { - pdf: pdf - }, - controller: DialogController, - controllerAs: 'ctrl' - }); + PdfService.showPdfDialog(ev, pdf); } }; @@ -49,30 +37,6 @@ function setPdfURL(url, pdf) { pdf.url = url; } - - function DialogController($mdDialog, PdfService, $sce, pdf) { - var ctrl = this; - ctrl.pdfUrl = ""; - ctrl.isLoadingPdf = true; - ctrl.pdf = pdf; - - function readPdf() { - var readablePdf = {}; - PdfService.getReadableURL(pdf.url, setPdfURL, readablePdf).then(function success() { - var trustedUrl = $sce.trustAsResourceUrl(readablePdf.url); - ctrl.pdfUrl = trustedUrl; - ctrl.isLoadingPdf = false; - }); - } - - ctrl.downloadPdf = () => { - PdfService.download(ctrl.pdf.url); - }; - - (function main() { - if (!Utils.isMobileScreen()) readPdf(); - })(); - } }); /** From 941cdbd77570f96def5b4376b65b3ec399923abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 18 Feb 2019 21:39:10 -0300 Subject: [PATCH 237/606] Add error redirect when portfolio is empty --- frontend/institution/institutionController.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index 82c3b155c..f02f94fc3 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -251,7 +251,12 @@ }; institutionCtrl.portfolioDialog = function(ev) { - PdfService.showPdfDialog(ev, getPortfolioPdfObj()); + const portfolio = getPortfolioPdfObj(); + if (_.isNil(portfolio.url)) { + $state.go(STATES.ERROR); + } else { + PdfService.showPdfDialog(ev, portfolio); + } }; function getPortfolioPdfObj() { From 06f8f90ff78be5043c10319fca5f135c3de5d016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 18 Feb 2019 21:58:18 -0300 Subject: [PATCH 238/606] Remove unused functions --- frontend/institution/institutionController.js | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index f02f94fc3..ab9d9f9df 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -80,7 +80,7 @@ institutionCtrl.institution = new Institution(response); checkIfUserIsFollower(); institutionCtrl.checkIfUserIsMember(); - getPortfolioUrl(); + setPortfolioUrl(); getActuationArea(); getLegalNature(); institutionCtrl.isLoadingData = false; @@ -123,20 +123,8 @@ } } - function getPortfolioUrl() { + function setPortfolioUrl() { institutionCtrl.portfolioUrl = institutionCtrl.institution.portfolio_url; - if(institutionCtrl.portfolioUrl) { - PdfService.getReadableURL(institutionCtrl.portfolioUrl, setPortifolioURL) - .then(function success() { - }, function error(response) { - MessageService.showToast(response.data.msg); - - }); - } - } - - function setPortifolioURL(url) { - institutionCtrl.portfolioUrl = url; } institutionCtrl.isAdmin = function isAdmin() { @@ -370,12 +358,6 @@ }); } - function DialogController($mdDialog, portfolioUrl) { - var ctrl = this; - var trustedUrl = $sce.trustAsResourceUrl(portfolioUrl); - ctrl.portfolioUrl = trustedUrl; - } - institutionCtrl.getSelectedClass = function (stateName){ return $state.current.name === STATES[stateName] ? "selected" : ""; }; From a9f7290194c200de7d31b14a553917c53111e986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 18 Feb 2019 22:02:27 -0300 Subject: [PATCH 239/606] Remove redundant varible and console.log call --- frontend/institution/institutionController.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index ab9d9f9df..1cbdf4fff 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -248,14 +248,10 @@ }; function getPortfolioPdfObj() { - const pdfObj = { + return { name: institutionCtrl.institution.name, url: institutionCtrl.institution.portfolio_url }; - - console.log(pdfObj); - - return pdfObj; } institutionCtrl.openWebsite = function openWebsite() { From db60d38762cf3678e168f482d7a0aaa375adf5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 19 Feb 2019 07:58:42 -0300 Subject: [PATCH 240/606] Move pdf dialog --- frontend/{post => pdfUpload}/pdfDialog.html | 0 frontend/{post => pdfUpload}/pdfDialogMobile.html | 0 frontend/pdfUpload/pdfService.js | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename frontend/{post => pdfUpload}/pdfDialog.html (100%) rename frontend/{post => pdfUpload}/pdfDialogMobile.html (100%) diff --git a/frontend/post/pdfDialog.html b/frontend/pdfUpload/pdfDialog.html similarity index 100% rename from frontend/post/pdfDialog.html rename to frontend/pdfUpload/pdfDialog.html diff --git a/frontend/post/pdfDialogMobile.html b/frontend/pdfUpload/pdfDialogMobile.html similarity index 100% rename from frontend/post/pdfDialogMobile.html rename to frontend/pdfUpload/pdfDialogMobile.html diff --git a/frontend/pdfUpload/pdfService.js b/frontend/pdfUpload/pdfService.js index 2a7d91c89..b51c4cee6 100644 --- a/frontend/pdfUpload/pdfService.js +++ b/frontend/pdfUpload/pdfService.js @@ -97,8 +97,8 @@ service.showPdfDialog = function showPdfDialog (ev, pdf) { $mdDialog.show({ templateUrl: Utils.selectFieldBasedOnScreenSize( - 'app/post/pdfDialog.html', - 'app/post/pdfDialogMobile.html' + 'app/pdfUpload/pdfDialog.html', + 'app/pdfUpload/pdfDialogMobile.html' ), targetEvent: ev, clickOutsideToClose:true, From a54675320c960ef74a4be17f3cd5f9520332de63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 19 Feb 2019 08:20:56 -0300 Subject: [PATCH 241/606] Add button is disabled when portfolio is empty and remove error redirect --- frontend/institution/base_institution_page_mobile.html | 3 ++- frontend/institution/institutionController.js | 10 +++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/frontend/institution/base_institution_page_mobile.html b/frontend/institution/base_institution_page_mobile.html index d8c3059f4..1eba08579 100644 --- a/frontend/institution/base_institution_page_mobile.html +++ b/frontend/institution/base_institution_page_mobile.html @@ -16,7 +16,8 @@
    + class="institution-button-menu" + ng-disabled="button.isDisabled"> {{button.icon}} {{button.label}} diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index 1cbdf4fff..19e46a636 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -58,7 +58,8 @@ 'label': 'PORTFOLIO', 'icon': 'description', 'onClick': institutionCtrl.portfolioDialog, - 'parameters': '$event' + 'parameters': '$event', + 'isDisabled': _.isNil(institutionCtrl.portfolioUrl) }, { 'label': 'SEGUIDORES', @@ -239,12 +240,7 @@ }; institutionCtrl.portfolioDialog = function(ev) { - const portfolio = getPortfolioPdfObj(); - if (_.isNil(portfolio.url)) { - $state.go(STATES.ERROR); - } else { - PdfService.showPdfDialog(ev, portfolio); - } + PdfService.showPdfDialog(ev, getPortfolioPdfObj()); }; function getPortfolioPdfObj() { From aa977b8c7fe3fcd75fe2ea37afff8bfc3e4b62e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 19 Feb 2019 08:24:52 -0300 Subject: [PATCH 242/606] Uses injection instead of service call in PdfDialogController --- frontend/pdfUpload/pdfService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/pdfUpload/pdfService.js b/frontend/pdfUpload/pdfService.js index b51c4cee6..076f16e7c 100644 --- a/frontend/pdfUpload/pdfService.js +++ b/frontend/pdfUpload/pdfService.js @@ -118,7 +118,7 @@ function readPdf() { var readablePdf = {}; - service.getReadableURL(pdf.url, setPdfURL, readablePdf).then(function success() { + PdfService.getReadableURL(pdf.url, setPdfURL, readablePdf).then(function success() { var trustedUrl = $sce.trustAsResourceUrl(readablePdf.url); ctrl.pdfUrl = trustedUrl; ctrl.isLoadingPdf = false; From c665856b44e3f3b989d793e419a4c04be3522a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 19 Feb 2019 09:13:31 -0300 Subject: [PATCH 243/606] Replace invisible link click for window redirection to download pdf --- frontend/pdfUpload/pdfService.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frontend/pdfUpload/pdfService.js b/frontend/pdfUpload/pdfService.js index 076f16e7c..c1a836852 100644 --- a/frontend/pdfUpload/pdfService.js +++ b/frontend/pdfUpload/pdfService.js @@ -3,7 +3,7 @@ (function() { var app = angular.module('app'); - app.service("PdfService", function PdfService($q, $firebaseStorage, $http, $mdDialog) { + app.service("PdfService", function PdfService($q, $firebaseStorage, $http, $mdDialog, $window) { var service = this; var fileFolder = "files/"; var INDEX_FILE_NAME = 0; @@ -80,9 +80,7 @@ }; service.download = function download (url) { - var link = document.createElement('a'); - link.href = url; - link.click(); + $window.open(url); }; function isValidPdf(file) { @@ -127,6 +125,7 @@ ctrl.downloadPdf = () => { PdfService.download(ctrl.pdf.url); + $mdDialog.cancel(); }; (function main() { From 0fd98804fdd4384d34fd088c2ec56356d2ef6f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 19 Feb 2019 09:14:51 -0300 Subject: [PATCH 244/606] Add inline array anottation in PdfDialogController --- frontend/pdfUpload/pdfService.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/pdfUpload/pdfService.js b/frontend/pdfUpload/pdfService.js index c1a836852..099b5594f 100644 --- a/frontend/pdfUpload/pdfService.js +++ b/frontend/pdfUpload/pdfService.js @@ -103,7 +103,13 @@ locals: { pdf: pdf }, - controller: PdfDialogController, + controller: [ + "$mdDialog", + "PdfService", + "$sce", + "pdf", + PdfDialogController, + ], controllerAs: 'ctrl' }); }; From 2571ae8dfafc2d8739a80982b350e4e794f8fcac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 19 Feb 2019 09:28:07 -0300 Subject: [PATCH 245/606] Replace $mdDialog.cancel() for $mdDialog.hide() in PdfDialogController --- frontend/pdfUpload/pdfService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/pdfUpload/pdfService.js b/frontend/pdfUpload/pdfService.js index 099b5594f..b032b000c 100644 --- a/frontend/pdfUpload/pdfService.js +++ b/frontend/pdfUpload/pdfService.js @@ -131,7 +131,7 @@ ctrl.downloadPdf = () => { PdfService.download(ctrl.pdf.url); - $mdDialog.cancel(); + $mdDialog.hide(); }; (function main() { From 84ba5e0198a9fb8b3095d39a5d1bce99a56d694e Mon Sep 17 00:00:00 2001 From: MaianaB Date: Tue, 19 Feb 2019 09:34:42 -0300 Subject: [PATCH 246/606] Changed how is made the patch of institution --- .../descriptionInst/descriptionController.js | 2 +- .../descriptionInst/description_inst.css | 2 ++ .../descriptionInst/editDescriptionController.js | 16 +++++++++------- .../institution/institutionHeader.component.js | 14 +++++++------- frontend/utils/hideNavbar.js | 4 ++-- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/frontend/institution/descriptionInst/descriptionController.js b/frontend/institution/descriptionInst/descriptionController.js index a95c59919..e158d6f46 100644 --- a/frontend/institution/descriptionInst/descriptionController.js +++ b/frontend/institution/descriptionInst/descriptionController.js @@ -13,7 +13,7 @@ }) }; - /** Listenner edit description inst event, and should refrash institution. + /** Listenner edit description inst event, and should refresh institution. */ $rootScope.$on('EDIT_DESCRIPTION_INST', () => { descriptionCtrl.isLoading = true; diff --git a/frontend/institution/descriptionInst/description_inst.css b/frontend/institution/descriptionInst/description_inst.css index 7b27ef9a2..08c9dc69e 100644 --- a/frontend/institution/descriptionInst/description_inst.css +++ b/frontend/institution/descriptionInst/description_inst.css @@ -17,6 +17,7 @@ .description-inst{ padding: 0px 1.5em; margin-right: auto; + word-break: break-all; } .button-confirm-describe{ @@ -29,6 +30,7 @@ display: grid; grid-template-rows: 22em 3.5em; width: 16em; + overflow: hidden; } .margin-bottom-zero{ diff --git a/frontend/institution/descriptionInst/editDescriptionController.js b/frontend/institution/descriptionInst/editDescriptionController.js index 6cd8a561e..4a6f0e4af 100644 --- a/frontend/institution/descriptionInst/editDescriptionController.js +++ b/frontend/institution/descriptionInst/editDescriptionController.js @@ -1,27 +1,29 @@ (function(){ const app = angular.module('app'); - app.controller("EditDescriptionController", function EditDescriptionController(institution, InstitutionService, - ObserverRecorderService, $rootScope, $mdDialog){ + app.controller("EditDescriptionController",['institution', 'InstitutionService', + '$rootScope', '$mdDialog', function EditDescriptionController(institution, InstitutionService, + $rootScope, $mdDialog){ const descriptionCtrl = this; - let observer; descriptionCtrl.$onInit = () => { descriptionCtrl.institution = institution; - observer = ObserverRecorderService.register(descriptionCtrl.institution); + descriptionCtrl.institutionClone = _.cloneDeep(institution); }; /** Save changes of institution and emit event. */ descriptionCtrl.save = () => { - const patch = ObserverRecorderService.generate(observer); + let clone = JSON.parse(angular.toJson(descriptionCtrl.institutionClone)); + let modified = JSON.parse(angular.toJson(descriptionCtrl.institution)); + const patch = jsonpatch.compare(clone, modified); + InstitutionService.update(descriptionCtrl.institution.key, patch).then( function success() { - console.log("-------------------------") $rootScope.$emit('EDIT_DESCRIPTION_INST'); $mdDialog.hide(); } ); } - }); + }]); })(); \ No newline at end of file diff --git a/frontend/institution/institutionHeader.component.js b/frontend/institution/institutionHeader.component.js index a0aec56d2..e237d9482 100644 --- a/frontend/institution/institutionHeader.component.js +++ b/frontend/institution/institutionHeader.component.js @@ -17,28 +17,28 @@ return instHeaderCtrl.isTimeline() && ( !instHeaderCtrl.isMember || isAdmin); - } + }; /** Return if current state is registration data on institution. * */ instHeaderCtrl.isTimeline = function isTimeline(){ return $state.current.name == STATES.INST_TIMELINE; - } + }; /** Return if current state is registration data on institution. * */ instHeaderCtrl.isRegistrationData = function isRegistrationData(){ return $state.current.name == STATES.INST_REGISTRATION_DATA; - } + }; /** Return if current state is registration data on institution. * */ instHeaderCtrl.isDescription = function isDescription(){ return $state.current.name == STATES.INST_DESCRIPTION; - } + }; /** Return the title of page according current state. */ @@ -54,17 +54,17 @@ [STATES.INST_FOLLOWERS]: "Seguidores" }; return tileState[$state.current.name]; - } + }; instHeaderCtrl.showButtonEdit = function showButtonEdit(){ return (instHeaderCtrl.isRegistrationData() || instHeaderCtrl.isDescription()) && instHeaderCtrl.institution && instHeaderCtrl.user.isAdmin(instHeaderCtrl.institution.key); - } + }; instHeaderCtrl.editInfo = function editInfo($event){ if(instHeaderCtrl.isDescription())instHeaderCtrl.actionsButtons.editDescription(); if(instHeaderCtrl.isRegistrationData())instHeaderCtrl.actionsButtons.editRegistrationData($event); - } + }; }], controllerAs: "instHeaderCtrl", bindings: { diff --git a/frontend/utils/hideNavbar.js b/frontend/utils/hideNavbar.js index fc7bc412a..a02bf9625 100644 --- a/frontend/utils/hideNavbar.js +++ b/frontend/utils/hideNavbar.js @@ -3,7 +3,7 @@ (function () { const app = angular.module('app'); - app.directive('hideNavbar', ['$transitions', 'STATES','$state', function($transitions, STATES, $state) { + app.directive('hideNavbar', ['$transitions', 'STATES','$state', 'SCREEN_SIZES', function($transitions, STATES, $state, SCREEN_SIZES) { return { restrict: 'A', link: function(scope, element, attrs) { @@ -70,7 +70,7 @@ const hideTop = attrs.hideNavbar === "top" || hideBoth; const hideBottom = attrs.hideNavbar === "bottom" || hideBoth; - if(Utils.isMobileScreen(450)){ + if(Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE)){ const content = element[0]; const limitScrol = 30; From bda2d2844b5641275094298f2e3a51995b15b98e Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Tue, 19 Feb 2019 09:54:00 -0300 Subject: [PATCH 247/606] spreading toolbar through app --- frontend/search/search.css | 3 ++- frontend/search/search_mobile.html | 9 +++++---- frontend/toolbar/whiteToolbar.component.js | 6 +++++- frontend/toolbar/white_toolbar_mobile.css | 9 +++++++-- frontend/toolbar/white_toolbar_mobile.html | 16 +++++++++++----- .../configProfile/configProfileController.js | 12 ++++++++++++ .../configProfile/config_profile_mobile.html | 14 ++------------ 7 files changed, 44 insertions(+), 25 deletions(-) diff --git a/frontend/search/search.css b/frontend/search/search.css index 7b4a7ebb4..34dbc0182 100644 --- a/frontend/search/search.css +++ b/frontend/search/search.css @@ -6,10 +6,11 @@ width: 100%; font-size: 20px; z-index: 2; + overflow: hidden; } .search-mobile-content { - margin-top: 85px; + overflow: hidden; } .search-mobile-content form { diff --git a/frontend/search/search_mobile.html b/frontend/search/search_mobile.html index a1055683a..45c8f70db 100644 --- a/frontend/search/search_mobile.html +++ b/frontend/search/search_mobile.html @@ -1,5 +1,6 @@ - - + + +
    @@ -13,7 +14,7 @@
    Pesquisa avançada
    -
    +
    - \ No newline at end of file +
    \ No newline at end of file diff --git a/frontend/toolbar/whiteToolbar.component.js b/frontend/toolbar/whiteToolbar.component.js index f7a1f27a6..18b468068 100644 --- a/frontend/toolbar/whiteToolbar.component.js +++ b/frontend/toolbar/whiteToolbar.component.js @@ -8,7 +8,9 @@ controller: ['$window', WhiteToolbarController], controllerAs: 'whiteToolbarCtrl', bindings: { - title: '@' + title: '@', + rightButton: '=', + primaryButtonIcon: '@' } }); @@ -18,5 +20,7 @@ whiteToolbarCtrl.goBack = () => { return $window.history.back(); }; + + console.log(whiteToolbarCtrl.rightButton); } })(); \ No newline at end of file diff --git a/frontend/toolbar/white_toolbar_mobile.css b/frontend/toolbar/white_toolbar_mobile.css index 904f4f2ce..133e1e11e 100644 --- a/frontend/toolbar/white_toolbar_mobile.css +++ b/frontend/toolbar/white_toolbar_mobile.css @@ -4,8 +4,13 @@ height: 60px; width: 100%; font-size: 20px; - z-index: 2; display: grid; grid-template-rows: auto; - grid-template-columns: 30% 50% auto; + grid-template-columns: 20% 50% auto; + align-items: center; +} + +.tst { + font-size: 2.5em; + line-height: inherit !important; } \ No newline at end of file diff --git a/frontend/toolbar/white_toolbar_mobile.html b/frontend/toolbar/white_toolbar_mobile.html index 71febed9b..039bcc691 100644 --- a/frontend/toolbar/white_toolbar_mobile.html +++ b/frontend/toolbar/white_toolbar_mobile.html @@ -1,9 +1,15 @@ -
    - - keyboard_arrow_left +
    + + {{whiteToolbarCtrl.primaryButtonIcon}} -
    +
    {{whiteToolbarCtrl.title}}
    + + + + {{whiteToolbarCtrl.rightButton[icon]}} + +
    \ No newline at end of file diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index ae8faa19d..e696bc958 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -181,6 +181,14 @@ window.history.back(); }; + configProfileCtrl.toolbarItems = () => { + configProfileCtrl.saveButton = { + class: 'config-profile__toolbar--save', + action: configProfileCtrl.finish, + name: 'SALVAR' + }; + }; + function deleteUser() { const promise = UserService.deleteAccount(); promise.then(function success() { @@ -188,5 +196,9 @@ }); return promise; } + + configProfileCtrl.$onInit = () => { + configProfileCtrl.toolbarItems(); + }; }; })(); \ No newline at end of file diff --git a/frontend/user/configProfile/config_profile_mobile.html b/frontend/user/configProfile/config_profile_mobile.html index 939a89463..33ae6949b 100644 --- a/frontend/user/configProfile/config_profile_mobile.html +++ b/frontend/user/configProfile/config_profile_mobile.html @@ -1,15 +1,5 @@ - -
    - - close - - MEU PERFIL - - SALVAR - -
    -     +
    From 79d262c8bff34458960d66c6c0bc3556bf40ecd7 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Tue, 19 Feb 2019 09:58:42 -0300 Subject: [PATCH 248/606] fix multiple onInit --- frontend/user/configProfile/configProfileController.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index e696bc958..992458a22 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -24,6 +24,7 @@ configProfileCtrl.$onInit = () => { configProfileCtrl._setupUser(); + configProfileCtrl.toolbarItems(); } configProfileCtrl._setupUser = () => { @@ -196,9 +197,5 @@ }); return promise; } - - configProfileCtrl.$onInit = () => { - configProfileCtrl.toolbarItems(); - }; }; })(); \ No newline at end of file From d2de6eb1c6d6da40bfce11c448dd0050558b87b6 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Tue, 19 Feb 2019 10:00:44 -0300 Subject: [PATCH 249/606] changed to const --- .../institution/descriptionInst/editDescriptionController.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/institution/descriptionInst/editDescriptionController.js b/frontend/institution/descriptionInst/editDescriptionController.js index 4a6f0e4af..db6ec45b2 100644 --- a/frontend/institution/descriptionInst/editDescriptionController.js +++ b/frontend/institution/descriptionInst/editDescriptionController.js @@ -14,8 +14,8 @@ /** Save changes of institution and emit event. */ descriptionCtrl.save = () => { - let clone = JSON.parse(angular.toJson(descriptionCtrl.institutionClone)); - let modified = JSON.parse(angular.toJson(descriptionCtrl.institution)); + const clone = JSON.parse(angular.toJson(descriptionCtrl.institutionClone)); + const modified = JSON.parse(angular.toJson(descriptionCtrl.institution)); const patch = jsonpatch.compare(clone, modified); InstitutionService.update(descriptionCtrl.institution.key, patch).then( From d05c620c52e9fd1c09d9436a529f1369552e9d1d Mon Sep 17 00:00:00 2001 From: MaianaB Date: Tue, 19 Feb 2019 10:14:31 -0300 Subject: [PATCH 250/606] changed layout grid --- frontend/app.js | 2 +- .../institution/descriptionInst/description_inst.css | 10 +++++----- .../institution/descriptionInst/edit_description.html | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 0c60df219..c88ecc752 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -612,6 +612,6 @@ } (function main() { - initServiceWorker(); + //initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/institution/descriptionInst/description_inst.css b/frontend/institution/descriptionInst/description_inst.css index 08c9dc69e..a46c89ab5 100644 --- a/frontend/institution/descriptionInst/description_inst.css +++ b/frontend/institution/descriptionInst/description_inst.css @@ -28,18 +28,18 @@ .dialog-edit-description{ padding: 2em 1em 1em 1em; display: grid; - grid-template-rows: 22em 3.5em; + grid-template-rows: 2.5em 22em 3.5em; width: 16em; overflow: hidden; } -.margin-bottom-zero{ - margin-bottom: 0px; +.margin-zero{ + margin: 0px; } @media screen and (max-height: 580px) and (max-width: 325px){ .dialog-edit-description{ - grid-template-rows: 20em 3em; + grid-template-rows: 1.5em 20em 3em; width: 13em; } #textarea-edit-description{ @@ -49,7 +49,7 @@ @media screen and (min-height: 580px) and (max-height:680px) and (max-width: 365px){ .dialog-edit-description{ - grid-template-rows: 21em 3em; + grid-template-rows: 2em 21em 3em; width: 15em; } } \ No newline at end of file diff --git a/frontend/institution/descriptionInst/edit_description.html b/frontend/institution/descriptionInst/edit_description.html index d1d1815cf..f2b960b42 100644 --- a/frontend/institution/descriptionInst/edit_description.html +++ b/frontend/institution/descriptionInst/edit_description.html @@ -1,8 +1,8 @@
    - - + + + id="textarea-edit-description"> CONFIRMAR From 37d5f12233a846bf013424e457182d2a3baefd3e Mon Sep 17 00:00:00 2001 From: MaianaB Date: Tue, 19 Feb 2019 10:25:08 -0300 Subject: [PATCH 251/606] remove comment --- frontend/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app.js b/frontend/app.js index c88ecc752..0c60df219 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -612,6 +612,6 @@ } (function main() { - //initServiceWorker(); + initServiceWorker(); })(); })(); \ No newline at end of file From b646819b86e2fe62d1925a1c93cb1234dad25d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 19 Feb 2019 10:30:07 -0300 Subject: [PATCH 252/606] Remove margins from buttons from inst-navbar --- frontend/institution/base_institution.css | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/frontend/institution/base_institution.css b/frontend/institution/base_institution.css index 7049ce4f0..2edff36e1 100644 --- a/frontend/institution/base_institution.css +++ b/frontend/institution/base_institution.css @@ -86,7 +86,7 @@ .icon-button-menu-inst{ color: #FFFFFF; font-size: 20px; - margin-left: 0.5em; + margin: 0; } .institution-button-menu{ @@ -99,10 +99,6 @@ height: 0px; } -.btn-follow-unfollow{ - margin-right: -20px; -} - #buttons-navbar-inst-container{ position: relative; display: grid; @@ -134,6 +130,8 @@ } #btn-more{ + margin: 0; + padding: 0; width: 48px; } @@ -165,9 +163,6 @@ .button-navbar-inst{ font-size: 12px; } - #btn-more{ - margin-left: -20px; - } } @media screen and (min-height: 620px) and (max-height:660px){ From db8f53d96a73f1acf9a0516b19847ba1db3421e1 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Tue, 19 Feb 2019 10:48:11 -0300 Subject: [PATCH 253/606] added state go --- frontend/event/eventDetailsDirective.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index fa8cdfbf8..ad5fbfd44 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -42,6 +42,7 @@ promise.then(function success() { MessageService.showToast('Evento removido com sucesso!'); eventCtrl.event.state = "deleted"; + $state.go(STATES.EVENTS); }); return promise; } From 637ec70e46bb98ecb302400bbcfa8d20ae4324f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 19 Feb 2019 10:50:12 -0300 Subject: [PATCH 254/606] Redo grid definition substituting px values for min-content --- frontend/institution/base_institution.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/institution/base_institution.css b/frontend/institution/base_institution.css index 2edff36e1..803cc654a 100644 --- a/frontend/institution/base_institution.css +++ b/frontend/institution/base_institution.css @@ -87,6 +87,7 @@ color: #FFFFFF; font-size: 20px; margin: 0; + display: inherit !important; } .institution-button-menu{ @@ -110,7 +111,7 @@ #buttons-navbar-inst-container-end{ padding-top: 5px; display: grid; - grid-template-columns: 107px auto auto; + grid-template-columns: min-content auto min-content; align-items: center; justify-content: end; overflow-x:hidden; @@ -132,7 +133,6 @@ #btn-more{ margin: 0; padding: 0; - width: 48px; } #btn-edit{ From 82062b5fe4532abd59071791980b9841d457d87f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 19 Feb 2019 10:52:15 -0300 Subject: [PATCH 255/606] Add specific display definition for vert button --- frontend/institution/base_institution.css | 3 +++ frontend/institution/institution_header.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/institution/base_institution.css b/frontend/institution/base_institution.css index 803cc654a..901cf1d5f 100644 --- a/frontend/institution/base_institution.css +++ b/frontend/institution/base_institution.css @@ -87,6 +87,9 @@ color: #FFFFFF; font-size: 20px; margin: 0; +} + +.vert-button-navbar-inst { display: inherit !important; } diff --git a/frontend/institution/institution_header.html b/frontend/institution/institution_header.html index 84e13d349..3d87202c4 100644 --- a/frontend/institution/institution_header.html +++ b/frontend/institution/institution_header.html @@ -23,7 +23,7 @@ - more_vert + more_vert From 127975c63480b1daac41a52a0f64282fa10e0f84 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Tue, 19 Feb 2019 11:27:12 -0300 Subject: [PATCH 256/606] remove overflow hidden --- frontend/institution/descriptionInst/description_inst.css | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/institution/descriptionInst/description_inst.css b/frontend/institution/descriptionInst/description_inst.css index a46c89ab5..278dd7185 100644 --- a/frontend/institution/descriptionInst/description_inst.css +++ b/frontend/institution/descriptionInst/description_inst.css @@ -30,7 +30,6 @@ display: grid; grid-template-rows: 2.5em 22em 3.5em; width: 16em; - overflow: hidden; } .margin-zero{ From 52aa51ca46530f561fde7c481baf2b865833f36a Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Tue, 19 Feb 2019 11:34:03 -0300 Subject: [PATCH 257/606] Search event working --- backend/handlers/search_handler.py | 6 +- backend/main.py | 1 + backend/models/event.py | 2 +- backend/search_module/search_event.py | 2 + frontend/event/eventService.js | 4 + frontend/search/search.css | 4 + frontend/search/searchController.js | 40 +++++++-- frontend/search/search_event.html | 83 +++++++++---------- .../test/specs/search/searchControllerSpec.js | 1 + 9 files changed, 87 insertions(+), 56 deletions(-) diff --git a/backend/handlers/search_handler.py b/backend/handlers/search_handler.py index a0c26d9be..52183a152 100644 --- a/backend/handlers/search_handler.py +++ b/backend/handlers/search_handler.py @@ -6,14 +6,14 @@ import json from . import BaseHandler -from search_module import SearchUser -from search_module import SearchInstitution +from search_module import SearchUser, SearchInstitution, SearchEvent __all__ = ['SearchHandler'] SEARCH_TYPES = { 'institution': SearchInstitution, - 'user': SearchUser + 'user': SearchUser, + 'event': SearchEvent } diff --git a/backend/main.py b/backend/main.py index ea8577b1e..1fe6fbada 100644 --- a/backend/main.py +++ b/backend/main.py @@ -97,6 +97,7 @@ ("/api/user/institutions/(.*)", UserHandler), ("/api/user/timeline.*", UserTimelineHandler), ("/api/search/institution", SearchHandler), + ("/api/search/event", SearchHandler), ("/api/feature-toggle.*", FeatureToggleHandler), ("/login", LoginHandler), ("/logout", LogoutHandler), diff --git a/backend/models/event.py b/backend/models/event.py index 4d1da8e8f..f049c28e9 100644 --- a/backend/models/event.py +++ b/backend/models/event.py @@ -166,7 +166,7 @@ def make(event): } def _post_put_hook(self, future): - """This method is called after each Institution.put().""" + """This method is called after each Event.put().""" search_event = SearchEvent() search_event.createDocument(future.get_result().get()) diff --git a/backend/search_module/search_event.py b/backend/search_module/search_event.py index 3f51409d0..3024198f3 100644 --- a/backend/search_module/search_event.py +++ b/backend/search_module/search_event.py @@ -43,6 +43,7 @@ def createDocument(self, event): content = { 'id': event.key.urlsafe(), + 'state': event.state, 'institution_name': event.institution_name, 'institution_acronym': event.institution_acronym, 'country': event.address and event.address.country, @@ -55,6 +56,7 @@ def createDocument(self, event): # what makes the search easier. doc_id=content['id'], fields=[ + search.TextField(name='state', value=content['state']), search.TextField(name='institution_name', value=content['institution_name']), search.TextField(name='institution_acronym', value=content['institution_acronym']), search.TextField(name='country', value=content['country']), diff --git a/frontend/event/eventService.js b/frontend/event/eventService.js index eb4dd7aa9..a076dda3e 100644 --- a/frontend/event/eventService.js +++ b/frontend/event/eventService.js @@ -39,5 +39,9 @@ service.getMonths = function getMonths() { return HttpService.get('app/utils/months.json'); }; + + service.searchEvents = function searchEvents(value, state, type) { + return HttpService.get(`/api/search/event?value=${value}&state=${state}&type=${type}`); + }; }); })(); \ No newline at end of file diff --git a/frontend/search/search.css b/frontend/search/search.css index 3b40673f5..e499730e0 100644 --- a/frontend/search/search.css +++ b/frontend/search/search.css @@ -124,6 +124,10 @@ width: 96%; } +.search-event-md-select { + width: 100%; +} + .search-event-title-margin { margin-bottom: 2em; margin-left: 0.8em; diff --git a/frontend/search/searchController.js b/frontend/search/searchController.js index 08301a64c..9bfe677f7 100644 --- a/frontend/search/searchController.js +++ b/frontend/search/searchController.js @@ -4,7 +4,7 @@ var app = angular.module('app'); app.controller("SearchController", function SearchController($state, InstitutionService, - brCidadesEstados, HttpService, $mdDialog, $window, STATES) { + brCidadesEstados, HttpService, $mdDialog, $window, STATES, $http, EventService) { var searchCtrl = this; @@ -12,6 +12,7 @@ // This field allows the controller know when it has to go to the server to make the search. searchCtrl.previous_keyword = searchCtrl.search_keyword; searchCtrl.institutions = []; + searchCtrl.events = []; searchCtrl.actuationAreas = []; searchCtrl.legalNature = []; var actuationAreas; @@ -20,12 +21,21 @@ searchCtrl.makeSearch = function makeSearch(value, type) { searchCtrl.loading = false; - var valueOrKeyword = value ? value : (searchCtrl.search_keyword || ""); - var promise = InstitutionService.searchInstitutions(valueOrKeyword, "active", type); - promise.then(function success(response) { - searchCtrl.institutions = response; - searchCtrl.loading = true; - }); + const valueOrKeyword = value ? value : (searchCtrl.search_keyword || ""); + let promise; + if (type === 'event') { + promise = EventService.searchEvents(valueOrKeyword, "published", type); + promise.then(function success(response) { + searchCtrl.events = response; + searchCtrl.loading = true; + }); + } else { + promise = InstitutionService.searchInstitutions(valueOrKeyword, "active", type); + promise.then(function success(response) { + searchCtrl.institutions = response; + searchCtrl.loading = true; + }); + } return promise; }; @@ -46,9 +56,9 @@ * @param {Event} ev : The event that is useful to deal with the mdDialog. * When the user isn't in a mobile its value is undefined. */ - searchCtrl.search = function search(ev) { + searchCtrl.search = function search(ev, type) { if (searchCtrl.search_keyword) { - let promise = searchCtrl.makeSearch(searchCtrl.search_keyword, 'institution'); + let promise = searchCtrl.makeSearch(searchCtrl.search_keyword, type || 'institution'); promise.then(() => { if (Utils.isMobileScreen()) { @@ -171,6 +181,17 @@ } } + function loadCountries() { + $http.get('app/institution/countries.json').then(function success(response) { + searchCtrl.countries = response.data; + }); + } + + searchCtrl.getCitiesByState = () => { + searchCtrl.cities = brCidadesEstados.buscarCidadesPorSigla(searchCtrl.selectedFederalState.sigla); + //searchCtrl.event.address.federal_state = dialogCtrl.selectedFederalState.nome; + }; + function loadBrazilianFederalStates() { searchCtrl.brazilianFederalStates = brCidadesEstados.estados; } @@ -192,6 +213,7 @@ getLegalNatures(); loadSearch(); loadBrazilianFederalStates(); + loadCountries(); })(); }); })(); \ No newline at end of file diff --git a/frontend/search/search_event.html b/frontend/search/search_event.html index 3037182b3..d2a5431ec 100644 --- a/frontend/search/search_event.html +++ b/frontend/search/search_event.html @@ -7,58 +7,55 @@

    Pesquisa avançada

    - +

    INSTITUIÇÃO

    - +     + +

    DATA DO EVENTO

    + +     +
    +

    PAÍS

    + + + {{country.nome_pais}} + + +
    +
    +

    ESTADO

    + + + {{ federal_state.nome }} + + +
    +
    +

    MUNICÍPIO

    + + {{city}} + +
    -
    -

    DATA DO EVENTO

    - - - {{ value }} - - -
    -
    -

    PAÍS

    - - - {{ value }} - - -
    -
    -

    ESTADO

    - - - {{ value }} - - -
    -
    -

    MUNICÍPIO

    - - - {{ value }} - - -
    CANCELAR - + PESQUISAR
    diff --git a/frontend/test/specs/search/searchControllerSpec.js b/frontend/test/specs/search/searchControllerSpec.js index 6971173d9..f52f3c4ca 100644 --- a/frontend/test/specs/search/searchControllerSpec.js +++ b/frontend/test/specs/search/searchControllerSpec.js @@ -53,6 +53,7 @@ "PRIVATE_NON-PROFIT": "Privada sem fins lucrativos", "PUBLIC": "Pública" }); + httpBackend.expectGET('app/institution/countries.json').respond({}); httpBackend.when('GET', "main/main.html").respond(200); httpBackend.when('GET', "error/user_inactive.html").respond(200); httpBackend.when('GET', "home/home.html").respond(200); From e78705bc43c43ff7be5f91bb36e798eabdc9f3cc Mon Sep 17 00:00:00 2001 From: MaianaB Date: Tue, 19 Feb 2019 12:20:07 -0300 Subject: [PATCH 258/606] add tag md-dialog --- .../descriptionInst/description_inst.css | 35 +++++++++++-------- .../descriptionInst/edit_description.html | 22 ++++++------ 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/frontend/institution/descriptionInst/description_inst.css b/frontend/institution/descriptionInst/description_inst.css index 278dd7185..add852508 100644 --- a/frontend/institution/descriptionInst/description_inst.css +++ b/frontend/institution/descriptionInst/description_inst.css @@ -1,11 +1,11 @@ #textarea-edit-description{ - height: 20em !important; + height: 100% !important; border-style: solid; border-width: 1px; border-color: black; border-radius: 5px; padding: 0.5em; - margin-top: 0.7em; + overflow-y: scroll; } #label-edit-description{ @@ -14,6 +14,10 @@ color:black; } +.height-dialog{ + max-height: 90%; +} + .description-inst{ padding: 0px 1.5em; margin-right: auto; @@ -28,27 +32,28 @@ .dialog-edit-description{ padding: 2em 1em 1em 1em; display: grid; - grid-template-rows: 2.5em 22em 3.5em; + grid-template-rows: 2.5em 1fr 3.5em; width: 16em; + height: 100%; } .margin-zero{ margin: 0px; } -@media screen and (max-height: 580px) and (max-width: 325px){ - .dialog-edit-description{ - grid-template-rows: 1.5em 20em 3em; - width: 13em; - } - #textarea-edit-description{ - height: 18.5em !important; - } +.input-edit-desciption .md-resize-wrapper{ + height: 100%; } -@media screen and (min-height: 580px) and (max-height:680px) and (max-width: 365px){ +.input-edit-desciption{ + height: 22em; +} + +@media screen and (max-height:570px){ .dialog-edit-description{ - grid-template-rows: 2em 21em 3em; - width: 15em; - } + width: 14em; + } + .input-edit-desciption{ + height: 18em; + } } \ No newline at end of file diff --git a/frontend/institution/descriptionInst/edit_description.html b/frontend/institution/descriptionInst/edit_description.html index f2b960b42..714dc6b24 100644 --- a/frontend/institution/descriptionInst/edit_description.html +++ b/frontend/institution/descriptionInst/edit_description.html @@ -1,10 +1,12 @@ -
    - - - - - - CONFIRMAR - -
    \ No newline at end of file + +
    + + + + + + CONFIRMAR + +
    +     \ No newline at end of file From 2a8103a288ccff45713020e6f26a6bd4be359f74 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Tue, 19 Feb 2019 13:35:50 -0300 Subject: [PATCH 259/606] change size input to mobile --- frontend/institution/descriptionInst/description_inst.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frontend/institution/descriptionInst/description_inst.css b/frontend/institution/descriptionInst/description_inst.css index add852508..da916d95d 100644 --- a/frontend/institution/descriptionInst/description_inst.css +++ b/frontend/institution/descriptionInst/description_inst.css @@ -56,4 +56,10 @@ .input-edit-desciption{ height: 18em; } +} + +@media screen and (min-height:700px){ + .input-edit-desciption{ + height: 26em; + } } \ No newline at end of file From 78f20c54c81450f0506c12aeabb520adaf82175a Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Tue, 19 Feb 2019 14:10:00 -0300 Subject: [PATCH 260/606] adding the toolbar in the edit inst page --- frontend/institution/edit_info.html | 2 +- frontend/institution/edit_registration_data.html | 9 +++------ frontend/search/search_mobile.html | 2 +- frontend/toolbar/whiteToolbar.component.js | 15 +++++++++++---- frontend/toolbar/white_toolbar_mobile.css | 7 +++++++ frontend/toolbar/white_toolbar_mobile.html | 9 +++++---- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/frontend/institution/edit_info.html b/frontend/institution/edit_info.html index b68266073..a03f95de6 100644 --- a/frontend/institution/edit_info.html +++ b/frontend/institution/edit_info.html @@ -5,7 +5,7 @@

    Edição de informações Institucionais

     - + diff --git a/frontend/institution/edit_registration_data.html b/frontend/institution/edit_registration_data.html index d00a9c2c1..7e3a88b11 100644 --- a/frontend/institution/edit_registration_data.html +++ b/frontend/institution/edit_registration_data.html @@ -1,9 +1,6 @@ -
    - - keyboard_arrow_left - -

    EDITAR DADOS CADASTRAIS

    -
    + +
    +
    diff --git a/frontend/toolbar/whiteToolbar.component.js b/frontend/toolbar/whiteToolbar.component.js index 18b468068..15d273efe 100644 --- a/frontend/toolbar/whiteToolbar.component.js +++ b/frontend/toolbar/whiteToolbar.component.js @@ -5,22 +5,29 @@ app.component('whiteToolbar', { templateUrl: 'app/toolbar/white_toolbar_mobile.html', - controller: ['$window', WhiteToolbarController], + controller: ['$window', 'SCREEN_SIZES', WhiteToolbarController], controllerAs: 'whiteToolbarCtrl', bindings: { title: '@', rightButton: '=', - primaryButtonIcon: '@' + primaryButtonIcon: '@', + titleClass: '@' } }); - function WhiteToolbarController($window) { + function WhiteToolbarController($window, SCREEN_SIZES) { const whiteToolbarCtrl = this; whiteToolbarCtrl.goBack = () => { return $window.history.back(); }; - console.log(whiteToolbarCtrl.rightButton); + whiteToolbarCtrl.$onInit = () => { + console.log(whiteToolbarCtrl.rightButton); + }; + + whiteToolbarCtrl.isMobileScreen = () => { + return Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE); + }; } })(); \ No newline at end of file diff --git a/frontend/toolbar/white_toolbar_mobile.css b/frontend/toolbar/white_toolbar_mobile.css index 133e1e11e..4d14147f2 100644 --- a/frontend/toolbar/white_toolbar_mobile.css +++ b/frontend/toolbar/white_toolbar_mobile.css @@ -13,4 +13,11 @@ .tst { font-size: 2.5em; line-height: inherit !important; +} + +.edit-inst-toolbar-title { + color: grey; + font-size: 0.8em; + word-break: normal; + grid-column-end: 4 !important; } \ No newline at end of file diff --git a/frontend/toolbar/white_toolbar_mobile.html b/frontend/toolbar/white_toolbar_mobile.html index 039bcc691..c60790027 100644 --- a/frontend/toolbar/white_toolbar_mobile.html +++ b/frontend/toolbar/white_toolbar_mobile.html @@ -1,15 +1,16 @@ -
    +
    {{whiteToolbarCtrl.primaryButtonIcon}} -
    +
    {{whiteToolbarCtrl.title}}
    - + {{whiteToolbarCtrl.rightButton.name}} - {{whiteToolbarCtrl.rightButton[icon]}} + {{whiteToolbarCtrl.rightButton.icon}}
    \ No newline at end of file From fa738080aca276648b1f69f17e2a6ac49ca73edd Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Tue, 19 Feb 2019 14:54:17 -0300 Subject: [PATCH 261/606] Fix verification --- frontend/toolbar/whiteToolbar.component.js | 5 +---- frontend/toolbar/white_toolbar_mobile.html | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/frontend/toolbar/whiteToolbar.component.js b/frontend/toolbar/whiteToolbar.component.js index 15d273efe..d36c85a14 100644 --- a/frontend/toolbar/whiteToolbar.component.js +++ b/frontend/toolbar/whiteToolbar.component.js @@ -22,11 +22,8 @@ return $window.history.back(); }; - whiteToolbarCtrl.$onInit = () => { - console.log(whiteToolbarCtrl.rightButton); - }; - whiteToolbarCtrl.isMobileScreen = () => { + console.log(Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE)); return Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE); }; } diff --git a/frontend/toolbar/white_toolbar_mobile.html b/frontend/toolbar/white_toolbar_mobile.html index c60790027..7152d69b4 100644 --- a/frontend/toolbar/white_toolbar_mobile.html +++ b/frontend/toolbar/white_toolbar_mobile.html @@ -1,4 +1,4 @@ -
    +
    {{whiteToolbarCtrl.primaryButtonIcon}} From 66d45056b3642b98dbe2d2bbeeee1c143355c4cb Mon Sep 17 00:00:00 2001 From: MaianaB Date: Tue, 19 Feb 2019 16:40:00 -0300 Subject: [PATCH 262/606] fix weight of md-selects --- frontend/institution/edit_registration_data_mobile.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/edit_registration_data_mobile.css b/frontend/institution/edit_registration_data_mobile.css index d8069e5eb..bcd43848c 100644 --- a/frontend/institution/edit_registration_data_mobile.css +++ b/frontend/institution/edit_registration_data_mobile.css @@ -118,7 +118,7 @@ font-size: 0.7em; } -.edit-registration-select-menu-size, .md-select-menu-container { +.edit-registration-select-menu-size .md-select-menu-container { width: 96%; } From f1a166d9113c812f31bc9635ae727f0109b2ab79 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Tue, 19 Feb 2019 16:59:26 -0300 Subject: [PATCH 263/606] Undo unnecessary comment --- frontend/search/searchController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/search/searchController.js b/frontend/search/searchController.js index 9bfe677f7..5067f3167 100644 --- a/frontend/search/searchController.js +++ b/frontend/search/searchController.js @@ -28,6 +28,7 @@ promise.then(function success(response) { searchCtrl.events = response; searchCtrl.loading = true; + console.log(response); }); } else { promise = InstitutionService.searchInstitutions(valueOrKeyword, "active", type); @@ -189,7 +190,6 @@ searchCtrl.getCitiesByState = () => { searchCtrl.cities = brCidadesEstados.buscarCidadesPorSigla(searchCtrl.selectedFederalState.sigla); - //searchCtrl.event.address.federal_state = dialogCtrl.selectedFederalState.nome; }; function loadBrazilianFederalStates() { From ce114e979501401f54a96954c74a47e9e3461beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 19 Feb 2019 17:02:27 -0300 Subject: [PATCH 264/606] Add event institution page redirection by query params --- frontend/app.js | 2 +- frontend/institution/institutionController.js | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 648877ddd..4a675fb41 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -81,7 +81,7 @@ } }) .state(STATES.EVENTS, { - url: "/events", + url: "/events?institutionKey", views: { user_content: { templateUrl: Utils.selectFieldBasedOnScreenSize("app/event/events.html", diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index 19e46a636..93a7f8906 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -209,10 +209,18 @@ }; institutionCtrl.goToEvents = function goToEvents(institutionKey) { - UtilsService.selectNavOption(STATES.INST_EVENTS, - {institutionKey: institutionKey, posts: institutionCtrl.posts}); + Utils.isMobileScreen() ? goToEventsMobile(institutionKey) : goToEventsDesktop(institutionKey); }; + function goToEventsMobile(institutionKey) { + UtilsService.selectNavOption(STATES.EVENTS,{institutionKey: institutionKey}); + } + + function goToEventsDesktop(institutionKey) { + UtilsService.selectNavOption(STATES.INST_EVENTS, + {institutionKey: institutionKey, posts: institutionCtrl.posts}); + } + institutionCtrl.goToLinks = function goToLinks(institutionKey) { UtilsService.selectNavOption(STATES.INST_LINKS, {institutionKey: institutionKey}); }; From 710ee6c6e9e867f8508f463230dbb126c3748441 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Tue, 19 Feb 2019 17:55:57 -0300 Subject: [PATCH 265/606] Showing canceled events --- backend/handlers/event_collection_handler.py | 4 +- frontend/event/event.css | 10 ++++ frontend/event/events_mobile.html | 9 +++- frontend/search/search_event_mobile.html | 54 -------------------- 4 files changed, 20 insertions(+), 57 deletions(-) delete mode 100644 frontend/search/search_event_mobile.html diff --git a/backend/handlers/event_collection_handler.py b/backend/handlers/event_collection_handler.py index 125ee8da4..491483b3b 100644 --- a/backend/handlers/event_collection_handler.py +++ b/backend/handlers/event_collection_handler.py @@ -56,8 +56,8 @@ def get_filtered_events(filters, user): december = month == 12 begin_selected_month_utc = datetime(year, month, 1, 3) end_selected_month_utc = datetime(year if not december else year+1, month+1 if not december else 1, 1, 3) - query = ndb.gql("SELECT __key__ FROM Event WHERE institution_key IN :1 AND state =:2 AND start_time < DATETIME(:3)", - user.follows, 'published', end_selected_month_utc.strftime("%Y-%m-%d %H:%M:%S")) + query = ndb.gql("SELECT __key__ FROM Event WHERE institution_key IN :1 AND start_time < DATETIME(:2)", + user.follows, end_selected_month_utc.strftime("%Y-%m-%d %H:%M:%S")) if query.count() > 0: return ndb.gql("SELECT * FROM Event WHERE __key__ IN :1 AND end_time >= DATETIME(:2)", query.fetch(), begin_selected_month_utc.strftime("%Y-%m-%d %H:%M:%S")).order(Event.end_time, Event.key) diff --git a/frontend/event/event.css b/frontend/event/event.css index ac2e1959b..15beba31f 100644 --- a/frontend/event/event.css +++ b/frontend/event/event.css @@ -523,6 +523,16 @@ color:#009688; } + .event-canceled-tag, .event-canceled-icon { + color: white; + + } + + .event-canceled-tag { + margin-right: 2em; + margin-left: -1em; + } + @media screen and (min-height: 600px) { .event-links-fields { max-height: 13em; diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index c27068fe1..5280dfce5 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -22,8 +22,15 @@ ng-click="eventCtrl.goToEvent(event)">
    - +
    + + highlight_off +
    ESTE EVENTO FOI CANCELADO
    +     +
    {{ event.title | uppercase}} diff --git a/frontend/search/search_event_mobile.html b/frontend/search/search_event_mobile.html deleted file mode 100644 index c85412840..000000000 --- a/frontend/search/search_event_mobile.html +++ /dev/null @@ -1,54 +0,0 @@ - -
    - - clear - - PESQUISAR -
    -
    -
    - - - - -
    -
    -
    - Pesquisa avançada -
    -
    - - - - {{actuation_area.name}} - - - - - - - {{nature.name}} - - - - - - - {{state.nome}} - - - -
    -
    - - CANCELAR - - - PESQUISAR - -
    -     \ No newline at end of file From 08335dcae386cef3d98c1c8c09e2051a083cf543 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 20 Feb 2019 08:58:35 -0300 Subject: [PATCH 266/606] added window reload --- frontend/main/mainController.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/main/mainController.js b/frontend/main/mainController.js index 22924443b..d7d020f49 100644 --- a/frontend/main/mainController.js +++ b/frontend/main/mainController.js @@ -141,6 +141,7 @@ mainCtrl.refreshUser = function refreshUser() { AuthService.reload(); + window.location.reload(); }; /** Return correct class according currently state. From 71691a988113bf13c941dcc5739d04ddde5aeef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 20 Feb 2019 09:23:34 -0300 Subject: [PATCH 267/606] Add institution as param to state on eventController --- frontend/app.js | 5 ++++- frontend/event/eventController.js | 14 +++++++++++++- frontend/institution/institutionController.js | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 4a675fb41..8c5bdda7c 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -88,7 +88,10 @@ "app/event/events_mobile.html", 475), controller: "EventController as eventCtrl", } - } + }, + params: { + institution: {}, + }, }) .state(STATES.CREATE_EVENT, { url: "/create_event/:eventKey", diff --git a/frontend/event/eventController.js b/frontend/event/eventController.js index c95a9a371..fe5467bc7 100644 --- a/frontend/event/eventController.js +++ b/frontend/event/eventController.js @@ -2,7 +2,7 @@ (function() { var app = angular.module('app'); - app.controller("EventController", function EventController(EventService, $state, $mdDialog, AuthService, $q, STATES, SCREEN_SIZES) { + app.controller("EventController", function EventController(EventService, $state, $mdDialog, AuthService, $q, STATES, SCREEN_SIZES, InstitutionService) { const eventCtrl = this; let content = document.getElementById("content"); @@ -269,6 +269,10 @@ eventCtrl.$onInit = () => { eventCtrl.institutionKey = $state.params.institutionKey; + eventCtrl.institution = $state.params.institution; + + ensureInstitution(); + if(Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE)) { eventCtrl._getMonths().then(() => { eventCtrl.setupToolbarFields(); @@ -277,5 +281,13 @@ eventCtrl.loadMoreEvents(); } }; + + function ensureInstitution() { + if (_.isEmpty(eventCtrl.institution) && !_.isNil(eventCtrl.institutionKey)) { + InstitutionService.getInstitution(eventCtrl.institutionKey).then((institution) => { + eventCtrl.institution = institution; + }); + } + } }); })(); \ No newline at end of file diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index 93a7f8906..72efd6567 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -213,7 +213,7 @@ }; function goToEventsMobile(institutionKey) { - UtilsService.selectNavOption(STATES.EVENTS,{institutionKey: institutionKey}); + UtilsService.selectNavOption(STATES.EVENTS,{institutionKey: institutionKey, institution: institutionCtrl.institution}); } function goToEventsDesktop(institutionKey) { From cbf6fbb2e7f9088312f4653a49dcfdb86d7ec548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 20 Feb 2019 09:24:16 -0300 Subject: [PATCH 268/606] Add institutionShowcase to events on mobile --- frontend/event/events_mobile.html | 2 ++ frontend/index.html | 5 ++++ .../institutionShowcase.component.js | 17 +++++++++++ .../institutionShowcase.css | 29 +++++++++++++++++++ .../institutionShowcase.html | 5 ++++ frontend/styles/custom.css | 5 ++++ 6 files changed, 63 insertions(+) create mode 100644 frontend/institution/institutionShowcase/institutionShowcase.component.js create mode 100644 frontend/institution/institutionShowcase/institutionShowcase.css create mode 100644 frontend/institution/institutionShowcase/institutionShowcase.html diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index 8c98fdea2..ae38cca5c 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -4,6 +4,8 @@
    + + diff --git a/frontend/index.html b/frontend/index.html index f784433e5..d1f4f6f76 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -74,6 +74,7 @@ + @@ -299,5 +300,9 @@ + + + + diff --git a/frontend/institution/institutionShowcase/institutionShowcase.component.js b/frontend/institution/institutionShowcase/institutionShowcase.component.js new file mode 100644 index 000000000..d1610a3bb --- /dev/null +++ b/frontend/institution/institutionShowcase/institutionShowcase.component.js @@ -0,0 +1,17 @@ +(function () { + 'use strict'; + + angular.module("app").component("institutionShowcase", { + templateUrl: "app/institution/institutionShowcase/institutionShowcase.html", + controller: institutionShowcaseController, + controllerAs: "institutionShowcaseCtrl", + bindings: { + institution: "<", + }, + }); + + function institutionShowcaseController() { + const institutionShowcaseCtrl = this; + } + +})(); \ No newline at end of file diff --git a/frontend/institution/institutionShowcase/institutionShowcase.css b/frontend/institution/institutionShowcase/institutionShowcase.css new file mode 100644 index 000000000..835a3f20c --- /dev/null +++ b/frontend/institution/institutionShowcase/institutionShowcase.css @@ -0,0 +1,29 @@ +.institution-showcase { + display: grid; + grid-template-columns: max-content auto; + grid-template-rows: max-content max-content; + grid-template-areas: + 'avatar name' + 'avatar text'; + grid-gap: 0 0.6rem; + padding: 0.6rem; + align-items: center; +} + +.institution-showcase__avatar { + grid-area: avatar; + height: 3em; + width: 3em; + border-radius: 50%; +} + +.institution-showcase__name { + grid-area: name; + line-height: 1rem; +} + +.institution-showcase__text { + grid-area: text; + font-size: 0.8em; + line-height: 1rem; +} \ No newline at end of file diff --git a/frontend/institution/institutionShowcase/institutionShowcase.html b/frontend/institution/institutionShowcase/institutionShowcase.html new file mode 100644 index 000000000..ddf0a0af8 --- /dev/null +++ b/frontend/institution/institutionShowcase/institutionShowcase.html @@ -0,0 +1,5 @@ +
    + + {{institutionShowcaseCtrl.institution.name }} + {{institutionShowcaseCtrl.institution.address.city }} +
    \ No newline at end of file diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index a639e9744..5d750a7d2 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -5,6 +5,11 @@ height: 100vh; } +.fill-width { + width: 100%; + min-width: 100%; +} + @media screen and (max-width: 1366px) { .fill-screen { min-height: 0; From ceb106590a232ef86fb3aef8ab1e6e66f2bf9b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 20 Feb 2019 09:28:12 -0300 Subject: [PATCH 269/606] Add showcase exhibition only when institutionKey exists in query --- frontend/event/events_mobile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index ae38cca5c..db84f979b 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -4,7 +4,7 @@
    - + From ce75f77c5a649b2e5e3bf1f4af24dd36313ff3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 20 Feb 2019 09:43:44 -0300 Subject: [PATCH 270/606] Fix institutionControllerSpec test to match modifications --- .../test/specs/institution/institutionControllerSpec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/test/specs/institution/institutionControllerSpec.js b/frontend/test/specs/institution/institutionControllerSpec.js index a84eb2c95..422e6edba 100644 --- a/frontend/test/specs/institution/institutionControllerSpec.js +++ b/frontend/test/specs/institution/institutionControllerSpec.js @@ -258,13 +258,13 @@ describe('goToEvents', function() { it('should call state.go with the right params', function(){ spyOn(utilsService, 'selectNavOption'); - institutionCtrl.posts = posts; + institutionCtrl.institution = first_institution; institutionCtrl.goToEvents(first_institution.key); expect(utilsService.selectNavOption).toHaveBeenCalledWith( - states.INST_EVENTS, + states.EVENTS, { institutionKey: first_institution.key, - posts: posts + institution: first_institution } ); }); From 13f4ccfa370cf3d4900bce3fd34cbdc67130346b Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 15 Feb 2019 10:21:55 -0300 Subject: [PATCH 271/606] Add new institution creation forms for mobile * These new forms are triggered from an admins invite --- frontend/app.js | 6 +- frontend/index.html | 8 ++ frontend/institution/configInstDirective.js | 81 +++++++++++- .../institution/create_inst_form_mobile.css | 119 ++++++++++++++++++ .../institution/create_inst_form_mobile.html | 52 ++++++++ .../institution/forms/finalForm.component.js | 21 ++++ frontend/institution/forms/final_form.html | 25 ++++ frontend/institution/forms/forms.css | 117 +++++++++++++++++ .../forms/institutionForm.component.js | 21 ++++ .../institution/forms/institution_form.html | 87 +++++++++++++ .../forms/locationForm.component.js | 21 ++++ frontend/institution/forms/location_form.html | 66 ++++++++++ frontend/invites/new_invite.css | 4 +- frontend/invites/new_invite_mobile.css | 72 +++++++++++ frontend/invites/new_invite_page_mobile.html | 87 +++++++++++++ 15 files changed, 781 insertions(+), 6 deletions(-) create mode 100644 frontend/institution/create_inst_form_mobile.css create mode 100644 frontend/institution/create_inst_form_mobile.html create mode 100644 frontend/institution/forms/finalForm.component.js create mode 100644 frontend/institution/forms/final_form.html create mode 100644 frontend/institution/forms/forms.css create mode 100644 frontend/institution/forms/institutionForm.component.js create mode 100644 frontend/institution/forms/institution_form.html create mode 100644 frontend/institution/forms/locationForm.component.js create mode 100644 frontend/institution/forms/location_form.html create mode 100644 frontend/invites/new_invite_mobile.css create mode 100644 frontend/invites/new_invite_page_mobile.html diff --git a/frontend/app.js b/frontend/app.js index 1d60d19ab..f17466650 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -268,7 +268,8 @@ url: "/:key/new_invite", views: { main: { - templateUrl: "app/invites/new_invite_page.html", + templateUrl: Utils.selectFieldBasedOnScreenSize("app/invites/new_invite_page.html", + "app/invites/new_invite_page_mobile.html"), controller: "NewInviteController as newInviteCtrl" } } @@ -297,7 +298,8 @@ url: "/create_institution_form", views: { main: { - templateUrl: "app/institution/create_inst_form.html", + templateUrl: Utils.selectFieldBasedOnScreenSize("app/institution/create_inst_form.html", + "app/institution/create_inst_form_mobile.html"), controller: "ConfigInstController as configInstCtrl" } }, diff --git a/frontend/index.html b/frontend/index.html index 269c4885f..c306c3809 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -56,7 +56,10 @@ + + + @@ -235,6 +238,11 @@ + + + + + diff --git a/frontend/institution/configInstDirective.js b/frontend/institution/configInstDirective.js index 2f8f13714..54752c45a 100644 --- a/frontend/institution/configInstDirective.js +++ b/frontend/institution/configInstDirective.js @@ -470,10 +470,87 @@ } }; - (function main(){ + configInstCtrl.stepColor = (step) => { + return configInstCtrl.getStep(step) ? 'light-green-500' : 'grey-500'; + }; + + configInstCtrl.previousStep = () => { + const currentStep = configInstCtrl.currentStep; + configInstCtrl.steps[currentStep] = false; + configInstCtrl.steps[currentStep - 1] = true; + } + + configInstCtrl.backButton = () => { + configInstCtrl.currentStep === 0 ? configInstCtrl.previousPage() : configInstCtrl.previousStep(); + } + + configInstCtrl.mobileSubmit = (event) => { + const newInstitution = new Institution(configInstCtrl.newInstitution); + let promise; + if (isCurrentStepValid(3) && newInstitution.isValid()) { + const parent = angular.element('#create-inst-content'); + const confirm = $mdDialog.confirm(event) + .parent(parent) + .clickOutsideToClose(true) + .title('FINALIZAR') + .textContent('Você deseja finalizar e salvar os dados da instituição?') + .ariaLabel('Finalizar') + .targetEvent(event) + .ok('Sim') + .cancel('Não'); + promise = $mdDialog.show(confirm); + promise.then(() => { + configInstCtrl.loadingSaveInstitution = true; + updateInstitution(); + $state.go(STATES.HOME).then(() => { + const alert = $mdDialog.alert({ + title: 'INSTITUIÇÃO CRIADA', + textContent: 'Estamos processando suas permissões hierárquicas. Em breve você receberá uma notificação e ficará habilitado para administrar a instituição e toda sua hierarquia na Plataforma Virtual CIS.', + ok: 'Fechar' + }); + $mdDialog.show(alert); + + }); + + }).catch(e => { + MessageService.showToast('Cancelado'); + }) + } else { + MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); + } + return promise; + } + + Object.defineProperty(configInstCtrl, 'currentStep', { + get: function() { + return _.findIndex(configInstCtrl.steps, s => s); + } + }); + + + Object.defineProperty(configInstCtrl, 'currentStepLabel', { + get: function() { + switch (configInstCtrl.currentStep) { + case 0: + return "Dados Cadastrais"; + break; + case 1: + return "Dados da Instituiçao"; + break; + case 2: + return "Finalizar Cadastro"; + break; + default: + return ""; + break; + } + } + }); + + configInstCtrl.$onInit = () => { configInstCtrl.institutionKey = institutionKey; configInstCtrl.initController(); - })(); + } }); app.directive("configInstitution", function() { diff --git a/frontend/institution/create_inst_form_mobile.css b/frontend/institution/create_inst_form_mobile.css new file mode 100644 index 000000000..418d1d796 --- /dev/null +++ b/frontend/institution/create_inst_form_mobile.css @@ -0,0 +1,119 @@ +md-content.grid-fill-screen { + display: grid; + height: 100%; +} + +#create-inst-content { + display: grid; + align-content: center; + justify-items: center; +} + +#create-inst-form-steps { + position: fixed; + top: 0; + width: 100%; + height: 3em; + background: white; + display: grid; + grid-auto-flow: column; + grid-auto-columns: min-content; + justify-content: space-around; + align-content: center; + z-index: 10; + box-shadow: 0px 2px 4px #00000022; +} + +#create-inst-form-steps > span { + display: grid; + align-content: center; + width: 2em; + height: 2em; + border-radius: 50%; +} + +#create-inst-form-steps > span > p { + color: white; + position: relative; + text-align: center; +} + +#create-inst-form-steps > hr { + align-self: center; + margin-left: -1em; + margin-right: -1em; + width: 4em; + height: 0; +} + +.ec-card { + width: 90%; + background: #ffffff; + border-radius: 0.2em; + align-content: center; + justify-items: center; + display: grid; + color: black; + padding: 0.5em; + margin-bottom: 2em; + margin-top: 1em; + /* height: 100%; */ +} + +#create-inst-card { + margin-top: 3.5em; + margin-bottom: 2em; +} + +#create-inst-card-content { + display: grid; + grid-template-rows: 2.6em 1fr 3em 2em; + width: 90%; + align-items: center; + justify-items: center; + color: black; + padding: 1em; +} + +#create-inst-card-content > h1 { + font-size: 1em; + font-weight: 500; + text-transform: uppercase; + justify-self: start; + margin-left: 0.4em; +} + +#create-inst-card-content > #forward-button { + justify-self: end; + margin-right: 0; +} + +#create-inst-card-content > #back-button { + /* position: relative; */ + margin-bottom: -4.5em; +} + +#create-inst-card-content > #form-switch { + width: 100%; +} + +#form-switch md-input-container { + margin: 0.4em 0 0.4em 0; +} + +#form-switch md-input-container.md-input-focused input { + border-color: #009688; +} + +#form-switch .md-select-icon { + color: #8cbf4d; +} + +#form-switch md-input-container .md-errors-spacer { + min-height: 0.2em; +} + +#form-switch md-input-container label { + color: #1f6357; + font-weight: 500; +} diff --git a/frontend/institution/create_inst_form_mobile.html b/frontend/institution/create_inst_form_mobile.html new file mode 100644 index 000000000..68a37cda8 --- /dev/null +++ b/frontend/institution/create_inst_form_mobile.html @@ -0,0 +1,52 @@ + +
    + +
    +

    {{ 1 }}

     +
    +

    {{ 2 }}

     +
    +

    {{ 3 }}

     +
    + +
    +
    +

    {{ configInstCtrl.currentStepLabel }}

    + +
    + + + + + + + + + +
    + + + Próximo + + + Finalizar + + + + keyboard_arrow_left + +
    +
    +
    +     diff --git a/frontend/institution/forms/finalForm.component.js b/frontend/institution/forms/finalForm.component.js new file mode 100644 index 000000000..baa74eb41 --- /dev/null +++ b/frontend/institution/forms/finalForm.component.js @@ -0,0 +1,21 @@ +'use strict'; + +(function () { + function controller() { + const ctrl = this; + + ctrl.$onInit = () => { + ctrl.configInstCtrl = ctrl.parentCtrl; + } + } + + const app = angular.module('app'); + app.component('finalForm', { + controller: controller, + controllerAs: 'ctrl', + templateUrl: 'app/institution/forms/final_form.html', + bindings: { + parentCtrl: '=', + } + }); +})(); diff --git a/frontend/institution/forms/final_form.html b/frontend/institution/forms/final_form.html new file mode 100644 index 000000000..f06db63d0 --- /dev/null +++ b/frontend/institution/forms/final_form.html @@ -0,0 +1,25 @@ +
    + + + + + + + + + + + + +
    +
    Este campo é obrigatório!
    +
    +     +
    diff --git a/frontend/institution/forms/forms.css b/frontend/institution/forms/forms.css new file mode 100644 index 000000000..58fe3e732 --- /dev/null +++ b/frontend/institution/forms/forms.css @@ -0,0 +1,117 @@ +#create-inst-card-content #location-data { + display: grid; + grid-template-areas: + "logradouro logradouro logradouro" + "no bairro bairro" + "pais estado cidade" + "cep cep cep"; + grid-template-columns: repeat(3, calc(100%/3)); + grid-template-rows: repeat(4, 1fr); +} + +#create-inst-card-content #location-data #logradouro { + grid-area: logradouro; +} + +#create-inst-card-content #location-data #no { + grid-area: no; +} + +#create-inst-card-content #location-data #bairro { + grid-area: bairro; +} + +#create-inst-card-content #location-data #cidade { + grid-area: cidade; +} + +#create-inst-card-content #location-data #estado { + grid-area: estado; +} + +#create-inst-card-content #location-data #pais { + grid-area: pais; +} + +#create-inst-card-content #location-data #cep { + grid-area: cep; +} + +.state-required { + font-size: 0.6em; + line-height: 1em; + overflow: visible; +} + +.limit-md-select { + justify-self: center; + display: grid; +} + +#create-inst-card-content md-select-value { + overflow: hidden; +} + +#create-inst-card-content #institution-data { + display: grid; + grid-template-rows: 1.2fr repeat(7, 1fr); + height: 100%; + width: 100%; +} + +#create-inst-card-content #inst-picture-picker { + display: grid; + grid-auto-flow: column; + grid-template-columns: 1fr 3fr; + background: #ddd; + margin-bottom: 1em; +} + +#inst-picture-picker .picture-picker { + width: 3.6em; + height: 3.6em; + align-self: center; + justify-self: center; +} + +#inst-picture-picker img.inst-picture { + width: 3.6em; + height: 3.6em; + border-radius: 50%; + margin: -0.6em 0 0 -0.6em; +} + + +#inst-picture-picker md-icon { + color: white; +} + +.inst-suggested-name { + align-self: center; + overflow: hidden; + line-height: 1.2em; + height: 3.6em; + font-size: 0.8em; + padding: 0.1em; +} + +#last-info { + display: grid; + grid-template-rows: 2fr 1fr 1fr; +} + +#last-info md-input-container#description { + align-items: center; + border: 1px solid; + border-color: #ccc; + border-radius: 0.4em; +} + +#last-info #description textarea { + height: 100% !important; + border: 0 !important; +} + +#create-inst-content button.md-primary { + color: #009688 !important; +} diff --git a/frontend/institution/forms/institutionForm.component.js b/frontend/institution/forms/institutionForm.component.js new file mode 100644 index 000000000..8bd479e0e --- /dev/null +++ b/frontend/institution/forms/institutionForm.component.js @@ -0,0 +1,21 @@ +'use strict'; + +(function () { + function controller() { + const ctrl = this; + + ctrl.$onInit = () => { + ctrl.configInstCtrl = ctrl.parentCtrl; + } + } + + const app = angular.module('app'); + app.component('institutionForm', { + controller: controller, + controllerAs: 'ctrl', + templateUrl: 'app/institution/forms/institution_form.html', + bindings: { + parentCtrl: '=', + } + }); +})(); diff --git a/frontend/institution/forms/institution_form.html b/frontend/institution/forms/institution_form.html new file mode 100644 index 000000000..7d96139a7 --- /dev/null +++ b/frontend/institution/forms/institution_form.html @@ -0,0 +1,87 @@ +
    +
    + + add_a_photo + + + {{ ctrl.configInstCtrl.suggestedName }} +
    + + + +
    +
    Este campo é obrigatório!
    +
    +     + + + +
    +
    Este campo é obrigatório!
    +
    O email deve ser válido!
    +
    +     + + + + + + + + {{ value }} + + +
    +
    Este campo é obrigatório!
    +
    +     + + + + {{ value }} + + +
    +
    Este campo é obrigatório!
    +
    +     + + + +
    +
    O número de telefone deve ser válido!
    +
    +     + + + +
    +
    O ramal deve ser válido!
    +
    +     +
    diff --git a/frontend/institution/forms/locationForm.component.js b/frontend/institution/forms/locationForm.component.js new file mode 100644 index 000000000..5d7b42a44 --- /dev/null +++ b/frontend/institution/forms/locationForm.component.js @@ -0,0 +1,21 @@ +'use strict'; + +(function () { + function controller() { + const ctrl = this; + + ctrl.$onInit = () => { + ctrl.configInstCtrl = ctrl.parentCtrl; + } + } + + const app = angular.module('app'); + app.component('locationForm', { + controller: controller, + controllerAs: 'ctrl', + templateUrl: 'app/institution/forms/location_form.html', + bindings: { + parentCtrl: '=', + } + }); +})(); diff --git a/frontend/institution/forms/location_form.html b/frontend/institution/forms/location_form.html new file mode 100644 index 000000000..a9a08f52a --- /dev/null +++ b/frontend/institution/forms/location_form.html @@ -0,0 +1,66 @@ +
    + + + + + + + + + + + + + + + + + {{ country.nome_pais }} + + + + + + + + + + + + {{ state.sigla }} + + + + + + + + + + + + + {{ city }} + + +
    +
    + Primeiro selecione um estado +
    +
    +     + + + + +
    diff --git a/frontend/invites/new_invite.css b/frontend/invites/new_invite.css index 6c9fe887d..cfb40410c 100644 --- a/frontend/invites/new_invite.css +++ b/frontend/invites/new_invite.css @@ -1,5 +1,5 @@ #content-new-invite{ - height: 100%; + height: 100%; display: grid; justify-items: center; align-items: center; @@ -45,7 +45,7 @@ @media screen and (max-width: 400px) { .new-invite-page-card { - max-width: 20em; + /* max-width: 20em; */ } #invite-by-text{ diff --git a/frontend/invites/new_invite_mobile.css b/frontend/invites/new_invite_mobile.css new file mode 100644 index 000000000..47bcf8f39 --- /dev/null +++ b/frontend/invites/new_invite_mobile.css @@ -0,0 +1,72 @@ +img.mobile-invite-logo { + width: 70%; +} + +.mobile-invite-btns { + display: grid; + width: 100%; + grid-auto-flow: column; + justify-content: end; +} + +#accept-invite-grid { + display: grid; +} + +.divisor-text { + font-size: 0.8em; + font-weight: 500; + margin-left: 1.6em; +} + +.invite-inst-name { + overflow: hidden; + line-height: 1.2em; + max-height: 3.6em; + font-size: 1em; + font-weight: normal; + padding: 0.1em; + text-align: left; + text-overflow: ellipsis; + justify-items: start; +} + +.ec-list-item { + display: grid; + grid-auto-flow: column; + grid-template-columns: 1fr 3fr; + background: #ddd; + margin-bottom: 1em; + align-content: center; + align-items: center; + justify-items: center; + padding: 0.8em; +} + +.ec-list-description { + width: 100%; + display: grid; + justify-content: left; + grid-auto-flow: row; +} + +.ec-list-description p { + margin: 0.2em; +} + +.ec-list-fade-text { + color: #888; +} + +.ec-list-avatar { + width: 2.8em; + height: 2.8em; + border-radius: 50%; + margin: -0.6em 0 0 -0.6em; +} + +#invite-back-button { + justify-self: center; + margin-bottom: -2.5em; + /* margin-top: 2em; */ +} diff --git a/frontend/invites/new_invite_page_mobile.html b/frontend/invites/new_invite_page_mobile.html new file mode 100644 index 000000000..3581e6c11 --- /dev/null +++ b/frontend/invites/new_invite_page_mobile.html @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + +
    + +
    +

    VOCÊ RECEBEU UM CONVITE DE:

    +
    +
    + {{newInviteCtrl.institution.name}} +
    +
    +

    {{ newInviteCtrl.institution.name }}

    +

    {{ newInviteCtrl.institution.institutional_email }}

    +
    +
    +
    +

    + PREENCHA O FORMULÁRIO PARA CADASTRAR A INSTITUIÇÃO: +

    + + +
    +
    +
    + + account_balance + +
    +
    +

    {{ newInviteCtrl.invite.suggestion_institution_name }}

    +
    +
    +
    +
    +
    +
    + + Rejeitar + + + Próximo + +
    + +
    +
    + + + keyboard_arrow_left + + + + + + +
    + +
    +
    +

    Este convite já foi processado!

    +
    +     + + + VOLTAR + + +     + + From 33b078a0500207d18f21f86c1b8a84074f55f0b9 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 20 Feb 2019 09:51:33 -0300 Subject: [PATCH 272/606] create function to reload page --- frontend/main/main.html | 2 +- frontend/main/mainController.js | 6 +++++- frontend/test/specs/main/mainControllerSpec.js | 14 ++++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/frontend/main/main.html b/frontend/main/main.html index 256196fb7..804b917fe 100644 --- a/frontend/main/main.html +++ b/frontend/main/main.html @@ -36,7 +36,7 @@
    -
    +
    refresh diff --git a/frontend/main/mainController.js b/frontend/main/mainController.js index d7d020f49..6872bbbc0 100644 --- a/frontend/main/mainController.js +++ b/frontend/main/mainController.js @@ -141,7 +141,11 @@ mainCtrl.refreshUser = function refreshUser() { AuthService.reload(); - window.location.reload(); + }; + + mainCtrl.updateVersion = function updateVersion() { + AuthService.reload(); + $window.location.reload(); }; /** Return correct class according currently state. diff --git a/frontend/test/specs/main/mainControllerSpec.js b/frontend/test/specs/main/mainControllerSpec.js index 07eb285f4..754c51231 100644 --- a/frontend/test/specs/main/mainControllerSpec.js +++ b/frontend/test/specs/main/mainControllerSpec.js @@ -1,7 +1,7 @@ 'use strict'; (describe('Test MainController', function() { - let mainCtrl, httpBackend, scope, createCtrl, state, states, mainToolbar; + let mainCtrl, httpBackend, scope, createCtrl, state, states, mainToolbar, $window; let authService, requestInvitationService, notificationListenerService, utilsService; const user = { @@ -79,7 +79,6 @@ spyOn(requestInvitationService, 'getChildrenRequests').and.callFake(callFake); spyOn(NotificationListenerService, 'multipleEventsListener').and.callFake(eventsListenerFake); - authService.login(user); httpBackend.when('GET', "main/main.html").respond(200); @@ -217,4 +216,15 @@ expect(authService.reload).toHaveBeenCalled(); }); }); + + describe('updateVersion', () => { + beforeAll(() => { + $window = jasmine.createSpy('$window'); + }); + it('should call reload()', () => { + spyOn(authService, 'reload'); + mainCtrl.refreshUser(); + expect(authService.reload).toHaveBeenCalled(); + }); + }); })); \ No newline at end of file From 5527eec58312510eec021a739d288be9521c9239 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 20 Feb 2019 10:03:08 -0300 Subject: [PATCH 273/606] fixing edit_info scrolll --- frontend/institution/edit_info.html | 4 ++-- frontend/institution/edit_info_mobile.html | 2 +- frontend/institution/edit_registration_data.html | 4 ++-- frontend/institution/edit_registration_data_mobile.css | 2 +- frontend/institution/management_institution_page.html | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/institution/edit_info.html b/frontend/institution/edit_info.html index a03f95de6..6a60f207b 100644 --- a/frontend/institution/edit_info.html +++ b/frontend/institution/edit_info.html @@ -5,8 +5,8 @@

    Edição de informações Institucionais

     - - + +
    diff --git a/frontend/institution/edit_info_mobile.html b/frontend/institution/edit_info_mobile.html index 7114582fe..e54ccbf3b 100644 --- a/frontend/institution/edit_info_mobile.html +++ b/frontend/institution/edit_info_mobile.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/institution/edit_registration_data.html b/frontend/institution/edit_registration_data.html index 7e3a88b11..5fbb54298 100644 --- a/frontend/institution/edit_registration_data.html +++ b/frontend/institution/edit_registration_data.html @@ -1,8 +1,8 @@ -
    -
    +
    +
    - -
    + +
    From 550bb3162f7d3f1797064833357cc53bf875ff71 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 20 Feb 2019 10:09:20 -0300 Subject: [PATCH 274/606] added documentation --- frontend/main/mainController.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/main/mainController.js b/frontend/main/mainController.js index 6872bbbc0..5b0acf4ce 100644 --- a/frontend/main/mainController.js +++ b/frontend/main/mainController.js @@ -143,8 +143,10 @@ AuthService.reload(); }; + /** Should update version, refresh user and reload the page. + */ mainCtrl.updateVersion = function updateVersion() { - AuthService.reload(); + mainCtrl.refreshUser(); $window.location.reload(); }; From 5d05c562c6d4177e622bd8d73a8cc97efc65f388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 20 Feb 2019 10:22:20 -0300 Subject: [PATCH 275/606] Remove posts injection from controller --- frontend/institution/institutionController.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index d779ecff0..42f047976 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -223,8 +223,7 @@ } function goToEventsDesktop(institutionKey) { - UtilsService.selectNavOption(STATES.INST_EVENTS, - {institutionKey: institutionKey, posts: institutionCtrl.posts}); + UtilsService.selectNavOption(STATES.INST_EVENTS, {institutionKey: institutionKey}); } institutionCtrl.goToLinks = function goToLinks(institutionKey) { From 72c9517b0b57888bfee97286df2a8fdb187d8ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 20 Feb 2019 10:26:42 -0300 Subject: [PATCH 276/606] Remove institution as param --- frontend/app.js | 3 --- frontend/event/eventController.js | 8 +++----- frontend/institution/institutionController.js | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 7b3427104..4105ff758 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -89,9 +89,6 @@ controller: "EventController as eventCtrl", } }, - params: { - institution: {}, - }, }) .state(STATES.CREATE_EVENT, { url: "/create_event/:eventKey", diff --git a/frontend/event/eventController.js b/frontend/event/eventController.js index fe5467bc7..571e2ac1f 100644 --- a/frontend/event/eventController.js +++ b/frontend/event/eventController.js @@ -269,9 +269,7 @@ eventCtrl.$onInit = () => { eventCtrl.institutionKey = $state.params.institutionKey; - eventCtrl.institution = $state.params.institution; - - ensureInstitution(); + getCurrentInstitution(); if(Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE)) { eventCtrl._getMonths().then(() => { @@ -282,8 +280,8 @@ } }; - function ensureInstitution() { - if (_.isEmpty(eventCtrl.institution) && !_.isNil(eventCtrl.institutionKey)) { + function getCurrentInstitution() { + if (!_.isNil(eventCtrl.institutionKey)) { InstitutionService.getInstitution(eventCtrl.institutionKey).then((institution) => { eventCtrl.institution = institution; }); diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index 42f047976..cb9db478d 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -219,7 +219,7 @@ }; function goToEventsMobile(institutionKey) { - UtilsService.selectNavOption(STATES.EVENTS,{institutionKey: institutionKey, institution: institutionCtrl.institution}); + UtilsService.selectNavOption(STATES.EVENTS,{institutionKey: institutionKey}); } function goToEventsDesktop(institutionKey) { From d21ace703e0f2319323e6343ab42a0151504f6f8 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 20 Feb 2019 10:27:24 -0300 Subject: [PATCH 277/606] add mock to --- frontend/test/specs/main/mainControllerSpec.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/test/specs/main/mainControllerSpec.js b/frontend/test/specs/main/mainControllerSpec.js index 754c51231..c8917c8c6 100644 --- a/frontend/test/specs/main/mainControllerSpec.js +++ b/frontend/test/specs/main/mainControllerSpec.js @@ -1,9 +1,10 @@ 'use strict'; (describe('Test MainController', function() { - let mainCtrl, httpBackend, scope, createCtrl, state, states, mainToolbar, $window; + let mainCtrl, httpBackend, scope, createCtrl, state, states, mainToolbar; let authService, requestInvitationService, notificationListenerService, utilsService; + const window = {'location': {'reload': function(){}}}; const user = { name: 'user', key: 'user-key', @@ -86,10 +87,12 @@ httpBackend.when('GET', "error/user_inactive.html").respond(200); httpBackend.when('GET', "home/home.html").respond(200); httpBackend.when('GET', "auth/login.html").respond(200); + createCtrl = function() { return $controller('MainController', { scope: scope, - AuthService: authService + AuthService: authService, + $window: window }); }; mainCtrl = createCtrl(); @@ -218,12 +221,9 @@ }); describe('updateVersion', () => { - beforeAll(() => { - $window = jasmine.createSpy('$window'); - }); it('should call reload()', () => { spyOn(authService, 'reload'); - mainCtrl.refreshUser(); + mainCtrl.updateVersion(); expect(authService.reload).toHaveBeenCalled(); }); }); From 8c07f794e63120d91eb8b79f942379d6c6cf4733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 20 Feb 2019 10:27:55 -0300 Subject: [PATCH 278/606] Create new institution from data received from request --- frontend/event/eventController.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/event/eventController.js b/frontend/event/eventController.js index 571e2ac1f..588f23d8f 100644 --- a/frontend/event/eventController.js +++ b/frontend/event/eventController.js @@ -282,8 +282,8 @@ function getCurrentInstitution() { if (!_.isNil(eventCtrl.institutionKey)) { - InstitutionService.getInstitution(eventCtrl.institutionKey).then((institution) => { - eventCtrl.institution = institution; + InstitutionService.getInstitution(eventCtrl.institutionKey).then((institutionData) => { + eventCtrl.institution = new Institution(institutionData); }); } } From f26140cf7444313b25f0eb804add61da6acc05cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 20 Feb 2019 10:31:00 -0300 Subject: [PATCH 279/606] Fix institutionControllerSpec state.go events test --- frontend/test/specs/institution/institutionControllerSpec.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/test/specs/institution/institutionControllerSpec.js b/frontend/test/specs/institution/institutionControllerSpec.js index 422e6edba..e2117ddb0 100644 --- a/frontend/test/specs/institution/institutionControllerSpec.js +++ b/frontend/test/specs/institution/institutionControllerSpec.js @@ -258,13 +258,11 @@ describe('goToEvents', function() { it('should call state.go with the right params', function(){ spyOn(utilsService, 'selectNavOption'); - institutionCtrl.institution = first_institution; institutionCtrl.goToEvents(first_institution.key); expect(utilsService.selectNavOption).toHaveBeenCalledWith( states.EVENTS, { institutionKey: first_institution.key, - institution: first_institution } ); }); From cbda308f0fbfc522bc57c1ad6bafe44193ad3360 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 20 Feb 2019 10:54:59 -0300 Subject: [PATCH 280/606] Making toolbar position as fixed --- frontend/institution/edit_info_mobile.html | 2 +- frontend/institution/edit_registration_data.html | 6 +++--- frontend/institution/edit_registration_data_mobile.css | 2 +- frontend/institution/management_institution_page.html | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/institution/edit_info_mobile.html b/frontend/institution/edit_info_mobile.html index e54ccbf3b..0735a7fd0 100644 --- a/frontend/institution/edit_info_mobile.html +++ b/frontend/institution/edit_info_mobile.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/institution/edit_registration_data.html b/frontend/institution/edit_registration_data.html index 5fbb54298..8c47749ac 100644 --- a/frontend/institution/edit_registration_data.html +++ b/frontend/institution/edit_registration_data.html @@ -1,8 +1,8 @@ + title-class="edit-inst-toolbar-title" class="edit-registration-data-top-bar"> -
    -
    +
    +
    - -
    + +
    From 8423b76bf58a184b5db6066be4932b4ff614400a Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 20 Feb 2019 11:00:28 -0300 Subject: [PATCH 281/606] Some cleaning up --- frontend/institution/edit_info.html | 2 +- frontend/institution/edit_info_mobile.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/institution/edit_info.html b/frontend/institution/edit_info.html index 6a60f207b..b68266073 100644 --- a/frontend/institution/edit_info.html +++ b/frontend/institution/edit_info.html @@ -6,7 +6,7 @@

    Edição de informações Institucionais

    - +
    diff --git a/frontend/institution/edit_info_mobile.html b/frontend/institution/edit_info_mobile.html index 0735a7fd0..7114582fe 100644 --- a/frontend/institution/edit_info_mobile.html +++ b/frontend/institution/edit_info_mobile.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From e958f89f08a9f61f090bc0d3fbda78a7de813dd6 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 20 Feb 2019 11:10:00 -0300 Subject: [PATCH 282/606] added test --- frontend/test/specs/event/eventDetailsControllerSpec.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/test/specs/event/eventDetailsControllerSpec.js b/frontend/test/specs/event/eventDetailsControllerSpec.js index 59e6f5bbf..722022e6a 100644 --- a/frontend/test/specs/event/eventDetailsControllerSpec.js +++ b/frontend/test/specs/event/eventDetailsControllerSpec.js @@ -2,7 +2,8 @@ (describe('Test EventDetailsController', function () { - let eventCtrl, scope, httpBackend, rootScope, deffered, eventService, messageService, mdDialog, state, clipboard, q; + let eventCtrl, scope, httpBackend, rootScope, deffered, eventService, + messageService, mdDialog, state, clipboard, q, states; const splab = { name: 'Splab', key: '098745' }, @@ -38,7 +39,7 @@ beforeEach(module('app')); beforeEach(inject(function ($controller, $httpBackend, $http, $q, AuthService, - $rootScope, EventService, MessageService, $mdDialog, $state, ngClipboard) { + $rootScope, EventService, MessageService, $mdDialog, $state, ngClipboard, STATES) { scope = $rootScope.$new(); httpBackend = $httpBackend; rootScope = $rootScope; @@ -49,6 +50,7 @@ state = $state; clipboard = ngClipboard; q = $q; + states = STATES; AuthService.login(user); eventCtrl = $controller('EventDetailsController', { @@ -74,6 +76,7 @@ describe('confirmDeleteEvent()', function () { beforeEach(function () { spyOn(mdDialog, 'confirm').and.callThrough(); + spyOn(state, 'go').and.callThrough(); spyOn(mdDialog, 'show').and.callFake(function () { return { then: function (callback) { @@ -93,6 +96,7 @@ expect(eventService.deleteEvent).toHaveBeenCalledWith(other_event); expect(mdDialog.confirm).toHaveBeenCalled(); expect(mdDialog.show).toHaveBeenCalled(); + expect(state.go).toHaveBeenCalledWith(states.EVENTS); }); }); From 4a1fc9f34dd065ff2ab13353611ecee6f4b769bc Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 20 Feb 2019 11:16:53 -0300 Subject: [PATCH 283/606] TTesting component's controller --- .../toolbar/whiteToolbarControllerSpec.js | 33 +++++++++++++++++++ frontend/toolbar/whiteToolbar.component.js | 2 +- .../configProfile/configProfileController.js | 7 ++-- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 frontend/test/specs/toolbar/whiteToolbarControllerSpec.js diff --git a/frontend/test/specs/toolbar/whiteToolbarControllerSpec.js b/frontend/test/specs/toolbar/whiteToolbarControllerSpec.js new file mode 100644 index 000000000..0f44bae74 --- /dev/null +++ b/frontend/test/specs/toolbar/whiteToolbarControllerSpec.js @@ -0,0 +1,33 @@ +'use strict'; + +describe('DefaultToolbarController test', () => { + beforeEach(module('app')); + + let scope, whiteToolbarCtrl, window; + + beforeEach(inject(function ($componentController, $rootScope, SCREEN_SIZES, $window) { + scope = $rootScope.$new(); + window = $window; + whiteToolbarCtrl = $componentController('whiteToolbar', null, { + scope: scope, + SCREEN_SIZES: SCREEN_SIZES, + $window: window + }); + })); + + describe('isMobileScreen()', () => { + it('should call isMobileScreen', () => { + spyOn(Utils, 'isMobileScreen'); + whiteToolbarCtrl.isMobileScreen(); + expect(Utils.isMobileScreen).toHaveBeenCalled(); + }); + }); + + describe('goBack()', () => { + it('should call back()', () => { + spyOn(window.history, 'back'); + whiteToolbarCtrl.goBack(); + expect(window.history.back).toHaveBeenCalled(); + }); + }); +}); \ No newline at end of file diff --git a/frontend/toolbar/whiteToolbar.component.js b/frontend/toolbar/whiteToolbar.component.js index d36c85a14..0fa2a2bf7 100644 --- a/frontend/toolbar/whiteToolbar.component.js +++ b/frontend/toolbar/whiteToolbar.component.js @@ -1,3 +1,4 @@ + 'use strict'; (function () { @@ -23,7 +24,6 @@ }; whiteToolbarCtrl.isMobileScreen = () => { - console.log(Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE)); return Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE); }; } diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index 992458a22..135479717 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -24,7 +24,7 @@ configProfileCtrl.$onInit = () => { configProfileCtrl._setupUser(); - configProfileCtrl.toolbarItems(); + configProfileCtrl.setSaveButton(); } configProfileCtrl._setupUser = () => { @@ -182,7 +182,10 @@ window.history.back(); }; - configProfileCtrl.toolbarItems = () => { + /** + * Sets save button's properties. + */ + configProfileCtrl.setSaveButton = () => { configProfileCtrl.saveButton = { class: 'config-profile__toolbar--save', action: configProfileCtrl.finish, From 574c0933b9d9f102c5ce2822fbca8197e00bb204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 20 Feb 2019 11:19:42 -0300 Subject: [PATCH 284/606] Remove margin from event on mobile --- frontend/event/event.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/event/event.css b/frontend/event/event.css index 6013bf24d..b8b75dc4c 100644 --- a/frontend/event/event.css +++ b/frontend/event/event.css @@ -140,8 +140,7 @@ } .centralized-event-content, .event-day-properties { - margin-left: auto; - margin-right: auto; + margin: 0; } #menu-button { From 1c7570510803ef1bb2f0a2537f1b62bbdcaf789b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 20 Feb 2019 11:21:02 -0300 Subject: [PATCH 285/606] Add background color to institution showcase --- frontend/institution/institutionShowcase/institutionShowcase.css | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/institution/institutionShowcase/institutionShowcase.css b/frontend/institution/institutionShowcase/institutionShowcase.css index 835a3f20c..d40e7ff00 100644 --- a/frontend/institution/institutionShowcase/institutionShowcase.css +++ b/frontend/institution/institutionShowcase/institutionShowcase.css @@ -8,6 +8,7 @@ grid-gap: 0 0.6rem; padding: 0.6rem; align-items: center; + background-color: #E0E0E0; } .institution-showcase__avatar { From 63aa3104117ff7f9643f77db514d8fd02880a99b Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 20 Feb 2019 11:59:19 -0300 Subject: [PATCH 286/606] fix css of info admins --- frontend/institution/management_institution.css | 4 ++++ frontend/institution/management_members.html | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/institution/management_institution.css b/frontend/institution/management_institution.css index e261fbc37..7972cff6a 100644 --- a/frontend/institution/management_institution.css +++ b/frontend/institution/management_institution.css @@ -57,6 +57,10 @@ margin-top: 5px; } +.padding-div-info-admin{ + padding-left: 15px; +} + @media screen and (min-width: 601px) { .edit-inst-name, .edit-inst-street { width: 59%; diff --git a/frontend/institution/management_members.html b/frontend/institution/management_members.html index ca79f524f..032748a42 100644 --- a/frontend/institution/management_members.html +++ b/frontend/institution/management_members.html @@ -91,19 +91,19 @@

    {{ manageMemberCtrl.institution.admin.name }}

    -
    -
    +

    {{ manageMemberCtrl.getMemberName(invite.invitee_key) }}

    {{ invite.invitee }}

    -
    +

    PENDENTE

    Date: Wed, 20 Feb 2019 13:33:48 -0300 Subject: [PATCH 287/606] created clickable card component --- frontend/index.html | 2 ++ .../clickableCard/clickableCard.component.js | 27 +++++++++++++++++++ .../utils/clickableCard/clickable_card.css | 27 +++++++++++++++++++ .../utils/clickableCard/clickable_card.html | 12 +++++++++ 4 files changed, 68 insertions(+) create mode 100644 frontend/utils/clickableCard/clickableCard.component.js create mode 100644 frontend/utils/clickableCard/clickable_card.css create mode 100644 frontend/utils/clickableCard/clickable_card.html diff --git a/frontend/index.html b/frontend/index.html index 63bfdd6b8..19bfdf247 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -69,6 +69,7 @@ + @@ -166,6 +167,7 @@ + diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js new file mode 100644 index 000000000..ef37656b5 --- /dev/null +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -0,0 +1,27 @@ +"use strict"; + +(()=> { + angular + .module('app') + .component("clickableCard", { + templateUrl: 'app/utils/clickableCard/clickable_card.html', + controller: ClickableCardController, + controllerAs: 'clickableCardCtrl', + bindings: { + icon: '@', + title: '@' + }, + transclude: true + }); + + function ClickableCardController() { + const clickableCardCtrl = this; + + clickableCardCtrl.isOpen = false; + + clickableCardCtrl.onClick = () => { + clickableCardCtrl.isOpen = !clickableCardCtrl.isOpen; + } + } + +})(); \ No newline at end of file diff --git a/frontend/utils/clickableCard/clickable_card.css b/frontend/utils/clickableCard/clickable_card.css new file mode 100644 index 000000000..138317c02 --- /dev/null +++ b/frontend/utils/clickableCard/clickable_card.css @@ -0,0 +1,27 @@ +.clickable-card__toolbar { + background-color: #FFFFFF !important; + box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.5); +} + +#clickable-card__icon--start { + color: #707070; + margin: 0 1em 0 0; + +} + +#clickable-card__icon--end { + color: green; + margin: 0 0 0 auto; +} + + +.clickable-card__title { + color: #004D41; + font-weight: 500; + text-transform: uppercase; + font-size: 0.9em; +} + +.clickable-card__content { + padding: 0 1em; +} \ No newline at end of file diff --git a/frontend/utils/clickableCard/clickable_card.html b/frontend/utils/clickableCard/clickable_card.html new file mode 100644 index 000000000..f7471dbbe --- /dev/null +++ b/frontend/utils/clickableCard/clickable_card.html @@ -0,0 +1,12 @@ +
    + +
    + {{clickableCardCtrl.icon}} + {{ clickableCardCtrl.title}} + {{ clickableCardCtrl.isOpen ? 'arrow_drop_up' : 'arrow_drop_down' }} +
    +     +
    + +
    +
    \ No newline at end of file From 9c4104e8eae8cb040d453be20053f6f7f75e9b7f Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 20 Feb 2019 14:14:49 -0300 Subject: [PATCH 288/606] adding some jsdocs --- frontend/toolbar/whiteToolbar.component.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frontend/toolbar/whiteToolbar.component.js b/frontend/toolbar/whiteToolbar.component.js index 0fa2a2bf7..65bb752e3 100644 --- a/frontend/toolbar/whiteToolbar.component.js +++ b/frontend/toolbar/whiteToolbar.component.js @@ -19,10 +19,16 @@ function WhiteToolbarController($window, SCREEN_SIZES) { const whiteToolbarCtrl = this; + /** + * Redirect the user to the previous page. + */ whiteToolbarCtrl.goBack = () => { return $window.history.back(); }; + /** + * Returns true if the application is being used by a mobile + */ whiteToolbarCtrl.isMobileScreen = () => { return Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE); }; From 51b82611314ccace25b39f8140a64acd21ead40d Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 14:17:30 -0300 Subject: [PATCH 289/606] used the clickableCard on manage members page --- frontend/index.html | 1 + .../institution/management_members_mobile.css | 10 ++++++++++ .../management_members_mobile.html | 19 +++++++++++++++++++ .../utils/clickableCard/clickable_card.css | 14 +++++++++----- .../utils/clickableCard/clickable_card.html | 16 ++++++++-------- 5 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 frontend/institution/management_members_mobile.css create mode 100644 frontend/institution/management_members_mobile.html diff --git a/frontend/index.html b/frontend/index.html index 19bfdf247..637df6afc 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -42,6 +42,7 @@ + diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/management_members_mobile.css new file mode 100644 index 000000000..dba17387f --- /dev/null +++ b/frontend/institution/management_members_mobile.css @@ -0,0 +1,10 @@ +.manage-members { + display: grid; + grid-template-rows: 6em auto 1em; +} + +.manage-members__cards { + grid-row-start: 2; + display: grid; + grid-row-gap: 1em; +} \ No newline at end of file diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html new file mode 100644 index 000000000..561d7a05f --- /dev/null +++ b/frontend/institution/management_members_mobile.html @@ -0,0 +1,19 @@ + +
    + +

    membros

    +     + +

    membros

    +     + +

    membros

    +     + +

    membros

    +     + +

    membros

    +     +
    +     \ No newline at end of file diff --git a/frontend/utils/clickableCard/clickable_card.css b/frontend/utils/clickableCard/clickable_card.css index 138317c02..e9897228b 100644 --- a/frontend/utils/clickableCard/clickable_card.css +++ b/frontend/utils/clickableCard/clickable_card.css @@ -1,16 +1,19 @@ +.clickable-card { + display: grid; + box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.3); +} + .clickable-card__toolbar { background-color: #FFFFFF !important; - box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.5); } #clickable-card__icon--start { color: #707070; margin: 0 1em 0 0; - } #clickable-card__icon--end { - color: green; + color: #17ea17; margin: 0 0 0 auto; } @@ -19,9 +22,10 @@ color: #004D41; font-weight: 500; text-transform: uppercase; - font-size: 0.9em; + font-size: 0.7em; } .clickable-card__content { - padding: 0 1em; + background-color: #FFFFFF; + padding: 0 1em 1.5em 1em; } \ No newline at end of file diff --git a/frontend/utils/clickableCard/clickable_card.html b/frontend/utils/clickableCard/clickable_card.html index f7471dbbe..a751bdccb 100644 --- a/frontend/utils/clickableCard/clickable_card.html +++ b/frontend/utils/clickableCard/clickable_card.html @@ -1,12 +1,12 @@
    -
    - {{clickableCardCtrl.icon}} - {{ clickableCardCtrl.title}} - {{ clickableCardCtrl.isOpen ? 'arrow_drop_up' : 'arrow_drop_down' }} -
    -     -
    - +
    + {{clickableCardCtrl.icon}} + {{ clickableCardCtrl.title}} + {{ clickableCardCtrl.isOpen ? 'arrow_drop_up' : 'arrow_drop_down' }}
    + +
    + +
    \ No newline at end of file From 5124aa4d7ebe41817d8005904c50a1b10e9f9d61 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 20 Feb 2019 14:30:45 -0300 Subject: [PATCH 290/606] Adding menu button as a possibility in the component --- frontend/toolbar/whiteToolbar.component.js | 3 ++- frontend/toolbar/white_toolbar_mobile.css | 9 ++++++++- frontend/toolbar/white_toolbar_mobile.html | 19 ++++++++++++++++++- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/frontend/toolbar/whiteToolbar.component.js b/frontend/toolbar/whiteToolbar.component.js index 65bb752e3..28174f0d0 100644 --- a/frontend/toolbar/whiteToolbar.component.js +++ b/frontend/toolbar/whiteToolbar.component.js @@ -12,7 +12,8 @@ title: '@', rightButton: '=', primaryButtonIcon: '@', - titleClass: '@' + titleClass: '@', + menuOptions: '=' } }); diff --git a/frontend/toolbar/white_toolbar_mobile.css b/frontend/toolbar/white_toolbar_mobile.css index 4d14147f2..5024e29a1 100644 --- a/frontend/toolbar/white_toolbar_mobile.css +++ b/frontend/toolbar/white_toolbar_mobile.css @@ -10,7 +10,7 @@ align-items: center; } -.tst { +.toolbar-icon-alignment { font-size: 2.5em; line-height: inherit !important; } @@ -20,4 +20,11 @@ font-size: 0.8em; word-break: normal; grid-column-end: 4 !important; +} + +.white-toolbar-menu-button { + grid-column-start: 3; + grid-column-end: 4; + justify-self: end; + align-self: center; } \ No newline at end of file diff --git a/frontend/toolbar/white_toolbar_mobile.html b/frontend/toolbar/white_toolbar_mobile.html index 7152d69b4..217f42200 100644 --- a/frontend/toolbar/white_toolbar_mobile.html +++ b/frontend/toolbar/white_toolbar_mobile.html @@ -1,6 +1,6 @@
    - {{whiteToolbarCtrl.primaryButtonIcon}} + {{whiteToolbarCtrl.primaryButtonIcon}}
    @@ -13,4 +13,21 @@ {{whiteToolbarCtrl.rightButton.icon}} +
    + + + more_vert + + + +
    + + {{option.icon}} + + {{option.title}} +
    +     +     +     +
    \ No newline at end of file From 1825307edf0b31abf10300578970f04ce8789754 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 20 Feb 2019 14:32:45 -0300 Subject: [PATCH 291/606] adding missing semicolon --- frontend/user/configProfile/configProfileController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index 135479717..43b23a41d 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -25,7 +25,7 @@ configProfileCtrl.$onInit = () => { configProfileCtrl._setupUser(); configProfileCtrl.setSaveButton(); - } + }; configProfileCtrl._setupUser = () => { if(configProfileCtrl.canEdit()) { From 3713700b84f4128b8dea42d2f09ec0c380f6278f Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 20 Feb 2019 14:57:05 -0300 Subject: [PATCH 292/606] removing scrollbar from my profile page --- frontend/user/configProfile/config_profile_mobile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/user/configProfile/config_profile_mobile.html b/frontend/user/configProfile/config_profile_mobile.html index 33ae6949b..9407ea58d 100644 --- a/frontend/user/configProfile/config_profile_mobile.html +++ b/frontend/user/configProfile/config_profile_mobile.html @@ -1,7 +1,7 @@ - +
    From d5bf302056294f85785e28ac36f319f297b1eb2d Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 20 Feb 2019 11:51:01 -0300 Subject: [PATCH 293/606] Add CreateInvitedInstitutionController and spec --- frontend/index.html | 1 + .../createInvitedInstitutionController.js | 101 ++++++++++ .../createInvitedInstitutionSpec.js | 184 ++++++++++++++++++ 3 files changed, 286 insertions(+) create mode 100644 frontend/institution/createInvitedInstitutionController.js create mode 100644 frontend/test/specs/institution/createInvitedInstitutionSpec.js diff --git a/frontend/index.html b/frontend/index.html index c306c3809..46109fecd 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -237,6 +237,7 @@ + diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js new file mode 100644 index 000000000..34a2e75d2 --- /dev/null +++ b/frontend/institution/createInvitedInstitutionController.js @@ -0,0 +1,101 @@ +'use strict'; +(function() { + angular.module('app') + .controller('CreateInvitedInstitutionController', + ['STATES', '$state', 'AuthService', 'InstitutionService', 'MessageService', + function (STATES, $state, AuthService, InstitutionService, MessageService) { + const ctrl = this; + ctrl.loading = true; + ctrl.currentStep = 0; + + ctrl.stepColor = (step) => { + return ctrl.currentStep === step ? 'light-green-500' : 'grey-500'; + }; + + ctrl.backButton = () => { + configInstCtrl.currentStep === 0 ? window.history.back() : ctrl.previousStep(); + } + + // loadInstitution + ctrl.loadInstitution = () => { + InstitutionService.getInstitution(ctrl.institutionKey).then(res => { + ctrl.newInstitution = res; + ctrl.suggestedName = res.name; + + // Set default values + ctrl.newInstitution.address = new Address(res.address); + ctrl.newInstitution.address.country = ctrl.newInstitution.address.country || 'Brasil'; + ctrl.newInstitution.photo_url = ctrl.newInstitution.photo_url || 'app/images/institution.png'; + ctrl.loading = false; + }, e => { + ctrl.loading = true; + }) + } + + // isCurrentStepValid + // isValidAddress + // getFields + ctrl.isCurrentStepValid = () => { + const step = ctrl.currentStep; + const institution = ctrl.newInstitution; + + const testValids = (obj, ...fields) => { + let valid = true; + _.forEach(fields, f => { + if (_.isUndefined(obj[f]) || _.isEmpty(obj[f])) { + valid = false; + }; + }) + return valid; + } + + const validAddress = () => { + const address = institution.address; + if (address && !_.isEmpty(address.country)) { + if (address.country === 'Brasil') { + testValids(address, 'street', 'federal_state', 'neighbourhood'); + } else { + return true; + } + } + return false; + } + + const stepValidation = { + 0: validAddress(), + 1: testValids(institution, 'name', 'actuation_area', 'legal_nature', + 'institutional_email'), + 2: testValids(institution, 'description', 'leader'), + } + + return stepValidation[step]; + }; + + // nextStep + ctrl.nextStep = () => { + if (ctrl.isCurrentStepValid()) { + ctrl.currentStep += 1; + } else { + MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); + } + } + + // previousStep + ctrl.previousStep = () => { + if (ctrl.currentStep === 0) return; + ctrl.currentStep -= 1; + } + + // main() + // initController() + // setDefaultPhotoUrl + ctrl.$onInit = () => { + ctrl.institutionKey = $state.params.institutionKey; + if (ctrl.institutionKey) { + ctrl.loadInstitution(ctrl.institutionKey) + } else { + $state.go(STATES.HOME); + } + } + }]); +})(); diff --git a/frontend/test/specs/institution/createInvitedInstitutionSpec.js b/frontend/test/specs/institution/createInvitedInstitutionSpec.js new file mode 100644 index 000000000..6f4ba84cb --- /dev/null +++ b/frontend/test/specs/institution/createInvitedInstitutionSpec.js @@ -0,0 +1,184 @@ +'use strict'; + +fdescribe('Test CreateInvitedInstitutionController', function() { + let state, statesConst, scope, institutionService, inviteService, + httpBackend, authService, ctrl, imageService; + + const address = { + cep: "11111-000", + city: "city", + country: "Country", + neighbourhood: "neighbourhood", + number: "555", + state: "State", + street: "Street x" + }; + + const institution = { + name: "name", + photo_url: "imagens/test", + email: "email", + state: "pending", + key: "inst-key", + acronym: "INST", + legal_nature: "public", + actuation_area: "government agencies", + phone_number: "phone", + cnpj: "cnpj", + address: new Address(address), + leader: "leader name", + institutional_email: "email@institutional.com", + description: "teste" + } + + const emptyInstitution = { + name: "name", + key: "inst-key", + } + + const institutions = [{ + name: 'Splab', + key: 'institutuion_key', + portfolio_url: '', + followers: [], + members: [] + }]; + + const invite = { + 'invitee': 'user@email.com', + 'suggestion_institution_name': "Suggested Name", + 'type_of_invite': "INSTITUTION", + status: 'sent', + key: 'invite-key' + }; + + const userData = { + name: 'name', + key: 'user-key', + current_institution: {key: "institutuion_key"}, + institutions: institutions, + institutions_admin: [], + follows: institutions, + institution_profiles: [], + email: ['test@test.com'], + invites: [invite], + state: 'active' + } + + beforeEach(module('app')); + + beforeEach(inject(($controller, $httpBackend, $state, STATES, InviteService, InstitutionService, AuthService, ImageService) => { + state = $state; + statesConst = STATES; + authService = AuthService; + imageService = ImageService; + institutionService = InstitutionService; + httpBackend = $httpBackend; + authService.login(userData); + state.params.institutionKey = institution.key; + + ctrl = $controller('CreateInvitedInstitutionController', { + scope, + authService, + institutionService, + imageService + }); + + // httpBackend.flush(); + })); + + describe('$onInit', () => { + it('should load the institution default data', () => { + spyOn(institutionService, 'getInstitution').and.callFake(() => { + return { + then: callback => { + return callback(emptyInstitution); + }, + } + }) + + ctrl.$onInit(); + expect(ctrl.newInstitution).toEqual(emptyInstitution); + expect(ctrl.suggestedName).toEqual(emptyInstitution.name); + expect(ctrl.newInstitution.photo_url).toEqual('app/images/institution.png'); + const newAddress = ctrl.newInstitution.address; + _.mapKeys(newAddress, (value, key) => { + if (key === 'country') { + expect(value).toEqual('Brasil'); + } else { + expect(value).toEqual(''); + } + }); + }); + + it('should redirect to STATES.HOME when theres no institution key', () => { + state.params.institutionKey = ''; + spyOn(state, 'go').and.callThrough(); + ctrl.$onInit(); + expect(state.go).toHaveBeenCalledWith(statesConst.HOME); + }); + }); + + describe('nextStep', () => { + describe('rejections', () => { + beforeEach(() => { + spyOn(institutionService, 'getInstitution').and.callFake(() => { + return { + then: callback => { + return callback(emptyInstitution); + }, + } + }) + ctrl.$onInit(); + }); + + it('should reject invalid first step', () => { + expect(ctrl.currentStep).toEqual(0); + ctrl.nextStep(); + expect(ctrl.currentStep).toEqual(0); + }); + + it('should reject invalid second step', () => { + ctrl.currentStep = 1; + expect(ctrl.currentStep).toEqual(1); + ctrl.nextStep(); + expect(ctrl.currentStep).toEqual(1); + }); + + it('should reject invalid third step', () => { + ctrl.currentStep = 2; + expect(ctrl.currentStep).toEqual(2); + ctrl.nextStep(); + expect(ctrl.currentStep).toEqual(2); + }); + }); + + describe('acceptations', () => { + beforeEach(() => { + ctrl.newInstitution = institution; + }); + + it('should accept valid first step', () => { + expect(ctrl.currentStep).toEqual(0); + ctrl.nextStep(); + expect(ctrl.currentStep).toEqual(1); + }); + + it('should accept valid second step', () => { + ctrl.currentStep = 1; + expect(ctrl.currentStep).toEqual(1); + ctrl.nextStep(); + expect(ctrl.currentStep).toEqual(2); + }); + + it('should accept valid third step', () => { + ctrl.currentStep = 2; + expect(ctrl.currentStep).toEqual(2); + ctrl.nextStep(); + expect(ctrl.currentStep).toEqual(3); + }); + }); + }); + +}); + From f7221c05bd2a44d2558ac4b3ad7e9f355b6e72e6 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 20 Feb 2019 15:49:56 -0300 Subject: [PATCH 294/606] solving some issues --- frontend/toolbar/whiteToolbar.component.js | 1 - frontend/toolbar/white_toolbar_mobile.css | 14 ++++++++++++++ frontend/toolbar/white_toolbar_mobile.html | 11 ++++++----- .../user/configProfile/configProfileController.js | 3 ++- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/frontend/toolbar/whiteToolbar.component.js b/frontend/toolbar/whiteToolbar.component.js index 28174f0d0..6f503fd51 100644 --- a/frontend/toolbar/whiteToolbar.component.js +++ b/frontend/toolbar/whiteToolbar.component.js @@ -1,4 +1,3 @@ - 'use strict'; (function () { diff --git a/frontend/toolbar/white_toolbar_mobile.css b/frontend/toolbar/white_toolbar_mobile.css index 5024e29a1..58c627209 100644 --- a/frontend/toolbar/white_toolbar_mobile.css +++ b/frontend/toolbar/white_toolbar_mobile.css @@ -20,6 +20,7 @@ font-size: 0.8em; word-break: normal; grid-column-end: 4 !important; + text-transform: uppercase; } .white-toolbar-menu-button { @@ -27,4 +28,17 @@ grid-column-end: 4; justify-self: end; align-self: center; +} + +.white-toolbar-title-container { + grid-column-start: 2; + grid-column-end: 3; +} + +.white-toolbar-menu-option-title { + margin-left: 0.5em; +} + +.white-toolbar-menu-content { + width: 100%; } \ No newline at end of file diff --git a/frontend/toolbar/white_toolbar_mobile.html b/frontend/toolbar/white_toolbar_mobile.html index 217f42200..b2c428448 100644 --- a/frontend/toolbar/white_toolbar_mobile.html +++ b/frontend/toolbar/white_toolbar_mobile.html @@ -2,12 +2,13 @@ {{whiteToolbarCtrl.primaryButtonIcon}} -
    {{whiteToolbarCtrl.title}}
    - + {{whiteToolbarCtrl.rightButton.name}} {{whiteToolbarCtrl.rightButton.icon}} @@ -18,13 +19,13 @@ more_vert - +
    {{option.icon}} - {{option.title}} + {{option.title}}
    diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index 43b23a41d..0636680c6 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -189,7 +189,8 @@ configProfileCtrl.saveButton = { class: 'config-profile__toolbar--save', action: configProfileCtrl.finish, - name: 'SALVAR' + name: 'SALVAR', + isAvailable: () => !configProfileCtrl.loadingSubmission }; }; From 9b30c7fbf8ce2c4082cf57126aa8647e96fd1f14 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 20 Feb 2019 16:00:25 -0300 Subject: [PATCH 295/606] Update first form screen --- frontend/app.js | 2 +- .../createInvitedInstitutionController.js | 13 +++++++++- .../institution/create_inst_form_mobile.html | 26 +++++++++---------- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index f17466650..2f8665f6a 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -300,7 +300,7 @@ main: { templateUrl: Utils.selectFieldBasedOnScreenSize("app/institution/create_inst_form.html", "app/institution/create_inst_form_mobile.html"), - controller: "ConfigInstController as configInstCtrl" + controller: Utils.selectFieldBasedOnScreenSize("ConfigInstController as configInstCtrl", "CreateInvitedInstitutionController as ctrl"), } }, params: { diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index 34a2e75d2..ee87d9f79 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -13,7 +13,7 @@ }; ctrl.backButton = () => { - configInstCtrl.currentStep === 0 ? window.history.back() : ctrl.previousStep(); + ctrl.currentStep === 0 ? window.history.back() : ctrl.previousStep(); } // loadInstitution @@ -86,6 +86,17 @@ ctrl.currentStep -= 1; } + Object.defineProperty(ctrl, 'currentStepLabel', { + get: function() { + const labels = { + 0: 'Dados Cadastrais', + 1: 'Dados da Instituiçao', + 2: 'Finalizar Cadastro', + } + return labels[ctrl.currentStep]; + } + }) + // main() // initController() // setDefaultPhotoUrl diff --git a/frontend/institution/create_inst_form_mobile.html b/frontend/institution/create_inst_form_mobile.html index 68a37cda8..9c391e372 100644 --- a/frontend/institution/create_inst_form_mobile.html +++ b/frontend/institution/create_inst_form_mobile.html @@ -2,48 +2,48 @@
    -

    {{ 1 }}

     +

    {{ 1 }}
    -

    {{ 2 }}

     +

    {{ 2 }}
    -

    {{ 3 }}

     +

    {{ 3 }}
    -

    {{ configInstCtrl.currentStepLabel }}

    +

    {{ ctrl.currentStepLabel }}

    -
    +
    + parent-ctrl='ctrl'> + parent-ctrl='ctrl'> + parent-ctrl='ctrl'>
    + ng-click='ctrl.nextStep()'> Próximo + ng-click='ctrl.mobileSubmit($event)'> Finalizar + ng-click='ctrl.backButton()'> keyboard_arrow_left
    From 4c1dd079ab649a6a529f364ba575a0e81e7f6d05 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 16:37:05 -0300 Subject: [PATCH 296/606] finished the send invites section --- frontend/app.js | 8 +++-- frontend/institution/management_members.html | 4 +-- .../institution/management_members_mobile.css | 35 +++++++++++++++++++ .../management_members_mobile.html | 25 ++++++++++++- frontend/styles/custom.css | 3 +- .../utils/clickableCard/clickable_card.css | 2 +- 6 files changed, 70 insertions(+), 7 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 648877ddd..704ac780f 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -232,7 +232,11 @@ url: "/managementMembers", views: { content_manage_institution: { - templateUrl: "app/institution/management_members.html", + templateUrl: Utils.selectFieldBasedOnScreenSize( + "app/institution/management_members.html", + "app/institution/management_members_mobile.html", + SCREEN_SIZES.SMARTPHONE + ), controller: "ManagementMembersController as manageMemberCtrl" } } @@ -599,6 +603,6 @@ } (function main() { - initServiceWorker(); + // initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/institution/management_members.html b/frontend/institution/management_members.html index ca79f524f..98208e9ca 100644 --- a/frontend/institution/management_members.html +++ b/frontend/institution/management_members.html @@ -23,9 +23,9 @@

    Convidar membros

    Endereço de e-mail

    - - diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/management_members_mobile.css index dba17387f..ce0635f9c 100644 --- a/frontend/institution/management_members_mobile.css +++ b/frontend/institution/management_members_mobile.css @@ -7,4 +7,39 @@ grid-row-start: 2; display: grid; grid-row-gap: 1em; +} + +/* Send events section */ +.manage-members__send__invites { + display: grid; + grid-row-gap: 1em; +} + +.manage-members__send__invites > h3, +.manage-members__send__invites > p { + margin: 0; +} + +.manage-members__send__invites > .description { + font-size: 0.9em; + color: grey; +} + +.manage-members__send__invites > .subtitle { + font-size: 0.8em; + font-weight: 500; +} + +.manage-members__send__invites md-input-container { + padding-right: 0; + margin: 0; + color: #9E9E9E; +} + +.manage-members__send__invites--btn { + width: 30%; + justify-self: end; + background-color: #009688; + color: white; + margin-right: 0; } \ No newline at end of file diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index 561d7a05f..3285b86df 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -1,17 +1,40 @@
    -

    membros

    +
    +

    Convidar Membros

    +

    + Coloque abaixo os endereços de e-mail das pessoas que você deseja convidar + para fazer parte da sua instituição na Plataforma CIS. +

    +

    Endereço de e-mail

    + + + + + + + Enviar + + +
    +

    membros

     +

    membros

     +

    membros

     +

    membros

     diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index 3551eab00..824cf1b34 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -937,7 +937,8 @@ md-radio-button.md-default-theme.md-checked .md-off, md-radio-button.md-checked font-size: 10px; } -md-input-container:not(.md-input-invalid).md-input-has-value .inputEmail { +md-input-container:not(.md-input-invalid).md-input-focused .green-input, + md-input-container:not(.md-input-invalid).md-input-has-value.md-input-focused .green-input { border-color:#009688; border-width: 0 0 2px; } diff --git a/frontend/utils/clickableCard/clickable_card.css b/frontend/utils/clickableCard/clickable_card.css index e9897228b..047b1b608 100644 --- a/frontend/utils/clickableCard/clickable_card.css +++ b/frontend/utils/clickableCard/clickable_card.css @@ -27,5 +27,5 @@ .clickable-card__content { background-color: #FFFFFF; - padding: 0 1em 1.5em 1em; + padding: 1em; } \ No newline at end of file From 8dcfd1e3a6f87d9c424431c55fd9b680b19dec62 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 20 Feb 2019 16:44:14 -0300 Subject: [PATCH 297/606] fixed --- frontend/search/searchController.js | 12 ++++++++++++ frontend/search/search_mobile.html | 5 +++-- .../searchInstitution/searchInstitution.component.js | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/frontend/search/searchController.js b/frontend/search/searchController.js index 08301a64c..3b7831222 100644 --- a/frontend/search/searchController.js +++ b/frontend/search/searchController.js @@ -17,6 +17,7 @@ var actuationAreas; var legalNatures; searchCtrl.loading = false; + searchCtrl.hasChanges = false; searchCtrl.makeSearch = function makeSearch(value, type) { searchCtrl.loading = false; @@ -25,10 +26,19 @@ promise.then(function success(response) { searchCtrl.institutions = response; searchCtrl.loading = true; + searchCtrl.hasChanges = true; }); return promise; }; + searchCtrl.setHasChanges = () => { + if(searchCtrl.search_keyword) + searchCtrl.hasChanges = true; + else { + searchCtrl.hasChanges = false; + } + }; + searchCtrl.clearFilters = function clearFilters() { searchCtrl.searchActuation = ""; searchCtrl.searchNature = ""; @@ -58,6 +68,8 @@ refreshPreviousKeyword(); return promise; + } else { + searchCtrl.showSearchFromMobile('$event'); } }; diff --git a/frontend/search/search_mobile.html b/frontend/search/search_mobile.html index c85412840..132197f0b 100644 --- a/frontend/search/search_mobile.html +++ b/frontend/search/search_mobile.html @@ -8,7 +8,7 @@
    - + @@ -47,7 +47,8 @@ CANCELAR - + PESQUISAR
    diff --git a/frontend/user/searchInstitution/searchInstitution.component.js b/frontend/user/searchInstitution/searchInstitution.component.js index 807fc74ac..ae3bd3ddf 100644 --- a/frontend/user/searchInstitution/searchInstitution.component.js +++ b/frontend/user/searchInstitution/searchInstitution.component.js @@ -47,7 +47,7 @@ const INST_STATE = 'active'; InstitutionService.searchInstitutions(searchInstCtrl.keyword, INST_STATE, 'institution') .then(institutions => { - searchInstCtrl.institutions = institutions; + searchInstCtrl.institutions = institutions; searchInstCtrl.instNotFound = institutions.length === 0; searchInstCtrl.onSearch(institutions); }); From d502741e8aca030679f3351bab61bbf8045d767a Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 20 Feb 2019 16:49:38 -0300 Subject: [PATCH 298/606] testing --- .../test/specs/search/searchControllerSpec.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/frontend/test/specs/search/searchControllerSpec.js b/frontend/test/specs/search/searchControllerSpec.js index 6971173d9..2dd7a4c36 100644 --- a/frontend/test/specs/search/searchControllerSpec.js +++ b/frontend/test/specs/search/searchControllerSpec.js @@ -138,8 +138,10 @@ } }; }); + expect(searchCtrl.hasChanges).toEqual(false); searchCtrl.makeSearch(searchCtrl.search_keyword, 'institution').then(function() { expect(instService.searchInstitutions).toHaveBeenCalledWith('splab', 'active', 'institution'); + expect(searchCtrl.hasChanges).toEqual(true); done(); }); }); @@ -204,5 +206,20 @@ expect(Utils.isMobileScreen).toHaveBeenCalled(); }); }); + + describe('setHasChanges', () => { + it('should set to true when seach_keyword is defined', () => { + searchCtrl.search_keyword = 'tst'; + expect(searchCtrl.hasChanges).toEqual(false); + searchCtrl.setHasChanges(); + expect(searchCtrl.hasChanges).toEqual(true); + }); + + it('should set to false when seach_keyword is not defined', () => { + searchCtrl.hasChanges = true; + searchCtrl.setHasChanges(); + expect(searchCtrl.hasChanges).toEqual(false); + }); + }); }); })); \ No newline at end of file From 209fd1b9ab87fcc0554c623c5eea9d5de6c14a7b Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 20 Feb 2019 17:06:55 -0300 Subject: [PATCH 299/606] refactoring setHasChanges() --- frontend/search/searchController.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/frontend/search/searchController.js b/frontend/search/searchController.js index 3b7831222..f81b09ce7 100644 --- a/frontend/search/searchController.js +++ b/frontend/search/searchController.js @@ -32,11 +32,7 @@ }; searchCtrl.setHasChanges = () => { - if(searchCtrl.search_keyword) - searchCtrl.hasChanges = true; - else { - searchCtrl.hasChanges = false; - } + searchCtrl.hasChanges = Boolean(searchCtrl.search_keyword); }; searchCtrl.clearFilters = function clearFilters() { From 80f616324450527710ee83e1673bfd4e197e0cfb Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 17:10:56 -0300 Subject: [PATCH 300/606] removed h3 tag --- frontend/institution/management_members_mobile.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index 3285b86df..d27a8685c 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -24,19 +24,15 @@

    Convidar Membros

    -

    membros

     -

    membros

     -

    membros

     -

    membros
    \ No newline at end of file From 9c471b308740a5e849aa2b248ac754c5187343ae Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 17:13:29 -0300 Subject: [PATCH 301/606] uncommented the initServiceWorker --- frontend/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app.js b/frontend/app.js index 704ac780f..17a11123f 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -603,6 +603,6 @@ } (function main() { - // initServiceWorker(); + initServiceWorker(); })(); })(); \ No newline at end of file From 14e73e785fc323ccd08d6eb1e5cf0a94160c15bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 21 Feb 2019 08:20:56 -0300 Subject: [PATCH 302/606] Fix events day position --- frontend/event/event.css | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/event/event.css b/frontend/event/event.css index b8b75dc4c..8b314baa2 100644 --- a/frontend/event/event.css +++ b/frontend/event/event.css @@ -237,6 +237,7 @@ .events-day-position { grid-column-start: 1; grid-column-end: 2; + justify-self: center; } .event-position { From ba5d534af1e587019ba5df35dc09c5c16406d74a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 21 Feb 2019 08:27:36 -0300 Subject: [PATCH 303/606] Fix bug when changing date --- frontend/event/eventController.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/event/eventController.js b/frontend/event/eventController.js index 588f23d8f..5665516d7 100644 --- a/frontend/event/eventController.js +++ b/frontend/event/eventController.js @@ -2,7 +2,7 @@ (function() { var app = angular.module('app'); - app.controller("EventController", function EventController(EventService, $state, $mdDialog, AuthService, $q, STATES, SCREEN_SIZES, InstitutionService) { + app.controller("EventController", function EventController(EventService, $state, $mdDialog, AuthService, $q, STATES, SCREEN_SIZES, InstitutionService, $filter) { const eventCtrl = this; let content = document.getElementById("content"); @@ -21,7 +21,7 @@ eventCtrl.loadMoreEvents = function loadMoreEvents() { if (eventCtrl._moreEvents) { - const getEventsFunction = eventCtrl.institutionKey ? EventService.getInstEvents : EventService.getEvents; + const getEventsFunction = EventService.getEvents; return eventCtrl._loadEvents(getEventsFunction, _.get(eventCtrl.selectedMonth, 'month'), eventCtrl.selectedYear); @@ -40,8 +40,8 @@ * @private */ eventCtrl._loadEvents = (getEvents, month, year) => { - return getEvents({ page: eventCtrl._actualPage, institutionKey: eventCtrl.institutionKey, - month: month, year: year}).then(function success(response) { + return getEvents({ page: eventCtrl._actualPage, month: month, year: year}) + .then(function success(response) { eventCtrl._actualPage += 1; eventCtrl._moreEvents = response.next; @@ -54,6 +54,7 @@ }); } + eventCtrl.events = $filter('filter')(eventCtrl.events, eventCtrl.institutionKey); eventCtrl.isLoadingEvents = false; eventCtrl._getEventsByDay(); }, function error() { From face2706c87c37b8800805443ca0dec7593ea2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 21 Feb 2019 09:05:57 -0300 Subject: [PATCH 304/606] Fix eventsController test to match modifications --- frontend/test/specs/event/eventControllerSpec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/test/specs/event/eventControllerSpec.js b/frontend/test/specs/event/eventControllerSpec.js index fb5b9070a..ec8f6c0f2 100644 --- a/frontend/test/specs/event/eventControllerSpec.js +++ b/frontend/test/specs/event/eventControllerSpec.js @@ -314,7 +314,7 @@ expect(eventCtrl._loadEvents).toHaveBeenCalled(); }); - it('Should call _loadEvents with eventService.getEvents', () => { + it('Should call _loadEvents with eventService.getEvents when key is null', () => { spyOn(eventCtrl, '_loadEvents'); eventCtrl.institutionKey = null; eventCtrl.loadMoreEvents(); @@ -322,12 +322,12 @@ .toHaveBeenCalledWith(eventService.getEvents, december, testYear); }); - it('Should call _loadEvents with eventService.getInstEvents', () => { + it("Should call _loadEvents with eventService.getEvents when key isn't null", () => { spyOn(eventCtrl, '_loadEvents'); eventCtrl.institutionKey = institution.key; eventCtrl.loadMoreEvents(); expect(eventCtrl._loadEvents) - .toHaveBeenCalledWith(eventService.getInstEvents, december, testYear); + .toHaveBeenCalledWith(eventService.getEvents, december, testYear); }); }); From ad23f365af2244f397d108ca5356693deec1e638 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 09:43:03 -0300 Subject: [PATCH 305/606] Fix validation on new Controller --- frontend/institution/createInvitedInstitutionController.js | 4 +++- frontend/institution/create_inst_form_mobile.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index ee87d9f79..5f82f70da 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -7,6 +7,7 @@ const ctrl = this; ctrl.loading = true; ctrl.currentStep = 0; + ctrl.newInstitution = {}; ctrl.stepColor = (step) => { return ctrl.currentStep === step ? 'light-green-500' : 'grey-500'; @@ -53,7 +54,8 @@ const address = institution.address; if (address && !_.isEmpty(address.country)) { if (address.country === 'Brasil') { - testValids(address, 'street', 'federal_state', 'neighbourhood'); + return testValids(address, 'street', 'federal_state', 'neighbourhood', + 'city', 'cep'); } else { return true; } diff --git a/frontend/institution/create_inst_form_mobile.html b/frontend/institution/create_inst_form_mobile.html index 9c391e372..c4dd69868 100644 --- a/frontend/institution/create_inst_form_mobile.html +++ b/frontend/institution/create_inst_form_mobile.html @@ -16,7 +16,7 @@

    {{ ctrl.currentStepLabel }}

    + address='ctrl.newInstitution.address'> Date: Thu, 21 Feb 2019 09:53:34 -0300 Subject: [PATCH 306/606] Update location form --- .../forms/locationForm.component.js | 33 +++++++++++++-- frontend/institution/forms/location_form.html | 41 +++++++++---------- 2 files changed, 50 insertions(+), 24 deletions(-) diff --git a/frontend/institution/forms/locationForm.component.js b/frontend/institution/forms/locationForm.component.js index 5d7b42a44..f6a8d7d26 100644 --- a/frontend/institution/forms/locationForm.component.js +++ b/frontend/institution/forms/locationForm.component.js @@ -1,11 +1,38 @@ 'use strict'; (function () { - function controller() { + function controller(brCidadesEstados, $http) { const ctrl = this; + ctrl.states = {}; + ctrl.countries = {}; + ctrl.cities = {}; + + ctrl.numberRegex = /\d+$/; + ctrl.cepRegex = /\d{5}\-\d{3}/; + + Object.defineProperty(ctrl, 'isAnotherCountry', { + get: function() { + return ctrl.address && ctrl.address.country !== 'Brasil'; + } + }); + + Object.defineProperty(ctrl, 'cities', { + get: function() { + if (ctrl.address && !ctrl.isAnotherCountry) { + const currentState = _.find(brCidadesEstados.estados, + e => _.isEqual(e.nome, ctrl.address.federal_state)) + if (currentState) { + return currentState.cidades; + } + } + } + }); ctrl.$onInit = () => { - ctrl.configInstCtrl = ctrl.parentCtrl; + ctrl.states = brCidadesEstados.estados; + $http.get('app/institution/countries.json').then(res => { + ctrl.countries = res.data; + }); } } @@ -15,7 +42,7 @@ controllerAs: 'ctrl', templateUrl: 'app/institution/forms/location_form.html', bindings: { - parentCtrl: '=', + address: '=', } }); })(); diff --git a/frontend/institution/forms/location_form.html b/frontend/institution/forms/location_form.html index a9a08f52a..3c90dd960 100644 --- a/frontend/institution/forms/location_form.html +++ b/frontend/institution/forms/location_form.html @@ -1,55 +1,54 @@ - + - + - + - - + {{ country.nome_pais }} - + - + - + - - + {{ state.sigla }} - + - + - + - - + {{ city }}
    -
    Primeiro selecione um estado
    @@ -57,10 +56,10 @@ - From a2ab8f7cb4d522379e779beadb60a11a896050b9 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 21 Feb 2019 10:48:31 -0300 Subject: [PATCH 307/606] refact clickableCard component --- .../utils/clickableCard/clickableCard.component.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js index ef37656b5..c7f8768ca 100644 --- a/frontend/utils/clickableCard/clickableCard.component.js +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -1,6 +1,6 @@ "use strict"; -(()=> { +(function () { angular .module('app') .component("clickableCard", { @@ -16,8 +16,12 @@ function ClickableCardController() { const clickableCardCtrl = this; - - clickableCardCtrl.isOpen = false; + + clickableCardCtrl.$onInit = () => { + Object.assign(clickableCardCtrl, { + isOpen: true + }); + }; clickableCardCtrl.onClick = () => { clickableCardCtrl.isOpen = !clickableCardCtrl.isOpen; From 2a44989a3b6d144c0d884e4d1760e273c813d277 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 10:52:23 -0300 Subject: [PATCH 308/606] Form component ready --- frontend/index.html | 16 +- .../institution/create_inst_form_mobile.html | 4 +- ....component.js => addressForm.component.js} | 4 +- .../{location_form.html => address_form.html} | 21 ++- frontend/institution/forms/forms.css | 164 +++++++++--------- 5 files changed, 102 insertions(+), 107 deletions(-) rename frontend/institution/forms/{locationForm.component.js => addressForm.component.js} (92%) rename frontend/institution/forms/{location_form.html => address_form.html} (77%) diff --git a/frontend/index.html b/frontend/index.html index 46109fecd..1fc7716b9 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -6,7 +6,7 @@ Plataforma CIS - + @@ -29,7 +29,7 @@ - + @@ -76,11 +76,11 @@
    - - + @@ -240,7 +240,7 @@ - + diff --git a/frontend/institution/create_inst_form_mobile.html b/frontend/institution/create_inst_form_mobile.html index c4dd69868..5ac0676d6 100644 --- a/frontend/institution/create_inst_form_mobile.html +++ b/frontend/institution/create_inst_form_mobile.html @@ -15,9 +15,9 @@

    {{ ctrl.currentStepLabel }}

    - - + diff --git a/frontend/institution/forms/locationForm.component.js b/frontend/institution/forms/addressForm.component.js similarity index 92% rename from frontend/institution/forms/locationForm.component.js rename to frontend/institution/forms/addressForm.component.js index f6a8d7d26..85b7373d2 100644 --- a/frontend/institution/forms/locationForm.component.js +++ b/frontend/institution/forms/addressForm.component.js @@ -37,10 +37,10 @@ } const app = angular.module('app'); - app.component('locationForm', { + app.component('addressForm', { controller: controller, controllerAs: 'ctrl', - templateUrl: 'app/institution/forms/location_form.html', + templateUrl: 'app/institution/forms/address_form.html', bindings: { address: '=', } diff --git a/frontend/institution/forms/location_form.html b/frontend/institution/forms/address_form.html similarity index 77% rename from frontend/institution/forms/location_form.html rename to frontend/institution/forms/address_form.html index 3c90dd960..6c9343c1d 100644 --- a/frontend/institution/forms/location_form.html +++ b/frontend/institution/forms/address_form.html @@ -1,31 +1,30 @@ -
    - + + - + - + - + {{ country.nome_pais }} - + - + @@ -34,12 +33,12 @@ - + - + @@ -48,7 +47,7 @@
    -
    Primeiro selecione um estado
    diff --git a/frontend/institution/forms/forms.css b/frontend/institution/forms/forms.css index 58fe3e732..f9927a566 100644 --- a/frontend/institution/forms/forms.css +++ b/frontend/institution/forms/forms.css @@ -1,39 +1,39 @@ -#create-inst-card-content #location-data { +address-form #address-form { display: grid; grid-template-areas: - "logradouro logradouro logradouro" - "no bairro bairro" - "pais estado cidade" + "street street street" + "number neighbourhood neighbourhood" + "country state city" "cep cep cep"; grid-template-columns: repeat(3, calc(100%/3)); grid-template-rows: repeat(4, 1fr); } -#create-inst-card-content #location-data #logradouro { - grid-area: logradouro; +#address-form #street { + grid-area: street; } -#create-inst-card-content #location-data #no { - grid-area: no; +#address-form #number { + grid-area: number; } -#create-inst-card-content #location-data #bairro { - grid-area: bairro; +#address-form #neighbourhood { + grid-area: neighbourhood; } -#create-inst-card-content #location-data #cidade { - grid-area: cidade; +#address-form #city { + grid-area: city; } -#create-inst-card-content #location-data #estado { - grid-area: estado; +#address-form #state { + grid-area: state; } -#create-inst-card-content #location-data #pais { - grid-area: pais; +#address-form #country { + grid-area: country; } -#create-inst-card-content #location-data #cep { +#address-form #cep { grid-area: cep; } @@ -48,70 +48,66 @@ display: grid; } -#create-inst-card-content md-select-value { - overflow: hidden; -} - -#create-inst-card-content #institution-data { - display: grid; - grid-template-rows: 1.2fr repeat(7, 1fr); - height: 100%; - width: 100%; -} - -#create-inst-card-content #inst-picture-picker { - display: grid; - grid-auto-flow: column; - grid-template-columns: 1fr 3fr; - background: #ddd; - margin-bottom: 1em; -} - -#inst-picture-picker .picture-picker { - width: 3.6em; - height: 3.6em; - align-self: center; - justify-self: center; -} - -#inst-picture-picker img.inst-picture { - width: 3.6em; - height: 3.6em; - border-radius: 50%; - margin: -0.6em 0 0 -0.6em; -} - - -#inst-picture-picker md-icon { - color: white; -} - -.inst-suggested-name { - align-self: center; - overflow: hidden; - line-height: 1.2em; - height: 3.6em; - font-size: 0.8em; - padding: 0.1em; -} - -#last-info { - display: grid; - grid-template-rows: 2fr 1fr 1fr; -} - -#last-info md-input-container#description { - align-items: center; - border: 1px solid; - border-color: #ccc; - border-radius: 0.4em; -} - -#last-info #description textarea { - height: 100% !important; - border: 0 !important; -} - -#create-inst-content button.md-primary { - color: #009688 !important; -} +/* #create-inst-card-content #institution-data { */ +/* display: grid; */ +/* grid-template-rows: 1.2fr repeat(7, 1fr); */ +/* height: 100%; */ +/* width: 100%; */ +/* } */ + +/* #create-inst-card-content #inst-picture-picker { */ +/* display: grid; */ +/* grid-auto-flow: column; */ +/* grid-template-columns: 1fr 3fr; */ +/* background: #ddd; */ +/* margin-bottom: 1em; */ +/* } */ + +/* #inst-picture-picker .picture-picker { */ +/* width: 3.6em; */ +/* height: 3.6em; */ +/* align-self: center; */ +/* justify-self: center; */ +/* } */ + +/* #inst-picture-picker img.inst-picture { */ +/* width: 3.6em; */ +/* height: 3.6em; */ +/* border-radius: 50%; */ +/* margin: -0.6em 0 0 -0.6em; */ +/* } */ + + +/* #inst-picture-picker md-icon { */ +/* color: white; */ +/* } */ + +/* .inst-suggested-name { */ +/* align-self: center; */ +/* overflow: hidden; */ +/* line-height: 1.2em; */ +/* height: 3.6em; */ +/* font-size: 0.8em; */ +/* padding: 0.1em; */ +/* } */ + +/* #last-info { */ +/* display: grid; */ +/* grid-template-rows: 2fr 1fr 1fr; */ +/* } */ + +/* #last-info md-input-container#description { */ +/* align-items: center; */ +/* border: 1px solid; */ +/* border-color: #ccc; */ +/* border-radius: 0.4em; */ +/* } */ + +/* #last-info #description textarea { */ +/* height: 100% !important; */ +/* border: 0 !important; */ +/* } */ + +/* #create-inst-content button.md-primary { */ +/* color: #009688 !important; */ +/* } */ From b79f787e6d3adf140abd2e4a1f3ffbc0a4952cf7 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 10:54:52 -0300 Subject: [PATCH 309/606] Add address form for new invite inst screen --- .../forms/addressForm.component.js | 48 ++++++++++++++ frontend/institution/forms/address_form.html | 64 +++++++++++++++++++ frontend/institution/forms/forms.css | 49 ++++++++++++++ 3 files changed, 161 insertions(+) create mode 100644 frontend/institution/forms/addressForm.component.js create mode 100644 frontend/institution/forms/address_form.html create mode 100644 frontend/institution/forms/forms.css diff --git a/frontend/institution/forms/addressForm.component.js b/frontend/institution/forms/addressForm.component.js new file mode 100644 index 000000000..85b7373d2 --- /dev/null +++ b/frontend/institution/forms/addressForm.component.js @@ -0,0 +1,48 @@ +'use strict'; + +(function () { + function controller(brCidadesEstados, $http) { + const ctrl = this; + ctrl.states = {}; + ctrl.countries = {}; + ctrl.cities = {}; + + ctrl.numberRegex = /\d+$/; + ctrl.cepRegex = /\d{5}\-\d{3}/; + + Object.defineProperty(ctrl, 'isAnotherCountry', { + get: function() { + return ctrl.address && ctrl.address.country !== 'Brasil'; + } + }); + + Object.defineProperty(ctrl, 'cities', { + get: function() { + if (ctrl.address && !ctrl.isAnotherCountry) { + const currentState = _.find(brCidadesEstados.estados, + e => _.isEqual(e.nome, ctrl.address.federal_state)) + if (currentState) { + return currentState.cidades; + } + } + } + }); + + ctrl.$onInit = () => { + ctrl.states = brCidadesEstados.estados; + $http.get('app/institution/countries.json').then(res => { + ctrl.countries = res.data; + }); + } + } + + const app = angular.module('app'); + app.component('addressForm', { + controller: controller, + controllerAs: 'ctrl', + templateUrl: 'app/institution/forms/address_form.html', + bindings: { + address: '=', + } + }); +})(); diff --git a/frontend/institution/forms/address_form.html b/frontend/institution/forms/address_form.html new file mode 100644 index 000000000..6c9343c1d --- /dev/null +++ b/frontend/institution/forms/address_form.html @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + {{ country.nome_pais }} + + + + + + + + + + + + {{ state.sigla }} + + + + + + + + + + + + + {{ city }} + + +
    +
    + Primeiro selecione um estado +
    +
    +     + + + + + diff --git a/frontend/institution/forms/forms.css b/frontend/institution/forms/forms.css new file mode 100644 index 000000000..77a6fd1fe --- /dev/null +++ b/frontend/institution/forms/forms.css @@ -0,0 +1,49 @@ +address-form #address-form { + display: grid; + grid-template-areas: + "street street street" + "number neighbourhood neighbourhood" + "country state city" + "cep cep cep"; + grid-template-columns: repeat(3, calc(100%/3)); + grid-template-rows: repeat(4, 1fr); +} + +#address-form #street { + grid-area: street; +} + +#address-form #number { + grid-area: number; +} + +#address-form #neighbourhood { + grid-area: neighbourhood; +} + +#address-form #city { + grid-area: city; +} + +#address-form #state { + grid-area: state; +} + +#address-form #country { + grid-area: country; +} + +#address-form #cep { + grid-area: cep; +} + +.state-required { + font-size: 0.6em; + line-height: 1em; + overflow: visible; +} + +.limit-md-select { + justify-self: center; + display: grid; +} From d5cc59db4160fd55b0488ac60ef262660cb82dd7 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 21 Feb 2019 10:56:40 -0300 Subject: [PATCH 310/606] changed defaul value of isOpen flag --- frontend/utils/clickableCard/clickableCard.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js index c7f8768ca..326d5b0ed 100644 --- a/frontend/utils/clickableCard/clickableCard.component.js +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -19,7 +19,7 @@ clickableCardCtrl.$onInit = () => { Object.assign(clickableCardCtrl, { - isOpen: true + isOpen: false }); }; From 9ed0447b9888232dd95e03d8a32cd911e7e80b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 21 Feb 2019 10:57:06 -0300 Subject: [PATCH 311/606] Change institutionShowcase to be entityShowcase --- frontend/event/events_mobile.html | 9 +++++++-- frontend/index.html | 4 ++-- .../institutionShowcase.component.js | 17 ----------------- .../institutionShowcase.html | 5 ----- .../entityShowcase.component.js | 19 +++++++++++++++++++ .../entityShowcase/entityShowcase.css} | 16 ++++++++-------- .../utils/entityShowcase/entityShowcase.html | 5 +++++ 7 files changed, 41 insertions(+), 34 deletions(-) delete mode 100644 frontend/institution/institutionShowcase/institutionShowcase.component.js delete mode 100644 frontend/institution/institutionShowcase/institutionShowcase.html create mode 100644 frontend/utils/entityShowcase/entityShowcase.component.js rename frontend/{institution/institutionShowcase/institutionShowcase.css => utils/entityShowcase/entityShowcase.css} (65%) create mode 100644 frontend/utils/entityShowcase/entityShowcase.html diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index db84f979b..349519ec8 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -4,8 +4,13 @@
    - - + + diff --git a/frontend/index.html b/frontend/index.html index 88816f32c..739fe6cb3 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -75,7 +75,7 @@ - + @@ -305,7 +305,7 @@ - + diff --git a/frontend/institution/institutionShowcase/institutionShowcase.component.js b/frontend/institution/institutionShowcase/institutionShowcase.component.js deleted file mode 100644 index d1610a3bb..000000000 --- a/frontend/institution/institutionShowcase/institutionShowcase.component.js +++ /dev/null @@ -1,17 +0,0 @@ -(function () { - 'use strict'; - - angular.module("app").component("institutionShowcase", { - templateUrl: "app/institution/institutionShowcase/institutionShowcase.html", - controller: institutionShowcaseController, - controllerAs: "institutionShowcaseCtrl", - bindings: { - institution: "<", - }, - }); - - function institutionShowcaseController() { - const institutionShowcaseCtrl = this; - } - -})(); \ No newline at end of file diff --git a/frontend/institution/institutionShowcase/institutionShowcase.html b/frontend/institution/institutionShowcase/institutionShowcase.html deleted file mode 100644 index ddf0a0af8..000000000 --- a/frontend/institution/institutionShowcase/institutionShowcase.html +++ /dev/null @@ -1,5 +0,0 @@ -
    - - {{institutionShowcaseCtrl.institution.name }} - {{institutionShowcaseCtrl.institution.address.city }} -
    \ No newline at end of file diff --git a/frontend/utils/entityShowcase/entityShowcase.component.js b/frontend/utils/entityShowcase/entityShowcase.component.js new file mode 100644 index 000000000..38dbced50 --- /dev/null +++ b/frontend/utils/entityShowcase/entityShowcase.component.js @@ -0,0 +1,19 @@ +(function () { + 'use strict'; + + angular.module("app").component("entityShowcase", { + templateUrl: "app/utils/entityShowcase/entityShowcase.html", + controller: entityShowcaseController, + controllerAs: "entityShowcaseCtrl", + bindings: { + avatar: "<", + title: "<", + subtitle: "<", + }, + }); + + function entityShowcaseController() { + const entityShowcaseCtrl = this; + } + +})(); \ No newline at end of file diff --git a/frontend/institution/institutionShowcase/institutionShowcase.css b/frontend/utils/entityShowcase/entityShowcase.css similarity index 65% rename from frontend/institution/institutionShowcase/institutionShowcase.css rename to frontend/utils/entityShowcase/entityShowcase.css index d40e7ff00..0f02336e6 100644 --- a/frontend/institution/institutionShowcase/institutionShowcase.css +++ b/frontend/utils/entityShowcase/entityShowcase.css @@ -1,30 +1,30 @@ -.institution-showcase { +.entity-showcase { display: grid; grid-template-columns: max-content auto; grid-template-rows: max-content max-content; grid-template-areas: - 'avatar name' - 'avatar text'; + 'avatar title' + 'avatar subtitle'; grid-gap: 0 0.6rem; padding: 0.6rem; align-items: center; background-color: #E0E0E0; } -.institution-showcase__avatar { +.entity-showcase__avatar { grid-area: avatar; height: 3em; width: 3em; border-radius: 50%; } -.institution-showcase__name { - grid-area: name; +.entity-showcase__title { + grid-area: title; line-height: 1rem; } -.institution-showcase__text { - grid-area: text; +.entity-showcase__subtitle { + grid-area: subtitle; font-size: 0.8em; line-height: 1rem; } \ No newline at end of file diff --git a/frontend/utils/entityShowcase/entityShowcase.html b/frontend/utils/entityShowcase/entityShowcase.html new file mode 100644 index 000000000..82ecdb65e --- /dev/null +++ b/frontend/utils/entityShowcase/entityShowcase.html @@ -0,0 +1,5 @@ +
    + + {{entityShowcaseCtrl.title }} + {{entityShowcaseCtrl.subtitle }} +
    \ No newline at end of file From d8eea23f247fe396afbd6313a4b29a3a7f6a53d4 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Fri, 15 Feb 2019 10:52:24 -0300 Subject: [PATCH 312/606] modified push notification permission flow --- frontend/auth/authService.js | 4 +--- frontend/home/homeController.js | 10 +++++----- frontend/test/specs/home/homeControllerSpec.js | 8 ++++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/frontend/auth/authService.js b/frontend/auth/authService.js index b242af4aa..df0aca173 100644 --- a/frontend/auth/authService.js +++ b/frontend/auth/authService.js @@ -130,9 +130,7 @@ if (user.emailVerified) { return user.getIdToken(true).then(function(idToken) { return service.setupUser(idToken, user.emailVerified).then(function success(userInfo) { - return PushNotificationService.requestNotificationPermission(service.getCurrentUser()).finally(() => { - return userInfo; - }); + return userInfo; }); }); } else { diff --git a/frontend/home/homeController.js b/frontend/home/homeController.js index 8390154ed..43dc180a0 100644 --- a/frontend/home/homeController.js +++ b/frontend/home/homeController.js @@ -4,7 +4,7 @@ var app = angular.module("app"); app.controller("HomeController", function HomeController(AuthService, $mdDialog, - $state, EventService, ProfileService, $rootScope, POST_EVENTS, STATES) { + $state, EventService, ProfileService, $rootScope, POST_EVENTS, STATES, PushNotificationService) { var homeCtrl = this; var LIMITE_EVENTS = 5; @@ -13,8 +13,6 @@ homeCtrl.followingInstitutions = []; homeCtrl.isLoadingPosts = true; homeCtrl.showMessageOfEmptyEvents = true; - - homeCtrl.user = AuthService.getCurrentUser(); homeCtrl.eventInProgress = function eventInProgress(event) { var end_time = event.end_time; @@ -122,10 +120,12 @@ $rootScope.$broadcast(eventType, post); } - (function main() { + homeCtrl.$onInit = () => { + homeCtrl.user = AuthService.getCurrentUser(); loadEvents(); getFollowingInstitutions(); registerPostEvents(); - })(); + return PushNotificationService.requestNotificationPermission(homeCtrl.user); + }; }); })(); \ No newline at end of file diff --git a/frontend/test/specs/home/homeControllerSpec.js b/frontend/test/specs/home/homeControllerSpec.js index 529f89560..a57ea1e81 100644 --- a/frontend/test/specs/home/homeControllerSpec.js +++ b/frontend/test/specs/home/homeControllerSpec.js @@ -2,7 +2,7 @@ (describe('Test HomeController', function() { - let homeCtrl, httpBackend, scope, createCtrl, mdDialog, state, states, http, postService; + let homeCtrl, httpBackend, scope, createCtrl, mdDialog, state, states, http, postService, pushNotService; var institutions = [{ acronym: 'Certbio', @@ -35,7 +35,7 @@ beforeEach(module('app')); beforeEach(inject(function($controller, $httpBackend, $rootScope, - PostService, $mdDialog, $state, AuthService, $http, STATES) { + PostService, $mdDialog, $state, AuthService, PushNotificationService, $http, STATES) { httpBackend = $httpBackend; http = $http; scope = $rootScope.$new(); @@ -43,6 +43,7 @@ state = $state; postService = PostService; states = STATES; + pushNotService = PushNotificationService; httpBackend.when('GET', "/api/events?page=0&limit=15").respond([event]); httpBackend.when('GET', 'main/main.html').respond(200); @@ -61,11 +62,14 @@ }; spyOn($rootScope, '$on').and.callThrough(); + spyOn(pushNotService, 'requestNotificationPermission'); homeCtrl = createCtrl(); + homeCtrl.$onInit(); httpBackend.flush(); expect($rootScope.$on).toHaveBeenCalled(); + expect(pushNotService.requestNotificationPermission).toHaveBeenCalledWith(new User(user)); })); afterEach(function() { From e111387beac3c591be2f63deec19f5433e8476d9 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Fri, 15 Feb 2019 11:20:16 -0300 Subject: [PATCH 313/606] modified dependecy notation[ --- frontend/auth/authService.js | 6 +++--- frontend/home/homeController.js | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/auth/authService.js b/frontend/auth/authService.js index df0aca173..5cdf12243 100644 --- a/frontend/auth/authService.js +++ b/frontend/auth/authService.js @@ -3,8 +3,8 @@ var app = angular.module("app"); - app.service("AuthService", function AuthService($q, $state, $window, UserService, - MessageService, PushNotificationService, STATES) { + app.service("AuthService", ['$q', '$state', '$window', 'UserService', 'MessageService', 'STATES', + function AuthService($q, $state, $window, UserService, MessageService, STATES) { var service = this; var authObj = firebase.auth(); @@ -257,5 +257,5 @@ } init(); - }); + }]); })(); \ No newline at end of file diff --git a/frontend/home/homeController.js b/frontend/home/homeController.js index 43dc180a0..d40f721e0 100644 --- a/frontend/home/homeController.js +++ b/frontend/home/homeController.js @@ -3,8 +3,10 @@ (function() { var app = angular.module("app"); - app.controller("HomeController", function HomeController(AuthService, $mdDialog, - $state, EventService, ProfileService, $rootScope, POST_EVENTS, STATES, PushNotificationService) { + app.controller("HomeController", ['AuthService', '$mdDialog', '$state', 'EventService', 'ProfileService', '$rootScope', + 'PushNotificationService', 'POST_EVENTS', 'STATES', + function HomeController(AuthService, $mdDialog, $state, EventService, ProfileService, $rootScope, + PushNotificationService, POST_EVENTS, STATES) { var homeCtrl = this; var LIMITE_EVENTS = 5; @@ -127,5 +129,5 @@ registerPostEvents(); return PushNotificationService.requestNotificationPermission(homeCtrl.user); }; - }); + }]); })(); \ No newline at end of file From 2237137bd36435824acfbe065a186347b557688e Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 13:33:48 -0300 Subject: [PATCH 314/606] created clickable card component --- frontend/index.html | 5 ++++ .../clickableCard/clickableCard.component.js | 27 +++++++++++++++++++ .../utils/clickableCard/clickable_card.css | 27 +++++++++++++++++++ .../utils/clickableCard/clickable_card.html | 12 +++++++++ 4 files changed, 71 insertions(+) create mode 100644 frontend/utils/clickableCard/clickableCard.component.js create mode 100644 frontend/utils/clickableCard/clickable_card.css create mode 100644 frontend/utils/clickableCard/clickable_card.html diff --git a/frontend/index.html b/frontend/index.html index cb00c1a85..6a154f109 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -70,12 +70,16 @@ +<<<<<<< HEAD +======= + +>>>>>>> created clickable card component @@ -173,6 +177,7 @@ + diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js new file mode 100644 index 000000000..ef37656b5 --- /dev/null +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -0,0 +1,27 @@ +"use strict"; + +(()=> { + angular + .module('app') + .component("clickableCard", { + templateUrl: 'app/utils/clickableCard/clickable_card.html', + controller: ClickableCardController, + controllerAs: 'clickableCardCtrl', + bindings: { + icon: '@', + title: '@' + }, + transclude: true + }); + + function ClickableCardController() { + const clickableCardCtrl = this; + + clickableCardCtrl.isOpen = false; + + clickableCardCtrl.onClick = () => { + clickableCardCtrl.isOpen = !clickableCardCtrl.isOpen; + } + } + +})(); \ No newline at end of file diff --git a/frontend/utils/clickableCard/clickable_card.css b/frontend/utils/clickableCard/clickable_card.css new file mode 100644 index 000000000..138317c02 --- /dev/null +++ b/frontend/utils/clickableCard/clickable_card.css @@ -0,0 +1,27 @@ +.clickable-card__toolbar { + background-color: #FFFFFF !important; + box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.5); +} + +#clickable-card__icon--start { + color: #707070; + margin: 0 1em 0 0; + +} + +#clickable-card__icon--end { + color: green; + margin: 0 0 0 auto; +} + + +.clickable-card__title { + color: #004D41; + font-weight: 500; + text-transform: uppercase; + font-size: 0.9em; +} + +.clickable-card__content { + padding: 0 1em; +} \ No newline at end of file diff --git a/frontend/utils/clickableCard/clickable_card.html b/frontend/utils/clickableCard/clickable_card.html new file mode 100644 index 000000000..f7471dbbe --- /dev/null +++ b/frontend/utils/clickableCard/clickable_card.html @@ -0,0 +1,12 @@ +
    + +
    + {{clickableCardCtrl.icon}} + {{ clickableCardCtrl.title}} + {{ clickableCardCtrl.isOpen ? 'arrow_drop_up' : 'arrow_drop_down' }} +
    +     +
    + +
    +
    \ No newline at end of file From e88d97e6bb9686e9918a21805a2ba4b467158d85 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 14:17:30 -0300 Subject: [PATCH 315/606] used the clickableCard on manage members page --- frontend/index.html | 1 + .../institution/management_members_mobile.css | 10 ++++++++++ .../management_members_mobile.html | 19 +++++++++++++++++++ .../utils/clickableCard/clickable_card.css | 14 +++++++++----- .../utils/clickableCard/clickable_card.html | 16 ++++++++-------- 5 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 frontend/institution/management_members_mobile.css create mode 100644 frontend/institution/management_members_mobile.html diff --git a/frontend/index.html b/frontend/index.html index 6a154f109..a70efb9a1 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -42,6 +42,7 @@ + diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/management_members_mobile.css new file mode 100644 index 000000000..dba17387f --- /dev/null +++ b/frontend/institution/management_members_mobile.css @@ -0,0 +1,10 @@ +.manage-members { + display: grid; + grid-template-rows: 6em auto 1em; +} + +.manage-members__cards { + grid-row-start: 2; + display: grid; + grid-row-gap: 1em; +} \ No newline at end of file diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html new file mode 100644 index 000000000..561d7a05f --- /dev/null +++ b/frontend/institution/management_members_mobile.html @@ -0,0 +1,19 @@ + +
    + +

    membros

    +     + +

    membros

    +     + +

    membros

    +     + +

    membros

    +     + +

    membros

    +     +
    +     \ No newline at end of file diff --git a/frontend/utils/clickableCard/clickable_card.css b/frontend/utils/clickableCard/clickable_card.css index 138317c02..e9897228b 100644 --- a/frontend/utils/clickableCard/clickable_card.css +++ b/frontend/utils/clickableCard/clickable_card.css @@ -1,16 +1,19 @@ +.clickable-card { + display: grid; + box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.3); +} + .clickable-card__toolbar { background-color: #FFFFFF !important; - box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.5); } #clickable-card__icon--start { color: #707070; margin: 0 1em 0 0; - } #clickable-card__icon--end { - color: green; + color: #17ea17; margin: 0 0 0 auto; } @@ -19,9 +22,10 @@ color: #004D41; font-weight: 500; text-transform: uppercase; - font-size: 0.9em; + font-size: 0.7em; } .clickable-card__content { - padding: 0 1em; + background-color: #FFFFFF; + padding: 0 1em 1.5em 1em; } \ No newline at end of file diff --git a/frontend/utils/clickableCard/clickable_card.html b/frontend/utils/clickableCard/clickable_card.html index f7471dbbe..a751bdccb 100644 --- a/frontend/utils/clickableCard/clickable_card.html +++ b/frontend/utils/clickableCard/clickable_card.html @@ -1,12 +1,12 @@
    -
    - {{clickableCardCtrl.icon}} - {{ clickableCardCtrl.title}} - {{ clickableCardCtrl.isOpen ? 'arrow_drop_up' : 'arrow_drop_down' }} -
    -     -
    - +
    + {{clickableCardCtrl.icon}} + {{ clickableCardCtrl.title}} + {{ clickableCardCtrl.isOpen ? 'arrow_drop_up' : 'arrow_drop_down' }}
    + +
    + +
    \ No newline at end of file From 31de9ac440486a75d509f32b33dbd65cf9ee5b5a Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 16:37:05 -0300 Subject: [PATCH 316/606] finished the send invites section --- frontend/app.js | 8 +++-- frontend/institution/management_members.html | 4 +-- .../institution/management_members_mobile.css | 35 +++++++++++++++++++ .../management_members_mobile.html | 25 ++++++++++++- frontend/styles/custom.css | 3 +- .../utils/clickableCard/clickable_card.css | 2 +- 6 files changed, 70 insertions(+), 7 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 0c60df219..e3da0d30a 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -244,7 +244,11 @@ url: "/managementMembers", views: { content_manage_institution: { - templateUrl: "app/institution/management_members.html", + templateUrl: Utils.selectFieldBasedOnScreenSize( + "app/institution/management_members.html", + "app/institution/management_members_mobile.html", + SCREEN_SIZES.SMARTPHONE + ), controller: "ManagementMembersController as manageMemberCtrl" } } @@ -612,6 +616,6 @@ } (function main() { - initServiceWorker(); + // initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/institution/management_members.html b/frontend/institution/management_members.html index ca79f524f..98208e9ca 100644 --- a/frontend/institution/management_members.html +++ b/frontend/institution/management_members.html @@ -23,9 +23,9 @@

    Convidar membros

    Endereço de e-mail

    - - diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/management_members_mobile.css index dba17387f..ce0635f9c 100644 --- a/frontend/institution/management_members_mobile.css +++ b/frontend/institution/management_members_mobile.css @@ -7,4 +7,39 @@ grid-row-start: 2; display: grid; grid-row-gap: 1em; +} + +/* Send events section */ +.manage-members__send__invites { + display: grid; + grid-row-gap: 1em; +} + +.manage-members__send__invites > h3, +.manage-members__send__invites > p { + margin: 0; +} + +.manage-members__send__invites > .description { + font-size: 0.9em; + color: grey; +} + +.manage-members__send__invites > .subtitle { + font-size: 0.8em; + font-weight: 500; +} + +.manage-members__send__invites md-input-container { + padding-right: 0; + margin: 0; + color: #9E9E9E; +} + +.manage-members__send__invites--btn { + width: 30%; + justify-self: end; + background-color: #009688; + color: white; + margin-right: 0; } \ No newline at end of file diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index 561d7a05f..3285b86df 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -1,17 +1,40 @@
    -

    membros

    +
    +

    Convidar Membros

    +

    + Coloque abaixo os endereços de e-mail das pessoas que você deseja convidar + para fazer parte da sua instituição na Plataforma CIS. +

    +

    Endereço de e-mail

    + + + + + + + Enviar + + +
    +

    membros

     +

    membros

     +

    membros

     +

    membros

     diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index a639e9744..491ad4b4f 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -952,7 +952,8 @@ md-radio-button.md-default-theme.md-checked .md-off, md-radio-button.md-checked font-size: 10px; } -md-input-container:not(.md-input-invalid).md-input-has-value .inputEmail { +md-input-container:not(.md-input-invalid).md-input-focused .green-input, + md-input-container:not(.md-input-invalid).md-input-has-value.md-input-focused .green-input { border-color:#009688; border-width: 0 0 2px; } diff --git a/frontend/utils/clickableCard/clickable_card.css b/frontend/utils/clickableCard/clickable_card.css index e9897228b..047b1b608 100644 --- a/frontend/utils/clickableCard/clickable_card.css +++ b/frontend/utils/clickableCard/clickable_card.css @@ -27,5 +27,5 @@ .clickable-card__content { background-color: #FFFFFF; - padding: 0 1em 1.5em 1em; + padding: 1em; } \ No newline at end of file From f29a536ed7933c39f64461383a8808450c7e81af Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 17:10:56 -0300 Subject: [PATCH 317/606] removed h3 tag --- frontend/institution/management_members_mobile.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index 3285b86df..d27a8685c 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -24,19 +24,15 @@

    Convidar Membros

    -

    membros

     -

    membros

     -

    membros

     -

    membros
    \ No newline at end of file From 8b4e2ca021299b8acca4be592443c8f15d3f0dd9 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 17:13:29 -0300 Subject: [PATCH 318/606] uncommented the initServiceWorker --- frontend/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app.js b/frontend/app.js index e3da0d30a..e74c2d552 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -616,6 +616,6 @@ } (function main() { - // initServiceWorker(); + initServiceWorker(); })(); })(); \ No newline at end of file From bec7a4b26a90681147e76d839318cc1f57c46874 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 21 Feb 2019 10:48:31 -0300 Subject: [PATCH 319/606] refact clickableCard component --- .../utils/clickableCard/clickableCard.component.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js index ef37656b5..c7f8768ca 100644 --- a/frontend/utils/clickableCard/clickableCard.component.js +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -1,6 +1,6 @@ "use strict"; -(()=> { +(function () { angular .module('app') .component("clickableCard", { @@ -16,8 +16,12 @@ function ClickableCardController() { const clickableCardCtrl = this; - - clickableCardCtrl.isOpen = false; + + clickableCardCtrl.$onInit = () => { + Object.assign(clickableCardCtrl, { + isOpen: true + }); + }; clickableCardCtrl.onClick = () => { clickableCardCtrl.isOpen = !clickableCardCtrl.isOpen; From dece809d7c07feb66d6bc454a4fe7b13041ed938 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 21 Feb 2019 10:56:40 -0300 Subject: [PATCH 320/606] changed defaul value of isOpen flag --- frontend/utils/clickableCard/clickableCard.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js index c7f8768ca..326d5b0ed 100644 --- a/frontend/utils/clickableCard/clickableCard.component.js +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -19,7 +19,7 @@ clickableCardCtrl.$onInit = () => { Object.assign(clickableCardCtrl, { - isOpen: true + isOpen: false }); }; From 7835471b12c05e058076cc4207fac18b642086dc Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 21 Feb 2019 11:02:02 -0300 Subject: [PATCH 321/606] fixed css links --- frontend/index.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index a70efb9a1..0f8f68e5d 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -71,16 +71,13 @@ -<<<<<<< HEAD -======= ->>>>>>> created clickable card component From 89fd3b3676be2eb7366f6584c9ff3a5d1a78a4a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 21 Feb 2019 11:05:50 -0300 Subject: [PATCH 322/606] Add customizable confirm and cancel messages --- frontend/utils/generic-dialog/gen-dialog.component.js | 4 ++++ frontend/utils/generic-dialog/gen-dialog.html | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/utils/generic-dialog/gen-dialog.component.js b/frontend/utils/generic-dialog/gen-dialog.component.js index 9aa3b5b1c..042656fc9 100644 --- a/frontend/utils/generic-dialog/gen-dialog.component.js +++ b/frontend/utils/generic-dialog/gen-dialog.component.js @@ -26,6 +26,8 @@ title: "@", subtitle: "@", confirmAction: "<", + cancelText: "@", + confirmText: "@", }, transclude: true, }); @@ -36,6 +38,8 @@ dialogCtrl.$onInit = () => { _.defaults(dialogCtrl, { confirmAction: () => {}, + cancelText: "Cancelar", + confirmText: "Confirmar", }); }; diff --git a/frontend/utils/generic-dialog/gen-dialog.html b/frontend/utils/generic-dialog/gen-dialog.html index 1ffa6514e..87ce510d7 100644 --- a/frontend/utils/generic-dialog/gen-dialog.html +++ b/frontend/utils/generic-dialog/gen-dialog.html @@ -7,10 +7,10 @@
    - Cancelar + {{ dialogCtrl.cancelText }} - - Confirmar + + {{ dialogCtrl.confirmText }}
    \ No newline at end of file From 7f244dfa513ad074db907650d4d2287ea0e08df1 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Fri, 15 Feb 2019 10:52:24 -0300 Subject: [PATCH 323/606] modified push notification permission flow --- frontend/auth/authService.js | 4 +--- frontend/home/homeController.js | 10 +++++----- frontend/test/specs/home/homeControllerSpec.js | 8 ++++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/frontend/auth/authService.js b/frontend/auth/authService.js index b242af4aa..df0aca173 100644 --- a/frontend/auth/authService.js +++ b/frontend/auth/authService.js @@ -130,9 +130,7 @@ if (user.emailVerified) { return user.getIdToken(true).then(function(idToken) { return service.setupUser(idToken, user.emailVerified).then(function success(userInfo) { - return PushNotificationService.requestNotificationPermission(service.getCurrentUser()).finally(() => { - return userInfo; - }); + return userInfo; }); }); } else { diff --git a/frontend/home/homeController.js b/frontend/home/homeController.js index 8390154ed..43dc180a0 100644 --- a/frontend/home/homeController.js +++ b/frontend/home/homeController.js @@ -4,7 +4,7 @@ var app = angular.module("app"); app.controller("HomeController", function HomeController(AuthService, $mdDialog, - $state, EventService, ProfileService, $rootScope, POST_EVENTS, STATES) { + $state, EventService, ProfileService, $rootScope, POST_EVENTS, STATES, PushNotificationService) { var homeCtrl = this; var LIMITE_EVENTS = 5; @@ -13,8 +13,6 @@ homeCtrl.followingInstitutions = []; homeCtrl.isLoadingPosts = true; homeCtrl.showMessageOfEmptyEvents = true; - - homeCtrl.user = AuthService.getCurrentUser(); homeCtrl.eventInProgress = function eventInProgress(event) { var end_time = event.end_time; @@ -122,10 +120,12 @@ $rootScope.$broadcast(eventType, post); } - (function main() { + homeCtrl.$onInit = () => { + homeCtrl.user = AuthService.getCurrentUser(); loadEvents(); getFollowingInstitutions(); registerPostEvents(); - })(); + return PushNotificationService.requestNotificationPermission(homeCtrl.user); + }; }); })(); \ No newline at end of file diff --git a/frontend/test/specs/home/homeControllerSpec.js b/frontend/test/specs/home/homeControllerSpec.js index 529f89560..a57ea1e81 100644 --- a/frontend/test/specs/home/homeControllerSpec.js +++ b/frontend/test/specs/home/homeControllerSpec.js @@ -2,7 +2,7 @@ (describe('Test HomeController', function() { - let homeCtrl, httpBackend, scope, createCtrl, mdDialog, state, states, http, postService; + let homeCtrl, httpBackend, scope, createCtrl, mdDialog, state, states, http, postService, pushNotService; var institutions = [{ acronym: 'Certbio', @@ -35,7 +35,7 @@ beforeEach(module('app')); beforeEach(inject(function($controller, $httpBackend, $rootScope, - PostService, $mdDialog, $state, AuthService, $http, STATES) { + PostService, $mdDialog, $state, AuthService, PushNotificationService, $http, STATES) { httpBackend = $httpBackend; http = $http; scope = $rootScope.$new(); @@ -43,6 +43,7 @@ state = $state; postService = PostService; states = STATES; + pushNotService = PushNotificationService; httpBackend.when('GET', "/api/events?page=0&limit=15").respond([event]); httpBackend.when('GET', 'main/main.html').respond(200); @@ -61,11 +62,14 @@ }; spyOn($rootScope, '$on').and.callThrough(); + spyOn(pushNotService, 'requestNotificationPermission'); homeCtrl = createCtrl(); + homeCtrl.$onInit(); httpBackend.flush(); expect($rootScope.$on).toHaveBeenCalled(); + expect(pushNotService.requestNotificationPermission).toHaveBeenCalledWith(new User(user)); })); afterEach(function() { From 0918b4749e77f7d90ead458a4f8ddfdbeee0ba2e Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Fri, 15 Feb 2019 11:20:16 -0300 Subject: [PATCH 324/606] modified dependecy notation[ --- frontend/auth/authService.js | 6 +++--- frontend/home/homeController.js | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/auth/authService.js b/frontend/auth/authService.js index df0aca173..5cdf12243 100644 --- a/frontend/auth/authService.js +++ b/frontend/auth/authService.js @@ -3,8 +3,8 @@ var app = angular.module("app"); - app.service("AuthService", function AuthService($q, $state, $window, UserService, - MessageService, PushNotificationService, STATES) { + app.service("AuthService", ['$q', '$state', '$window', 'UserService', 'MessageService', 'STATES', + function AuthService($q, $state, $window, UserService, MessageService, STATES) { var service = this; var authObj = firebase.auth(); @@ -257,5 +257,5 @@ } init(); - }); + }]); })(); \ No newline at end of file diff --git a/frontend/home/homeController.js b/frontend/home/homeController.js index 43dc180a0..d40f721e0 100644 --- a/frontend/home/homeController.js +++ b/frontend/home/homeController.js @@ -3,8 +3,10 @@ (function() { var app = angular.module("app"); - app.controller("HomeController", function HomeController(AuthService, $mdDialog, - $state, EventService, ProfileService, $rootScope, POST_EVENTS, STATES, PushNotificationService) { + app.controller("HomeController", ['AuthService', '$mdDialog', '$state', 'EventService', 'ProfileService', '$rootScope', + 'PushNotificationService', 'POST_EVENTS', 'STATES', + function HomeController(AuthService, $mdDialog, $state, EventService, ProfileService, $rootScope, + PushNotificationService, POST_EVENTS, STATES) { var homeCtrl = this; var LIMITE_EVENTS = 5; @@ -127,5 +129,5 @@ registerPostEvents(); return PushNotificationService.requestNotificationPermission(homeCtrl.user); }; - }); + }]); })(); \ No newline at end of file From e0f428761ccd09b2d0e0d91646c9250148cac724 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 13:33:48 -0300 Subject: [PATCH 325/606] created clickable card component --- frontend/index.html | 2 ++ .../clickableCard/clickableCard.component.js | 27 +++++++++++++++++++ .../utils/clickableCard/clickable_card.css | 27 +++++++++++++++++++ .../utils/clickableCard/clickable_card.html | 12 +++++++++ 4 files changed, 68 insertions(+) create mode 100644 frontend/utils/clickableCard/clickableCard.component.js create mode 100644 frontend/utils/clickableCard/clickable_card.css create mode 100644 frontend/utils/clickableCard/clickable_card.html diff --git a/frontend/index.html b/frontend/index.html index cb00c1a85..4e19237c4 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -76,6 +76,7 @@ + @@ -173,6 +174,7 @@ + diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js new file mode 100644 index 000000000..ef37656b5 --- /dev/null +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -0,0 +1,27 @@ +"use strict"; + +(()=> { + angular + .module('app') + .component("clickableCard", { + templateUrl: 'app/utils/clickableCard/clickable_card.html', + controller: ClickableCardController, + controllerAs: 'clickableCardCtrl', + bindings: { + icon: '@', + title: '@' + }, + transclude: true + }); + + function ClickableCardController() { + const clickableCardCtrl = this; + + clickableCardCtrl.isOpen = false; + + clickableCardCtrl.onClick = () => { + clickableCardCtrl.isOpen = !clickableCardCtrl.isOpen; + } + } + +})(); \ No newline at end of file diff --git a/frontend/utils/clickableCard/clickable_card.css b/frontend/utils/clickableCard/clickable_card.css new file mode 100644 index 000000000..138317c02 --- /dev/null +++ b/frontend/utils/clickableCard/clickable_card.css @@ -0,0 +1,27 @@ +.clickable-card__toolbar { + background-color: #FFFFFF !important; + box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.5); +} + +#clickable-card__icon--start { + color: #707070; + margin: 0 1em 0 0; + +} + +#clickable-card__icon--end { + color: green; + margin: 0 0 0 auto; +} + + +.clickable-card__title { + color: #004D41; + font-weight: 500; + text-transform: uppercase; + font-size: 0.9em; +} + +.clickable-card__content { + padding: 0 1em; +} \ No newline at end of file diff --git a/frontend/utils/clickableCard/clickable_card.html b/frontend/utils/clickableCard/clickable_card.html new file mode 100644 index 000000000..f7471dbbe --- /dev/null +++ b/frontend/utils/clickableCard/clickable_card.html @@ -0,0 +1,12 @@ +
    + +
    + {{clickableCardCtrl.icon}} + {{ clickableCardCtrl.title}} + {{ clickableCardCtrl.isOpen ? 'arrow_drop_up' : 'arrow_drop_down' }} +
    +     +
    + +
    +
    \ No newline at end of file From 7bc1b03c1a849921fc12edc219ec86daeb4fe96b Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 14:17:30 -0300 Subject: [PATCH 326/606] used the clickableCard on manage members page --- frontend/index.html | 1 + .../institution/management_members_mobile.css | 10 ++++++++++ .../management_members_mobile.html | 19 +++++++++++++++++++ .../utils/clickableCard/clickable_card.css | 14 +++++++++----- .../utils/clickableCard/clickable_card.html | 16 ++++++++-------- 5 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 frontend/institution/management_members_mobile.css create mode 100644 frontend/institution/management_members_mobile.html diff --git a/frontend/index.html b/frontend/index.html index 4e19237c4..0f8f68e5d 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -42,6 +42,7 @@ + diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/management_members_mobile.css new file mode 100644 index 000000000..dba17387f --- /dev/null +++ b/frontend/institution/management_members_mobile.css @@ -0,0 +1,10 @@ +.manage-members { + display: grid; + grid-template-rows: 6em auto 1em; +} + +.manage-members__cards { + grid-row-start: 2; + display: grid; + grid-row-gap: 1em; +} \ No newline at end of file diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html new file mode 100644 index 000000000..561d7a05f --- /dev/null +++ b/frontend/institution/management_members_mobile.html @@ -0,0 +1,19 @@ + +
    + +

    membros

    +     + +

    membros

    +     + +

    membros

    +     + +

    membros

    +     + +

    membros

    +     +
    +     \ No newline at end of file diff --git a/frontend/utils/clickableCard/clickable_card.css b/frontend/utils/clickableCard/clickable_card.css index 138317c02..e9897228b 100644 --- a/frontend/utils/clickableCard/clickable_card.css +++ b/frontend/utils/clickableCard/clickable_card.css @@ -1,16 +1,19 @@ +.clickable-card { + display: grid; + box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.3); +} + .clickable-card__toolbar { background-color: #FFFFFF !important; - box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.5); } #clickable-card__icon--start { color: #707070; margin: 0 1em 0 0; - } #clickable-card__icon--end { - color: green; + color: #17ea17; margin: 0 0 0 auto; } @@ -19,9 +22,10 @@ color: #004D41; font-weight: 500; text-transform: uppercase; - font-size: 0.9em; + font-size: 0.7em; } .clickable-card__content { - padding: 0 1em; + background-color: #FFFFFF; + padding: 0 1em 1.5em 1em; } \ No newline at end of file diff --git a/frontend/utils/clickableCard/clickable_card.html b/frontend/utils/clickableCard/clickable_card.html index f7471dbbe..a751bdccb 100644 --- a/frontend/utils/clickableCard/clickable_card.html +++ b/frontend/utils/clickableCard/clickable_card.html @@ -1,12 +1,12 @@
    -
    - {{clickableCardCtrl.icon}} - {{ clickableCardCtrl.title}} - {{ clickableCardCtrl.isOpen ? 'arrow_drop_up' : 'arrow_drop_down' }} -
    -     -
    - +
    + {{clickableCardCtrl.icon}} + {{ clickableCardCtrl.title}} + {{ clickableCardCtrl.isOpen ? 'arrow_drop_up' : 'arrow_drop_down' }}
    + +
    + +
    \ No newline at end of file From 84bef044828f6dd30a5a23fa392068a511af4715 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 16:37:05 -0300 Subject: [PATCH 327/606] finished the send invites section --- frontend/app.js | 8 +++-- frontend/institution/management_members.html | 4 +-- .../institution/management_members_mobile.css | 35 +++++++++++++++++++ .../management_members_mobile.html | 25 ++++++++++++- frontend/styles/custom.css | 3 +- .../utils/clickableCard/clickable_card.css | 2 +- 6 files changed, 70 insertions(+), 7 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 0c60df219..e3da0d30a 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -244,7 +244,11 @@ url: "/managementMembers", views: { content_manage_institution: { - templateUrl: "app/institution/management_members.html", + templateUrl: Utils.selectFieldBasedOnScreenSize( + "app/institution/management_members.html", + "app/institution/management_members_mobile.html", + SCREEN_SIZES.SMARTPHONE + ), controller: "ManagementMembersController as manageMemberCtrl" } } @@ -612,6 +616,6 @@ } (function main() { - initServiceWorker(); + // initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/institution/management_members.html b/frontend/institution/management_members.html index ca79f524f..98208e9ca 100644 --- a/frontend/institution/management_members.html +++ b/frontend/institution/management_members.html @@ -23,9 +23,9 @@

    Convidar membros

    Endereço de e-mail

    - - diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/management_members_mobile.css index dba17387f..ce0635f9c 100644 --- a/frontend/institution/management_members_mobile.css +++ b/frontend/institution/management_members_mobile.css @@ -7,4 +7,39 @@ grid-row-start: 2; display: grid; grid-row-gap: 1em; +} + +/* Send events section */ +.manage-members__send__invites { + display: grid; + grid-row-gap: 1em; +} + +.manage-members__send__invites > h3, +.manage-members__send__invites > p { + margin: 0; +} + +.manage-members__send__invites > .description { + font-size: 0.9em; + color: grey; +} + +.manage-members__send__invites > .subtitle { + font-size: 0.8em; + font-weight: 500; +} + +.manage-members__send__invites md-input-container { + padding-right: 0; + margin: 0; + color: #9E9E9E; +} + +.manage-members__send__invites--btn { + width: 30%; + justify-self: end; + background-color: #009688; + color: white; + margin-right: 0; } \ No newline at end of file diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index 561d7a05f..3285b86df 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -1,17 +1,40 @@
    -

    membros

    +
    +

    Convidar Membros

    +

    + Coloque abaixo os endereços de e-mail das pessoas que você deseja convidar + para fazer parte da sua instituição na Plataforma CIS. +

    +

    Endereço de e-mail

    + + + + + + + Enviar + + +
    +

    membros

     +

    membros

     +

    membros

     +

    membros

     diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index a639e9744..491ad4b4f 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -952,7 +952,8 @@ md-radio-button.md-default-theme.md-checked .md-off, md-radio-button.md-checked font-size: 10px; } -md-input-container:not(.md-input-invalid).md-input-has-value .inputEmail { +md-input-container:not(.md-input-invalid).md-input-focused .green-input, + md-input-container:not(.md-input-invalid).md-input-has-value.md-input-focused .green-input { border-color:#009688; border-width: 0 0 2px; } diff --git a/frontend/utils/clickableCard/clickable_card.css b/frontend/utils/clickableCard/clickable_card.css index e9897228b..047b1b608 100644 --- a/frontend/utils/clickableCard/clickable_card.css +++ b/frontend/utils/clickableCard/clickable_card.css @@ -27,5 +27,5 @@ .clickable-card__content { background-color: #FFFFFF; - padding: 0 1em 1.5em 1em; + padding: 1em; } \ No newline at end of file From e524c8a67ff8ab140300c0bf6c43569ed719baf5 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 17:10:56 -0300 Subject: [PATCH 328/606] removed h3 tag --- frontend/institution/management_members_mobile.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index 3285b86df..d27a8685c 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -24,19 +24,15 @@

    Convidar Membros

    -

    membros

     -

    membros

     -

    membros

     -

    membros
    \ No newline at end of file From 0977c03aff33d77dab2b710a63faf7ace7d0e229 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 17:13:29 -0300 Subject: [PATCH 329/606] uncommented the initServiceWorker --- frontend/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app.js b/frontend/app.js index e3da0d30a..e74c2d552 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -616,6 +616,6 @@ } (function main() { - // initServiceWorker(); + initServiceWorker(); })(); })(); \ No newline at end of file From fd4f81aa6c8a8357030e2dba3bf9b9c3f473bd55 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 21 Feb 2019 10:48:31 -0300 Subject: [PATCH 330/606] refact clickableCard component --- .../utils/clickableCard/clickableCard.component.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js index ef37656b5..c7f8768ca 100644 --- a/frontend/utils/clickableCard/clickableCard.component.js +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -1,6 +1,6 @@ "use strict"; -(()=> { +(function () { angular .module('app') .component("clickableCard", { @@ -16,8 +16,12 @@ function ClickableCardController() { const clickableCardCtrl = this; - - clickableCardCtrl.isOpen = false; + + clickableCardCtrl.$onInit = () => { + Object.assign(clickableCardCtrl, { + isOpen: true + }); + }; clickableCardCtrl.onClick = () => { clickableCardCtrl.isOpen = !clickableCardCtrl.isOpen; From dd4dabb2c2bddd16b6987a7e5313c8c0b944e669 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 21 Feb 2019 10:56:40 -0300 Subject: [PATCH 331/606] changed defaul value of isOpen flag --- frontend/utils/clickableCard/clickableCard.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js index c7f8768ca..326d5b0ed 100644 --- a/frontend/utils/clickableCard/clickableCard.component.js +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -19,7 +19,7 @@ clickableCardCtrl.$onInit = () => { Object.assign(clickableCardCtrl, { - isOpen: true + isOpen: false }); }; From 813c1966a898538d028b0d7ed3b43aa29782dfd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 21 Feb 2019 11:06:09 -0300 Subject: [PATCH 332/606] Add auto hide on confirmation click --- frontend/utils/generic-dialog/gen-dialog.component.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/utils/generic-dialog/gen-dialog.component.js b/frontend/utils/generic-dialog/gen-dialog.component.js index 042656fc9..9196ad771 100644 --- a/frontend/utils/generic-dialog/gen-dialog.component.js +++ b/frontend/utils/generic-dialog/gen-dialog.component.js @@ -44,6 +44,10 @@ }; dialogCtrl.cancelDialog = $mdDialog.cancel; + dialogCtrl.confirmDialog = () => { + dialogCtrl.confirmAction(); + $mdDialog.hide(); + }; } })(); \ No newline at end of file From 8b1c32229a599963c1e0450967f60c2ee64cbdbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 21 Feb 2019 11:11:50 -0300 Subject: [PATCH 333/606] Refact use of gen-dialog --- frontend/pdfUpload/pdfService.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/frontend/pdfUpload/pdfService.js b/frontend/pdfUpload/pdfService.js index b032b000c..d0c067d84 100644 --- a/frontend/pdfUpload/pdfService.js +++ b/frontend/pdfUpload/pdfService.js @@ -104,7 +104,6 @@ pdf: pdf }, controller: [ - "$mdDialog", "PdfService", "$sce", "pdf", @@ -114,7 +113,7 @@ }); }; - function PdfDialogController($mdDialog, PdfService, $sce, pdf) { + function PdfDialogController(PdfService, $sce, pdf) { var ctrl = this; ctrl.pdfUrl = ""; ctrl.isLoadingPdf = true; @@ -129,10 +128,7 @@ }); } - ctrl.downloadPdf = () => { - PdfService.download(ctrl.pdf.url); - $mdDialog.hide(); - }; + ctrl.downloadPdf = () => PdfService.download(ctrl.pdf.url); (function main() { if (!Utils.isMobileScreen()) readPdf(); From 4a719f6b3aefc0e5527c6805a52fce4e0a57c2f3 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 16:37:05 -0300 Subject: [PATCH 334/606] finished the send invites section --- frontend/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app.js b/frontend/app.js index e74c2d552..e3da0d30a 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -616,6 +616,6 @@ } (function main() { - initServiceWorker(); + // initServiceWorker(); })(); })(); \ No newline at end of file From dec16bcbccc3b1d76f6d5893e313eaa6352ded8a Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 17:13:29 -0300 Subject: [PATCH 335/606] uncommented the initServiceWorker --- frontend/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app.js b/frontend/app.js index e3da0d30a..e74c2d552 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -616,6 +616,6 @@ } (function main() { - // initServiceWorker(); + initServiceWorker(); })(); })(); \ No newline at end of file From b553bc7d9f6e2af22b4554237ed76e248ba00316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 21 Feb 2019 11:49:51 -0300 Subject: [PATCH 336/606] Remove unnecessary comma --- frontend/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app.js b/frontend/app.js index 4105ff758..3e76c0033 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -88,7 +88,7 @@ "app/event/events_mobile.html", 475), controller: "EventController as eventCtrl", } - }, + } }) .state(STATES.CREATE_EVENT, { url: "/create_event/:eventKey", From e3a864a41490e5ae5501e35843575e76cc848481 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 21 Feb 2019 12:01:19 -0300 Subject: [PATCH 337/606] added the isOpen bind to component --- frontend/utils/clickableCard/clickableCard.component.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js index 326d5b0ed..016afd6c8 100644 --- a/frontend/utils/clickableCard/clickableCard.component.js +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -9,7 +9,8 @@ controllerAs: 'clickableCardCtrl', bindings: { icon: '@', - title: '@' + title: '@', + isOpen: '<' }, transclude: true }); @@ -19,7 +20,8 @@ clickableCardCtrl.$onInit = () => { Object.assign(clickableCardCtrl, { - isOpen: false + isOpen: false, + ...clickableCardCtrl }); }; From bc93da4063800e46b69df4d8a2c6147a24897abf Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 12:14:22 -0300 Subject: [PATCH 338/606] Change controller to AddressFormController --- frontend/institution/forms/addressForm.component.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/institution/forms/addressForm.component.js b/frontend/institution/forms/addressForm.component.js index 85b7373d2..1ec48cbbd 100644 --- a/frontend/institution/forms/addressForm.component.js +++ b/frontend/institution/forms/addressForm.component.js @@ -1,7 +1,7 @@ 'use strict'; (function () { - function controller(brCidadesEstados, $http) { + function AddressFormController(brCidadesEstados, $http) { const ctrl = this; ctrl.states = {}; ctrl.countries = {}; @@ -38,7 +38,7 @@ const app = angular.module('app'); app.component('addressForm', { - controller: controller, + controller: AddressFormController, controllerAs: 'ctrl', templateUrl: 'app/institution/forms/address_form.html', bindings: { From 96c9e09cdd55327ce4fafe0a200cf6044f0c169d Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 12:14:22 -0300 Subject: [PATCH 339/606] Change controller to AddressFormController --- frontend/institution/forms/addressForm.component.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/institution/forms/addressForm.component.js b/frontend/institution/forms/addressForm.component.js index 85b7373d2..1ec48cbbd 100644 --- a/frontend/institution/forms/addressForm.component.js +++ b/frontend/institution/forms/addressForm.component.js @@ -1,7 +1,7 @@ 'use strict'; (function () { - function controller(brCidadesEstados, $http) { + function AddressFormController(brCidadesEstados, $http) { const ctrl = this; ctrl.states = {}; ctrl.countries = {}; @@ -38,7 +38,7 @@ const app = angular.module('app'); app.component('addressForm', { - controller: controller, + controller: AddressFormController, controllerAs: 'ctrl', templateUrl: 'app/institution/forms/address_form.html', bindings: { From ea540adc929272731d2f00786d898b3af97fdc50 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 21 Feb 2019 14:17:12 -0300 Subject: [PATCH 340/606] removed the md-toolbar from card template --- frontend/institution/management_members_mobile.css | 2 +- frontend/utils/clickableCard/clickable_card.css | 10 ++++++---- frontend/utils/clickableCard/clickable_card.html | 6 ++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/management_members_mobile.css index ce0635f9c..dcfaf3bf5 100644 --- a/frontend/institution/management_members_mobile.css +++ b/frontend/institution/management_members_mobile.css @@ -9,7 +9,7 @@ grid-row-gap: 1em; } -/* Send events section */ +/* Send invites section */ .manage-members__send__invites { display: grid; grid-row-gap: 1em; diff --git a/frontend/utils/clickableCard/clickable_card.css b/frontend/utils/clickableCard/clickable_card.css index 047b1b608..be5fda365 100644 --- a/frontend/utils/clickableCard/clickable_card.css +++ b/frontend/utils/clickableCard/clickable_card.css @@ -4,7 +4,11 @@ } .clickable-card__toolbar { - background-color: #FFFFFF !important; + padding: 0.8em 1em; + display: grid; + grid-template-rows: 1fr; + grid-template-columns: 15% auto 10%; + align-items: center; } #clickable-card__icon--start { @@ -14,15 +18,13 @@ #clickable-card__icon--end { color: #17ea17; - margin: 0 0 0 auto; } - .clickable-card__title { color: #004D41; font-weight: 500; text-transform: uppercase; - font-size: 0.7em; + font-size: 0.9em; } .clickable-card__content { diff --git a/frontend/utils/clickableCard/clickable_card.html b/frontend/utils/clickableCard/clickable_card.html index a751bdccb..310036c41 100644 --- a/frontend/utils/clickableCard/clickable_card.html +++ b/frontend/utils/clickableCard/clickable_card.html @@ -1,11 +1,9 @@
    - -
    +
    {{clickableCardCtrl.icon}} {{ clickableCardCtrl.title}} {{ clickableCardCtrl.isOpen ? 'arrow_drop_up' : 'arrow_drop_down' }} -
    - +
    From 2560e12d08850cab0f948c8193a971e01c1af0be Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 21 Feb 2019 14:59:32 -0300 Subject: [PATCH 341/606] set card title to be responsive --- frontend/institution/management_members_mobile.css | 6 ++++++ frontend/utils/clickableCard/clickable_card.css | 2 ++ frontend/utils/clickableCard/clickable_card.html | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/management_members_mobile.css index dcfaf3bf5..85c122aae 100644 --- a/frontend/institution/management_members_mobile.css +++ b/frontend/institution/management_members_mobile.css @@ -3,6 +3,12 @@ grid-template-rows: 6em auto 1em; } +.manage-members__toolbar__title { + color: #737474; + text-transform: uppercase; + white-space: nowrap; +} + .manage-members__cards { grid-row-start: 2; display: grid; diff --git a/frontend/utils/clickableCard/clickable_card.css b/frontend/utils/clickableCard/clickable_card.css index be5fda365..3a6016d23 100644 --- a/frontend/utils/clickableCard/clickable_card.css +++ b/frontend/utils/clickableCard/clickable_card.css @@ -4,7 +4,9 @@ } .clickable-card__toolbar { + height: 2em; padding: 0.8em 1em; + background-color: #ffff; display: grid; grid-template-rows: 1fr; grid-template-columns: 15% auto 10%; diff --git a/frontend/utils/clickableCard/clickable_card.html b/frontend/utils/clickableCard/clickable_card.html index 310036c41..11ab0ca82 100644 --- a/frontend/utils/clickableCard/clickable_card.html +++ b/frontend/utils/clickableCard/clickable_card.html @@ -1,7 +1,7 @@
    {{clickableCardCtrl.icon}} - {{ clickableCardCtrl.title}} + {{ clickableCardCtrl.title}} {{ clickableCardCtrl.isOpen ? 'arrow_drop_up' : 'arrow_drop_down' }}
    From ec1c6cb3f2eb234387f92ac2c1ed2b3facca5e23 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 15:25:22 -0300 Subject: [PATCH 342/606] Finish institution form --- frontend/institution/forms/forms.css | 27 +++---------- .../forms/institutionForm.component.js | 37 ++++++++++++++++-- .../institution/forms/institution_form.html | 38 +++++++++---------- 3 files changed, 58 insertions(+), 44 deletions(-) diff --git a/frontend/institution/forms/forms.css b/frontend/institution/forms/forms.css index f9927a566..007c7065b 100644 --- a/frontend/institution/forms/forms.css +++ b/frontend/institution/forms/forms.css @@ -48,27 +48,12 @@ address-form #address-form { display: grid; } -/* #create-inst-card-content #institution-data { */ -/* display: grid; */ -/* grid-template-rows: 1.2fr repeat(7, 1fr); */ -/* height: 100%; */ -/* width: 100%; */ -/* } */ - -/* #create-inst-card-content #inst-picture-picker { */ -/* display: grid; */ -/* grid-auto-flow: column; */ -/* grid-template-columns: 1fr 3fr; */ -/* background: #ddd; */ -/* margin-bottom: 1em; */ -/* } */ - -/* #inst-picture-picker .picture-picker { */ -/* width: 3.6em; */ -/* height: 3.6em; */ -/* align-self: center; */ -/* justify-self: center; */ -/* } */ +institution-form #institution-form { + display: grid; + grid-template-rows: auto repeat(7, 1fr); + height: 100%; + width: 100%; +} /* #inst-picture-picker img.inst-picture { */ /* width: 3.6em; */ diff --git a/frontend/institution/forms/institutionForm.component.js b/frontend/institution/forms/institutionForm.component.js index 8bd479e0e..a1aca50f8 100644 --- a/frontend/institution/forms/institutionForm.component.js +++ b/frontend/institution/forms/institutionForm.component.js @@ -1,21 +1,50 @@ 'use strict'; (function () { - function controller() { + function InstitutionFormController(CropImageService, ImageService, MessageService, $scope, InstitutionService) { const ctrl = this; + ctrl.institution = {}; + ctrl.pictureFile = {}; + ctrl.actuationAreas = {}; + ctrl.legalNatures = {}; + ctrl.numberRegex = /\d+$/ + ctrl.phoneRegex = /\d{2}\s\d{4,5}\-\d{4,5}/ + + ctrl.cropThenSetImage = (event) => { + CropImageService.crop(ctrl.pictureFile, event).then((cropped) => { + const size = 800; + ImageService.compress(cropped, size).then((resized) => { + ctrl.onNewPhoto({photoSrc: resized}); + ImageService.readFile(resized, (img) => { + ctrl.institution.photo_url = img.src; + ctrl.pictureFile = null; + $scope.$apply(); + }); + }); + }).catch(e => { + MessageService.showToast(e); + ctrl.pictureFile = null; + }); + } ctrl.$onInit = () => { - ctrl.configInstCtrl = ctrl.parentCtrl; + InstitutionService.getLegalNatures().then(res => { + ctrl.legalNatures = res; + }); + InstitutionService.getActuationAreas().then(res => { + ctrl.actuationAreas = res; + }); } } const app = angular.module('app'); app.component('institutionForm', { - controller: controller, + controller: InstitutionFormController, controllerAs: 'ctrl', templateUrl: 'app/institution/forms/institution_form.html', bindings: { - parentCtrl: '=', + institution: '=', + onNewPhoto: '&', } }); })(); diff --git a/frontend/institution/forms/institution_form.html b/frontend/institution/forms/institution_form.html index 7d96139a7..2f022d70f 100644 --- a/frontend/institution/forms/institution_form.html +++ b/frontend/institution/forms/institution_form.html @@ -1,23 +1,23 @@ -
    -
    + +
    - add_a_photo - + - {{ ctrl.configInstCtrl.suggestedName }} + {{ ctrl.institution.name }}
    + md-maxlength='90' + maxlength=90>
    Este campo é obrigatório!
    @@ -25,7 +25,7 @@
    Este campo é obrigatório!
    @@ -34,14 +34,14 @@ - + - {{ value }} @@ -52,9 +52,9 @@ - {{ value }} @@ -65,8 +65,8 @@ -
    O ramal deve ser válido!
    From 83f1e872666b9325d0abe3880f096235c745dc36 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 15:30:21 -0300 Subject: [PATCH 343/606] CreateInvite changes for new form component --- frontend/institution/createInvitedInstitutionController.js | 5 +++++ frontend/institution/create_inst_form_mobile.html | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index 5f82f70da..78144e763 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -99,6 +99,10 @@ } }) + ctrl.onNewPhoto = (photoSrc) => { + ctrl.photoSrc = photoSrc; + } + // main() // initController() // setDefaultPhotoUrl @@ -106,6 +110,7 @@ ctrl.institutionKey = $state.params.institutionKey; if (ctrl.institutionKey) { ctrl.loadInstitution(ctrl.institutionKey) + // handle if its not a institution invite } else { $state.go(STATES.HOME); } diff --git a/frontend/institution/create_inst_form_mobile.html b/frontend/institution/create_inst_form_mobile.html index 5ac0676d6..5831956b9 100644 --- a/frontend/institution/create_inst_form_mobile.html +++ b/frontend/institution/create_inst_form_mobile.html @@ -20,7 +20,8 @@

    {{ ctrl.currentStepLabel }}

    + institution='ctrl.newInstitution' + on-new-photo='ctrl.onNewPhoto(photoSrc)'> Date: Thu, 21 Feb 2019 15:37:34 -0300 Subject: [PATCH 344/606] Use HttpService instead of $http --- frontend/institution/forms/addressForm.component.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/institution/forms/addressForm.component.js b/frontend/institution/forms/addressForm.component.js index 1ec48cbbd..876ead2f1 100644 --- a/frontend/institution/forms/addressForm.component.js +++ b/frontend/institution/forms/addressForm.component.js @@ -1,7 +1,7 @@ 'use strict'; (function () { - function AddressFormController(brCidadesEstados, $http) { + function AddressFormController(brCidadesEstados, HttpService) { const ctrl = this; ctrl.states = {}; ctrl.countries = {}; @@ -30,8 +30,8 @@ ctrl.$onInit = () => { ctrl.states = brCidadesEstados.estados; - $http.get('app/institution/countries.json').then(res => { - ctrl.countries = res.data; + HttpService.get('app/institution/countries.json').then(res => { + ctrl.countries = res; }); } } From 5114db186f41bac38bed8d452ccb11e0c1e1baa7 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 15:37:34 -0300 Subject: [PATCH 345/606] Use HttpService instead of $http --- frontend/institution/forms/addressForm.component.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/institution/forms/addressForm.component.js b/frontend/institution/forms/addressForm.component.js index 1ec48cbbd..876ead2f1 100644 --- a/frontend/institution/forms/addressForm.component.js +++ b/frontend/institution/forms/addressForm.component.js @@ -1,7 +1,7 @@ 'use strict'; (function () { - function AddressFormController(brCidadesEstados, $http) { + function AddressFormController(brCidadesEstados, HttpService) { const ctrl = this; ctrl.states = {}; ctrl.countries = {}; @@ -30,8 +30,8 @@ ctrl.$onInit = () => { ctrl.states = brCidadesEstados.estados; - $http.get('app/institution/countries.json').then(res => { - ctrl.countries = res.data; + HttpService.get('app/institution/countries.json').then(res => { + ctrl.countries = res; }); } } From f346556ec39a4a2461564fa69e9315f6a6f70198 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 15:43:21 -0300 Subject: [PATCH 346/606] Add new institution form (second step on invite) --- frontend/institution/forms/forms.css | 49 +++++++++++ .../forms/institutionForm.component.js | 50 +++++++++++ .../institution/forms/institution_form.html | 87 +++++++++++++++++++ 3 files changed, 186 insertions(+) create mode 100644 frontend/institution/forms/forms.css create mode 100644 frontend/institution/forms/institutionForm.component.js create mode 100644 frontend/institution/forms/institution_form.html diff --git a/frontend/institution/forms/forms.css b/frontend/institution/forms/forms.css new file mode 100644 index 000000000..77a6fd1fe --- /dev/null +++ b/frontend/institution/forms/forms.css @@ -0,0 +1,49 @@ +address-form #address-form { + display: grid; + grid-template-areas: + "street street street" + "number neighbourhood neighbourhood" + "country state city" + "cep cep cep"; + grid-template-columns: repeat(3, calc(100%/3)); + grid-template-rows: repeat(4, 1fr); +} + +#address-form #street { + grid-area: street; +} + +#address-form #number { + grid-area: number; +} + +#address-form #neighbourhood { + grid-area: neighbourhood; +} + +#address-form #city { + grid-area: city; +} + +#address-form #state { + grid-area: state; +} + +#address-form #country { + grid-area: country; +} + +#address-form #cep { + grid-area: cep; +} + +.state-required { + font-size: 0.6em; + line-height: 1em; + overflow: visible; +} + +.limit-md-select { + justify-self: center; + display: grid; +} diff --git a/frontend/institution/forms/institutionForm.component.js b/frontend/institution/forms/institutionForm.component.js new file mode 100644 index 000000000..a1aca50f8 --- /dev/null +++ b/frontend/institution/forms/institutionForm.component.js @@ -0,0 +1,50 @@ +'use strict'; + +(function () { + function InstitutionFormController(CropImageService, ImageService, MessageService, $scope, InstitutionService) { + const ctrl = this; + ctrl.institution = {}; + ctrl.pictureFile = {}; + ctrl.actuationAreas = {}; + ctrl.legalNatures = {}; + ctrl.numberRegex = /\d+$/ + ctrl.phoneRegex = /\d{2}\s\d{4,5}\-\d{4,5}/ + + ctrl.cropThenSetImage = (event) => { + CropImageService.crop(ctrl.pictureFile, event).then((cropped) => { + const size = 800; + ImageService.compress(cropped, size).then((resized) => { + ctrl.onNewPhoto({photoSrc: resized}); + ImageService.readFile(resized, (img) => { + ctrl.institution.photo_url = img.src; + ctrl.pictureFile = null; + $scope.$apply(); + }); + }); + }).catch(e => { + MessageService.showToast(e); + ctrl.pictureFile = null; + }); + } + + ctrl.$onInit = () => { + InstitutionService.getLegalNatures().then(res => { + ctrl.legalNatures = res; + }); + InstitutionService.getActuationAreas().then(res => { + ctrl.actuationAreas = res; + }); + } + } + + const app = angular.module('app'); + app.component('institutionForm', { + controller: InstitutionFormController, + controllerAs: 'ctrl', + templateUrl: 'app/institution/forms/institution_form.html', + bindings: { + institution: '=', + onNewPhoto: '&', + } + }); +})(); diff --git a/frontend/institution/forms/institution_form.html b/frontend/institution/forms/institution_form.html new file mode 100644 index 000000000..2f022d70f --- /dev/null +++ b/frontend/institution/forms/institution_form.html @@ -0,0 +1,87 @@ + +
    + + + + {{ ctrl.institution.name }} +
    + + + +
    +
    Este campo é obrigatório!
    +
    +     + + + +
    +
    Este campo é obrigatório!
    +
    O email deve ser válido!
    +
    +     + + + + + + + + {{ value }} + + +
    +
    Este campo é obrigatório!
    +
    +     + + + + {{ value }} + + +
    +
    Este campo é obrigatório!
    +
    +     + + + +
    +
    O número de telefone deve ser válido!
    +
    +     + + + +
    +
    O ramal deve ser válido!
    +
    +     + From 1bbc0861af06f388e5f01c974f353c7f629b0576 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 15:45:06 -0300 Subject: [PATCH 347/606] Add institution form css changes --- frontend/institution/forms/forms.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/institution/forms/forms.css b/frontend/institution/forms/forms.css index 77a6fd1fe..5b6cc9100 100644 --- a/frontend/institution/forms/forms.css +++ b/frontend/institution/forms/forms.css @@ -47,3 +47,10 @@ address-form #address-form { justify-self: center; display: grid; } + +institution-form #institution-form { + display: grid; + grid-template-rows: auto repeat(7, 1fr); + height: 100%; + width: 100%; +} From 33d5ffff72c5c0faeaf58e383f6ac8e5f9976d89 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 16:51:45 -0300 Subject: [PATCH 348/606] Change css order --- frontend/institution/forms/forms.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/forms/forms.css b/frontend/institution/forms/forms.css index 5b6cc9100..278d08c2d 100644 --- a/frontend/institution/forms/forms.css +++ b/frontend/institution/forms/forms.css @@ -50,7 +50,7 @@ address-form #address-form { institution-form #institution-form { display: grid; - grid-template-rows: auto repeat(7, 1fr); height: 100%; width: 100%; + grid-template-rows: auto repeat(7, 1fr); } From 2b0b4d3657b455a51007d2e1391952dbfd6de32c Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 17:11:24 -0300 Subject: [PATCH 349/606] Use inline array notation on controller --- frontend/institution/forms/institutionForm.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/forms/institutionForm.component.js b/frontend/institution/forms/institutionForm.component.js index a1aca50f8..70b219da1 100644 --- a/frontend/institution/forms/institutionForm.component.js +++ b/frontend/institution/forms/institutionForm.component.js @@ -39,7 +39,7 @@ const app = angular.module('app'); app.component('institutionForm', { - controller: InstitutionFormController, + controller: ['CropImageService', 'ImageService', 'MessageService', '$scope', 'InstitutionService', InstitutionFormController], controllerAs: 'ctrl', templateUrl: 'app/institution/forms/institution_form.html', bindings: { From 722edd65b2ef69082c438360313fb730e52da137 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 17:11:24 -0300 Subject: [PATCH 350/606] Use inline array notation on controller --- frontend/institution/forms/institutionForm.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/forms/institutionForm.component.js b/frontend/institution/forms/institutionForm.component.js index a1aca50f8..70b219da1 100644 --- a/frontend/institution/forms/institutionForm.component.js +++ b/frontend/institution/forms/institutionForm.component.js @@ -39,7 +39,7 @@ const app = angular.module('app'); app.component('institutionForm', { - controller: InstitutionFormController, + controller: ['CropImageService', 'ImageService', 'MessageService', '$scope', 'InstitutionService', InstitutionFormController], controllerAs: 'ctrl', templateUrl: 'app/institution/forms/institution_form.html', bindings: { From eedd08bccb0ddb94768e6c3242162e90927e7ebe Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 21 Feb 2019 17:22:53 -0300 Subject: [PATCH 351/606] Change finalForm component name --- frontend/index.html | 2 +- frontend/institution/create_inst_form_mobile.html | 12 ++++++------ ...alForm.component.js => lastInfoForm.component.js} | 4 ++-- .../forms/{final_form.html => last_info_form.html} | 0 4 files changed, 9 insertions(+), 9 deletions(-) rename frontend/institution/forms/{finalForm.component.js => lastInfoForm.component.js} (76%) rename frontend/institution/forms/{final_form.html => last_info_form.html} (100%) diff --git a/frontend/index.html b/frontend/index.html index 1fc7716b9..ab121968e 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -242,7 +242,7 @@ - + diff --git a/frontend/institution/create_inst_form_mobile.html b/frontend/institution/create_inst_form_mobile.html index 5831956b9..be8291ffa 100644 --- a/frontend/institution/create_inst_form_mobile.html +++ b/frontend/institution/create_inst_form_mobile.html @@ -16,17 +16,17 @@

    {{ ctrl.currentStepLabel }}

    + address='ctrl.newInstitution.address'> + institution='ctrl.newInstitution' + on-new-photo='ctrl.onNewPhoto(photoSrc)'> - - + +
    console.log("chegou no erro", erro)); } } (function main() { - // initServiceWorker(); + initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/main/mainController.js b/frontend/main/mainController.js index 22924443b..c3b442444 100644 --- a/frontend/main/mainController.js +++ b/frontend/main/mainController.js @@ -3,7 +3,7 @@ var app = angular.module('app'); app.controller("MainController", function MainController($mdSidenav, $state, AuthService, UtilsService, - UserService, RequestInvitationService, $window, NotificationListenerService, STATES, SCREEN_SIZES) { + UserService, RequestInvitationService, $window, NotificationListenerService, STATES, SCREEN_SIZES, PushNotificationService) { var mainCtrl = this; var url_report = Config.SUPPORT_URL + "/report"; @@ -183,6 +183,7 @@ } notificationListener(); mainCtrl.getPendingTasks(); + PushNotificationService.setupPushNotificationPermission(); })(); }); })(); diff --git a/frontend/notification/pushNotificationService.js b/frontend/notification/pushNotificationService.js index 24899109d..e157cf8a4 100644 --- a/frontend/notification/pushNotificationService.js +++ b/frontend/notification/pushNotificationService.js @@ -4,7 +4,7 @@ const app = angular.module('app'); app.service('PushNotificationService', function PushNotificationService($firebaseArray, - $firebaseObject, $q) { + $firebaseObject, $q, AuthService ) { /** * Service responsible for send request permission * to enable notifications to the user and for deal @@ -23,38 +23,57 @@ const ref = firebase.database().ref(); const PUSH_NOTIFICATIONS_URL = "pushNotifications/"; - + + service.firebaseArrayNotifications; + + /** + * + */ + service.setupPushNotificationPermission = () => { + service._initFirebaseArray(); + }; + + /** + * Check if the user has blocked push notification in the browser for this application. + */ + service.isPushNotificationBlockedOnBrowser = function isPushNotificationBlockedOnBrowser() { + const { permission } = Notification; + return permission === "denied"; + }; + + /** + * + */ + service.isPushNotificationActive = function () { + return service._getTokenObjectInFirebaseArray().then((tokenObject) => { + return !!tokenObject; + }); + }; + + /** + * + */ + service.unsubscribeUserNotification = () => { + return service._removeTokenFromFirebaseArray(); + }; + /** + * + * @returns {*} * @private */ - service._isMobile = { - Android: () => { - return navigator.userAgent.match(/Android/i); - }, - BlackBerry: () => { - return navigator.userAgent.match(/BlackBerry/i); - }, - iOS: () => { - return navigator.userAgent.match(/iPhone|iPad|iPod/i); - }, - Opera: () => { - return navigator.userAgent.match(/Opera Mini/i); - }, - Windows: () => { - return navigator.userAgent.match(/IEMobile/i); - }, - any: () => { - return ( - service._isMobile.Android() || - service._isMobile.BlackBerry() || - service._isMobile.iOS() || - service._isMobile.Opera() || - service._isMobile.Windows() - ); - } + service._removeTokenFromFirebaseArray = () => { + return service._getTokenObjectInFirebaseArray().then((tokenObject) => { + tokenObject && service.firebaseArrayNotifications.$remove(tokenObject); + }); }; - service.firebaseArrayNotifications; + /** + * + */ + service.subscribeUserNotification = () => { + return service._requestNotificationPermission(); + }; /** * Ask permission to the user to send push notifications @@ -62,10 +81,8 @@ * is retrieved and saveToken is called passing the token * as parameter. */ - service.requestNotificationPermission = function requestNotificationPermission(user) { - service.currentUser = user; - const isOnMobile = service._isMobile.any(); - if (messaging && !service.hasNotificationPermission() && isOnMobile) { + service._requestNotificationPermission = function requestNotificationPermission() { + if (messaging && !service.isPushNotificationBlockedOnBrowser()) { return messaging.requestPermission().then(() => { return messaging.getToken().then(token => { service._saveToken(token); @@ -78,13 +95,6 @@ return $q.when(); }; - /** - * - */ - service.unsubscribeUserNotification = () => { - service._saveToken(''); - }; - /** * It receives a token, starts a reference to * firebase's database and save the token. @@ -104,7 +114,7 @@ * @private */ service._initFirebaseArray = function initFirebaseArray() { - const endPoint = `${PUSH_NOTIFICATIONS_URL}${service.currentUser.key}`; + const endPoint = PUSH_NOTIFICATIONS_URL + AuthService.getCurrentUser().key; const notificationsRef = ref.child(endPoint); if (!service.firebaseArrayNotifications) { @@ -131,12 +141,22 @@ }; /** - * Check if the user has already conceded the permission - * using Notification object. + * + * @returns {null|*} + * @private */ - service.hasNotificationPermission = function hasNotificationPermission() { - const { permission } = Notification; - return permission === "granted"; + service._getTokenObjectInFirebaseArray = () => { + return messaging && messaging.getToken().then((deviceToken) => { + return service.firebaseArrayNotifications.$loaded().then((updatedArray) => { + let tokenObject; + updatedArray.map((objectToken) => { + if (objectToken.token === deviceToken){ + tokenObject = objectToken; + } + }); + return tokenObject; + }); + }); }; }); })(); \ No newline at end of file diff --git a/frontend/sw.js b/frontend/sw.js index 3a1cf4bf1..565b16ad1 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'modify-request-notification-permission-flow'; + const CACHE_SUFIX = 'push-notification-permission'; let messaging; @@ -99,23 +99,23 @@ ], }) ); - - workbox.routing.registerRoute( - /\.(?:js|css|html)$/, - workbox.strategies.staleWhileRevalidate({ - cacheName: precacheCacheName, - }) - ); - - workbox.routing.registerRoute( - new RegExp(Config.BACKEND_URL), - workbox.strategies.networkFirst({ - cacheName: runtimeCacheName - }) - ); + // + // workbox.routing.registerRoute( + // /\.(?:js|css|html)$/, + // workbox.strategies.staleWhileRevalidate({ + // cacheName: precacheCacheName, + // }) + // ); + // + // workbox.routing.registerRoute( + // new RegExp(Config.BACKEND_URL), + // workbox.strategies.networkFirst({ + // cacheName: runtimeCacheName + // }) + // ); (function initSw() { - self.skipWaiting(); + // self.skipWaiting(); setupFirebase(); addToCache(['/']); })(); diff --git a/frontend/test/specs/home/homeControllerSpec.js b/frontend/test/specs/home/homeControllerSpec.js index a57ea1e81..43e679d3d 100644 --- a/frontend/test/specs/home/homeControllerSpec.js +++ b/frontend/test/specs/home/homeControllerSpec.js @@ -2,7 +2,7 @@ (describe('Test HomeController', function() { - let homeCtrl, httpBackend, scope, createCtrl, mdDialog, state, states, http, postService, pushNotService; + let homeCtrl, httpBackend, scope, createCtrl, mdDialog, state, states, http, postService; var institutions = [{ acronym: 'Certbio', @@ -35,7 +35,7 @@ beforeEach(module('app')); beforeEach(inject(function($controller, $httpBackend, $rootScope, - PostService, $mdDialog, $state, AuthService, PushNotificationService, $http, STATES) { + PostService, $mdDialog, $state, AuthService, $http, STATES) { httpBackend = $httpBackend; http = $http; scope = $rootScope.$new(); @@ -43,7 +43,6 @@ state = $state; postService = PostService; states = STATES; - pushNotService = PushNotificationService; httpBackend.when('GET', "/api/events?page=0&limit=15").respond([event]); httpBackend.when('GET', 'main/main.html').respond(200); @@ -62,14 +61,12 @@ }; spyOn($rootScope, '$on').and.callThrough(); - spyOn(pushNotService, 'requestNotificationPermission'); homeCtrl = createCtrl(); homeCtrl.$onInit(); httpBackend.flush(); expect($rootScope.$on).toHaveBeenCalled(); - expect(pushNotService.requestNotificationPermission).toHaveBeenCalledWith(new User(user)); })); afterEach(function() { diff --git a/frontend/test/specs/notification/pushNotificationServiceSpec.js b/frontend/test/specs/notification/pushNotificationServiceSpec.js index bf9374eb3..1234ea6c8 100644 --- a/frontend/test/specs/notification/pushNotificationServiceSpec.js +++ b/frontend/test/specs/notification/pushNotificationServiceSpec.js @@ -1,7 +1,7 @@ 'use strict'; (describe('Test PushNotificationService', function () { - let service, messaging, defaultToken, notificationsRef, messageService, scope, $qMock; + let service, messaging, defaultToken, notificationsRef, messageService, scope, $qMock, authService; const fakeCallback = function fakeCallback(data) { return { @@ -11,9 +11,11 @@ }; }; + const TOKEN_OBJECT = {token: 'token'}; + beforeEach(module('app')); - beforeEach(inject(function (PushNotificationService, MessageService, $q, $rootScope) { + beforeEach(inject(function (PushNotificationService, MessageService, $q, $rootScope, AuthService) { service = PushNotificationService; messaging = firebase.messaging(); messageService = MessageService; @@ -22,12 +24,95 @@ defaultToken = 'oaspkd-OPASKDAPO'; scope = $rootScope.$new(); $qMock = $q; + authService = AuthService; + + spyOn(authService, 'getCurrentUser').and.callFake(() => new User({ + key: 'aopskdpoaAPOSDKAPOKDPK' + })); })); - describe('requestNotificationPermission', () => { + describe('setupPushNotificationPermission', () => { + it('should call _initFirebaseArray', () => { + spyOn(service, '_initFirebaseArray'); + service.setupPushNotificationPermission(); + expect(service._initFirebaseArray).toHaveBeenCalled(); + }); + }); + + describe('isPushNotificationBlockedOnBrowser', () => { + it('should return true when the user has blocked notifications', () => { + Notification = {permission: 'denied'}; + + const result = service.isPushNotificationBlockedOnBrowser(); + + expect(result).toEqual(true); + }); + + it('should return false when the user has not blocked notifications', () => { + Notification = {permission: 'ask'}; + + const result = service.isPushNotificationBlockedOnBrowser(); + + expect(result).toEqual(false); + }); + }); + + describe('isPushNotificationActive', () => { + it('should return true if the browser token is included in the firebaseArray', () => { + spyOn(service, '_getTokenObjectInFirebaseArray').and.callFake(() => $qMock.when(TOKEN_OBJECT)); + let result; + service.isPushNotificationActive().then((isActive) => { + result = isActive; + }); + scope.$apply(); + expect(service._getTokenObjectInFirebaseArray).toHaveBeenCalled(); + expect(result).toBe(true); + }); + + it('should return false if the browser token is not included in the firebaseArray', () => { + spyOn(service, '_getTokenObjectInFirebaseArray').and.callFake(() => $qMock.when()); + + let result; + service.isPushNotificationActive().then((isActive) => { + result = isActive; + }); + scope.$apply(); + expect(service._getTokenObjectInFirebaseArray).toHaveBeenCalled(); + expect(result).toBe(false); + }); + }); + + describe('unsubscribeUserNotification', () => { + it('should call _removeTokenFromFirebaseArray', () => { + spyOn(service, '_removeTokenFromFirebaseArray'); + service.unsubscribeUserNotification(); + expect(service._removeTokenFromFirebaseArray).toHaveBeenCalled(); + }); + }); + + describe('_removeTokenFromFirebaseArray', () => { + it('should call _getTokenObjectInFirebaseArray and remove object from firebase array', () => { + service._initFirebaseArray(); + spyOn(service, '_getTokenObjectInFirebaseArray').and.callFake(() => $qMock.when(TOKEN_OBJECT)); + spyOn(service.firebaseArrayNotifications, '$remove'); + service.unsubscribeUserNotification(); + scope.$apply(); + expect(service._getTokenObjectInFirebaseArray).toHaveBeenCalled(); + expect(service.firebaseArrayNotifications.$remove).toHaveBeenCalledWith(TOKEN_OBJECT); + }); + }); + + describe('subscribeUserNotification', () => { + it('should call _requestNotificationPermission', () => { + spyOn(service, '_requestNotificationPermission'); + service.subscribeUserNotification(); + expect(service._requestNotificationPermission).toHaveBeenCalled(); + }); + }); + + describe('_requestNotificationPermission', () => { beforeEach(() => { - spyOn(service, '_hasNotificationPermission').and.returnValue(false); - spyOn(service._isMobile, 'any').and.returnValue(true); + spyOn(service, 'isPushNotificationBlockedOnBrowser').and.returnValue(false); spyOn(messaging, 'requestPermission'); spyOn(messaging, 'getToken'); spyOn(service, '_saveToken'); @@ -38,7 +123,7 @@ messaging.getToken.and.callFake(fakeCallback); service._saveToken.and.callFake(fakeCallback); - service.requestNotificationPermission(new User({})); + service._requestNotificationPermission(); scope.$digest(); expect(messaging.requestPermission).toHaveBeenCalled(); @@ -49,7 +134,7 @@ it('should not call saveToken when the user does not enable notification', () => { messaging.requestPermission.and.callFake(() => $qMock.reject()); - service.requestNotificationPermission(); + service._requestNotificationPermission(); scope.$digest(); expect(messaging.requestPermission).toHaveBeenCalled(); @@ -70,24 +155,17 @@ }); }); - describe('initFirebaseArray', () => { + describe('_initFirebaseArray', () => { it('should starts a firebaseArray', () => { expect(service.firebaseArrayNotifications).toBe(undefined); - service.currentUser = new User({ - key: 'aopskdpoaAPOSDKAPOKDPK' - }); - service._initFirebaseArray(); - + expect(service.firebaseArrayNotifications).not.toBe(undefined); }); }); - describe('setToken', () => { + describe('_setToken', () => { beforeEach(() => { - service.currentUser = new User({ - key: 'aopskdpoaAPOSDKAPOKDPK' - }); service._initFirebaseArray(); }); @@ -102,21 +180,21 @@ }); }); - describe('hasNotificationPermission', () => { - it('should return true when the user has enabled notifications', () => { - Notification = {permission: 'granted'}; - - const result = service._hasNotificationPermission(); - - expect(result).toEqual(true); - }); + describe('_getTokenObjectInFirebaseArray', () => { + it('should return the object token corresponding to the messaging token', () => { + service._initFirebaseArray(); + spyOn(service.firebaseArrayNotifications, '$loaded').and.callFake(() => $qMock.when([TOKEN_OBJECT])); + spyOn(messaging, 'getToken').and.callFake(() => $qMock.when(TOKEN_OBJECT.token)); - it('should return false when the user has not enabled notifications', () => { - Notification = {permission: 'ask'}; - - const result = service._hasNotificationPermission(); + let tokenObject; + service._getTokenObjectInFirebaseArray().then((result) => { + tokenObject = result; + }); + scope.$apply(); - expect(result).toEqual(false); + expect(tokenObject).toBe(TOKEN_OBJECT); + expect(messaging.getToken).toHaveBeenCalled(); + expect(service.firebaseArrayNotifications.$loaded).toHaveBeenCalled(); }); }); })); \ No newline at end of file diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index fd61973a0..3d38f9f13 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -191,42 +191,67 @@ return promise; } + /** + * + */ configProfileCtrl.pushChange = () => { configProfileCtrl.pushNotification && subscribeUser(); - !configProfileCtrl.pushNotification && unsubscribeUser(); }; + /** + * + */ function setPushNotificationModel() { - configProfileCtrl.pushNotification = angular.copy(PushNotificationService.hasNotificationPermission()); - } - - function isPossiblePushNotification() { - const { permission } = Notification; - return permission !== "denied"; + PushNotificationService.isPushNotificationActive().then((result) => { + configProfileCtrl.pushNotification = result; + }); } + /** + * + * @returns {Promise} + */ function unsubscribeUser() { - return PushNotificationService.unsubscribeUserNotification(); + return configProfileCtrl._openDialog().then(() => { + return PushNotificationService.unsubscribeUserNotification(); + }).catch(() => { + configProfileCtrl.pushNotification = true; + }); } + /** + * + * @returns {Promise} + */ function subscribeUser() { - return isPossiblePushNotification() && - openDialog().then(() => PushNotificationService.requestNotificationPermission(configProfileCtrl.user)); + return configProfileCtrl._openDialog().then(() => { + return PushNotificationService.subscribeUserNotification(); + }).catch(() => { + configProfileCtrl.pushNotification = false; + }); } - function openDialog(event) { - const DIALOG_TEXT = ""; + /** + * + * @param event + * @returns {*|Promise|void} + * @private + */ + configProfileCtrl._openDialog = (event) => { + const DIALOG_TEXT_SUBSCRIBE = "Deseja permitir notificação no dispositivo?"; + const DIALOG_TEXT_UNSUBSCRIBE = "Tem certeza que deseja não de receber notificação no dispositivo?"; + const DIALOG_TEXT = configProfileCtrl.pushNotification? DIALOG_TEXT_SUBSCRIBE : DIALOG_TEXT_UNSUBSCRIBE; const confirm = $mdDialog.confirm(); confirm .clickOutsideToClose(false) - .title('Permitir Notificação no dispositivo') + .title('Notificação no dispositivo') .textContent(DIALOG_TEXT) - .ariaLabel('Permitir Notificação no dispositivo') + .ariaLabel('Notificação no dispositivo') .targetEvent(event) .ok('Sim') .cancel('Não'); return $mdDialog.show(confirm); - } - }; + }; + } })(); \ No newline at end of file diff --git a/frontend/user/configProfile/config_profile_mobile.html b/frontend/user/configProfile/config_profile_mobile.html index 6b43fb404..ed88f9326 100644 --- a/frontend/user/configProfile/config_profile_mobile.html +++ b/frontend/user/configProfile/config_profile_mobile.html @@ -62,6 +62,7 @@

    NOTIFICAÇÕES NO CELULAR

    + oioiioi
    Date: Thu, 21 Feb 2019 18:01:47 -0300 Subject: [PATCH 353/606] fixing tests --- .../test/post_handlers_tests/post_comment_handler_test.py | 3 ++- frontend/app.js | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/backend/test/post_handlers_tests/post_comment_handler_test.py b/backend/test/post_handlers_tests/post_comment_handler_test.py index 8c539cf69..9af707b29 100644 --- a/backend/test/post_handlers_tests/post_comment_handler_test.py +++ b/backend/test/post_handlers_tests/post_comment_handler_test.py @@ -86,7 +86,8 @@ def test_post(self, verify_token, enqueue_task): 'entity_key': self.user_post.key.urlsafe(), 'entity_type': 'COMMENT', 'current_institution': self.institution.key.urlsafe(), - 'sender_institution_key': self.user_post.institution.urlsafe() + 'sender_institution_key': self.user_post.institution.urlsafe(), + 'field': 'subscribers' } push_not_params = { diff --git a/frontend/app.js b/frontend/app.js index 24f5a198b..648877ddd 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -589,17 +589,12 @@ }); function initServiceWorker() { - console.log("init service worker"); if ('serviceWorker' in navigator) { - console.log("service worker in navigator"); navigator.serviceWorker.register('/sw.js').then(function (registration) { - console.log("registering"); - console.log(registration); const messaging = firebase.messaging(); messaging.useServiceWorker(registration); messaging.usePublicVapidKey(KEY_PAIR); - console.log("last"); - }).catch((erro) => console.log("chegou no erro", erro)); + }); } } From 9134ea5ad81c66d84da4d0d28a8add454a87df91 Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 22 Feb 2019 09:34:24 -0300 Subject: [PATCH 354/606] Finish last info form --- frontend/institution/forms/forms.css | 55 ++++++------------- .../forms/lastInfoForm.component.js | 11 +--- .../institution/forms/last_info_form.html | 12 ++-- 3 files changed, 25 insertions(+), 53 deletions(-) diff --git a/frontend/institution/forms/forms.css b/frontend/institution/forms/forms.css index 007c7065b..9913138e0 100644 --- a/frontend/institution/forms/forms.css +++ b/frontend/institution/forms/forms.css @@ -55,44 +55,21 @@ institution-form #institution-form { width: 100%; } -/* #inst-picture-picker img.inst-picture { */ -/* width: 3.6em; */ -/* height: 3.6em; */ -/* border-radius: 50%; */ -/* margin: -0.6em 0 0 -0.6em; */ -/* } */ - - -/* #inst-picture-picker md-icon { */ -/* color: white; */ -/* } */ - -/* .inst-suggested-name { */ -/* align-self: center; */ -/* overflow: hidden; */ -/* line-height: 1.2em; */ -/* height: 3.6em; */ -/* font-size: 0.8em; */ -/* padding: 0.1em; */ -/* } */ - -/* #last-info { */ -/* display: grid; */ -/* grid-template-rows: 2fr 1fr 1fr; */ -/* } */ - -/* #last-info md-input-container#description { */ -/* align-items: center; */ -/* border: 1px solid; */ -/* border-color: #ccc; */ -/* border-radius: 0.4em; */ -/* } */ +last-info-form #last-info-form { + display: grid; + grid-template-rows: 8em 1fr 1fr; +} -/* #last-info #description textarea { */ -/* height: 100% !important; */ -/* border: 0 !important; */ -/* } */ +#last-info-form md-input-container#description { + max-height: 80%; + height: 100%; + align-items: center; + border: 1px solid; + border-color: #ccc; + border-radius: 0.4em; +} -/* #create-inst-content button.md-primary { */ -/* color: #009688 !important; */ -/* } */ +#last-info-form #description textarea { + height: 100% !important; + border: 0 !important; +} diff --git a/frontend/institution/forms/lastInfoForm.component.js b/frontend/institution/forms/lastInfoForm.component.js index b90c9e471..0cbaf1683 100644 --- a/frontend/institution/forms/lastInfoForm.component.js +++ b/frontend/institution/forms/lastInfoForm.component.js @@ -1,21 +1,16 @@ 'use strict'; (function () { - function controller() { - const ctrl = this; - - ctrl.$onInit = () => { - ctrl.configInstCtrl = ctrl.parentCtrl; - } + function LastInfoController() { } const app = angular.module('app'); app.component('lastInfoForm', { - controller: controller, + controller: [LastInfoController], controllerAs: 'ctrl', templateUrl: 'app/institution/forms/last_info_form.html', bindings: { - parentCtrl: '=', + institution: '=', } }); })(); diff --git a/frontend/institution/forms/last_info_form.html b/frontend/institution/forms/last_info_form.html index f06db63d0..94a917e03 100644 --- a/frontend/institution/forms/last_info_form.html +++ b/frontend/institution/forms/last_info_form.html @@ -1,4 +1,4 @@ -
    + @@ -6,20 +6,20 @@ placeholder='Uma breve descrição sobre sua instituição' md-no-auto-grow md-no-resize - ng-model="ctrl.configInstCtrl.newInstitution.description" + ng-model="ctrl.institution.description" maxlength="1100"> + ng-model="ctrl.institution.website_url"> -
    -
    Este campo é obrigatório!
    + ng-model="ctrl.institution.leader"> +
    +
    Este campo é obrigatório!
    From 8abe32add080fa1237ac0d5528fd316d3b29421c Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 22 Feb 2019 09:34:41 -0300 Subject: [PATCH 355/606] Update flow for new forms --- .../institution/createInvitedInstitutionController.js | 2 +- frontend/institution/create_inst_form_mobile.css | 10 +++++++--- frontend/institution/forms/address_form.html | 2 +- frontend/institution/forms/forms.css | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index 78144e763..a4090c382 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -75,7 +75,7 @@ // nextStep ctrl.nextStep = () => { - if (ctrl.isCurrentStepValid()) { + if (true) { ctrl.currentStep += 1; } else { MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); diff --git a/frontend/institution/create_inst_form_mobile.css b/frontend/institution/create_inst_form_mobile.css index 418d1d796..d384f7854 100644 --- a/frontend/institution/create_inst_form_mobile.css +++ b/frontend/institution/create_inst_form_mobile.css @@ -62,7 +62,7 @@ md-content.grid-fill-screen { #create-inst-card { margin-top: 3.5em; - margin-bottom: 2em; + margin-bottom: 1.6em; } #create-inst-card-content { @@ -98,7 +98,7 @@ md-content.grid-fill-screen { } #form-switch md-input-container { - margin: 0.4em 0 0.4em 0; + margin: 0.2em 0 0.2em 0; } #form-switch md-input-container.md-input-focused input { @@ -110,10 +110,14 @@ md-content.grid-fill-screen { } #form-switch md-input-container .md-errors-spacer { - min-height: 0.2em; + height: 0.2em; } #form-switch md-input-container label { color: #1f6357; font-weight: 500; } + +#create-inst-content button.md-primary { + color: #009688 !important; +} diff --git a/frontend/institution/forms/address_form.html b/frontend/institution/forms/address_form.html index 6c9343c1d..1570c539a 100644 --- a/frontend/institution/forms/address_form.html +++ b/frontend/institution/forms/address_form.html @@ -48,7 +48,7 @@
    + class='field-required'> Primeiro selecione um estado
    diff --git a/frontend/institution/forms/forms.css b/frontend/institution/forms/forms.css index 9913138e0..6c3c71bd0 100644 --- a/frontend/institution/forms/forms.css +++ b/frontend/institution/forms/forms.css @@ -37,7 +37,7 @@ address-form #address-form { grid-area: cep; } -.state-required { +.field-required { font-size: 0.6em; line-height: 1em; overflow: visible; From cceac5bdb7f7156b129b761390568935dcf46db2 Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 22 Feb 2019 09:37:33 -0300 Subject: [PATCH 356/606] Add last info component --- .../forms/lastInfoForm.component.js | 16 ++++++++++++ .../institution/forms/last_info_form.html | 25 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 frontend/institution/forms/lastInfoForm.component.js create mode 100644 frontend/institution/forms/last_info_form.html diff --git a/frontend/institution/forms/lastInfoForm.component.js b/frontend/institution/forms/lastInfoForm.component.js new file mode 100644 index 000000000..0cbaf1683 --- /dev/null +++ b/frontend/institution/forms/lastInfoForm.component.js @@ -0,0 +1,16 @@ +'use strict'; + +(function () { + function LastInfoController() { + } + + const app = angular.module('app'); + app.component('lastInfoForm', { + controller: [LastInfoController], + controllerAs: 'ctrl', + templateUrl: 'app/institution/forms/last_info_form.html', + bindings: { + institution: '=', + } + }); +})(); diff --git a/frontend/institution/forms/last_info_form.html b/frontend/institution/forms/last_info_form.html new file mode 100644 index 000000000..94a917e03 --- /dev/null +++ b/frontend/institution/forms/last_info_form.html @@ -0,0 +1,25 @@ +
    + + + + + + + + + + + + +
    +
    Este campo é obrigatório!
    +
    +     +
    From 4f1e3fccf23abbf19c1b877a38238339addc1519 Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 22 Feb 2019 09:37:56 -0300 Subject: [PATCH 357/606] Update forms.css --- frontend/institution/forms/forms.css | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/frontend/institution/forms/forms.css b/frontend/institution/forms/forms.css index 77a6fd1fe..9913138e0 100644 --- a/frontend/institution/forms/forms.css +++ b/frontend/institution/forms/forms.css @@ -47,3 +47,29 @@ address-form #address-form { justify-self: center; display: grid; } + +institution-form #institution-form { + display: grid; + grid-template-rows: auto repeat(7, 1fr); + height: 100%; + width: 100%; +} + +last-info-form #last-info-form { + display: grid; + grid-template-rows: 8em 1fr 1fr; +} + +#last-info-form md-input-container#description { + max-height: 80%; + height: 100%; + align-items: center; + border: 1px solid; + border-color: #ccc; + border-radius: 0.4em; +} + +#last-info-form #description textarea { + height: 100% !important; + border: 0 !important; +} From 4d767b7d022347d340c470883766faaee267289f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 25 Feb 2019 08:07:25 -0300 Subject: [PATCH 358/606] Add possibility to show icon istead of img --- .../utils/entityShowcase/entityShowcase.component.js | 4 ++++ frontend/utils/entityShowcase/entityShowcase.css | 12 ++++++++++++ frontend/utils/entityShowcase/entityShowcase.html | 5 ++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/frontend/utils/entityShowcase/entityShowcase.component.js b/frontend/utils/entityShowcase/entityShowcase.component.js index 38dbced50..6d4fc1147 100644 --- a/frontend/utils/entityShowcase/entityShowcase.component.js +++ b/frontend/utils/entityShowcase/entityShowcase.component.js @@ -7,13 +7,17 @@ controllerAs: "entityShowcaseCtrl", bindings: { avatar: "<", + icon: "@", title: "<", subtitle: "<", + leftAction: "<", }, }); function entityShowcaseController() { const entityShowcaseCtrl = this; + + entityShowcaseCtrl.showIcon = () => !_.isNil(entityShowcaseCtrl.icon); } })(); \ No newline at end of file diff --git a/frontend/utils/entityShowcase/entityShowcase.css b/frontend/utils/entityShowcase/entityShowcase.css index 0f02336e6..4e28db047 100644 --- a/frontend/utils/entityShowcase/entityShowcase.css +++ b/frontend/utils/entityShowcase/entityShowcase.css @@ -18,6 +18,18 @@ border-radius: 50%; } +.entity-showcase__icon { + grid-area: avatar; + background-color: #8BC34A; + color: white; + height: 2em; + width: 2em; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; +} + .entity-showcase__title { grid-area: title; line-height: 1rem; diff --git a/frontend/utils/entityShowcase/entityShowcase.html b/frontend/utils/entityShowcase/entityShowcase.html index 82ecdb65e..317fe5bf0 100644 --- a/frontend/utils/entityShowcase/entityShowcase.html +++ b/frontend/utils/entityShowcase/entityShowcase.html @@ -1,5 +1,8 @@
    - + + + {{ entityShowcaseCtrl.icon }} + {{entityShowcaseCtrl.title }} {{entityShowcaseCtrl.subtitle }}
    \ No newline at end of file From 333ce18de0d12618d54f726ebe104ce07a8b1b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 25 Feb 2019 09:29:54 -0300 Subject: [PATCH 359/606] Add right icon buttons --- frontend/index.html | 1 + .../entityShowcase.component.js | 1 + .../utils/entityShowcase/entityShowcase.css | 10 ++++-- .../utils/entityShowcase/entityShowcase.html | 8 +++++ .../utils/iconButton/iconButton.component.js | 32 +++++++++++++++++++ frontend/utils/iconButton/iconButton.html | 5 +++ 6 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 frontend/utils/iconButton/iconButton.component.js create mode 100644 frontend/utils/iconButton/iconButton.html diff --git a/frontend/index.html b/frontend/index.html index a8a20a98a..4408ab934 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -309,5 +309,6 @@ + diff --git a/frontend/utils/entityShowcase/entityShowcase.component.js b/frontend/utils/entityShowcase/entityShowcase.component.js index 6d4fc1147..7cf540b0e 100644 --- a/frontend/utils/entityShowcase/entityShowcase.component.js +++ b/frontend/utils/entityShowcase/entityShowcase.component.js @@ -11,6 +11,7 @@ title: "<", subtitle: "<", leftAction: "<", + rightIconBtns: "<", }, }); diff --git a/frontend/utils/entityShowcase/entityShowcase.css b/frontend/utils/entityShowcase/entityShowcase.css index 4e28db047..0c124c6cc 100644 --- a/frontend/utils/entityShowcase/entityShowcase.css +++ b/frontend/utils/entityShowcase/entityShowcase.css @@ -1,10 +1,10 @@ .entity-showcase { display: grid; - grid-template-columns: max-content auto; + grid-template-columns: max-content auto auto; grid-template-rows: max-content max-content; grid-template-areas: - 'avatar title' - 'avatar subtitle'; + 'avatar title right-icon-buttons' + 'avatar subtitle right-icon-buttons'; grid-gap: 0 0.6rem; padding: 0.6rem; align-items: center; @@ -39,4 +39,8 @@ grid-area: subtitle; font-size: 0.8em; line-height: 1rem; +} + +.entity-showcase__right-icon-buttons { + grid-area: right-icon-buttons; } \ No newline at end of file diff --git a/frontend/utils/entityShowcase/entityShowcase.html b/frontend/utils/entityShowcase/entityShowcase.html index 317fe5bf0..64a9ad883 100644 --- a/frontend/utils/entityShowcase/entityShowcase.html +++ b/frontend/utils/entityShowcase/entityShowcase.html @@ -5,4 +5,12 @@ {{entityShowcaseCtrl.title }} {{entityShowcaseCtrl.subtitle }} +
    + + +
    \ No newline at end of file diff --git a/frontend/utils/iconButton/iconButton.component.js b/frontend/utils/iconButton/iconButton.component.js new file mode 100644 index 000000000..ed14222e7 --- /dev/null +++ b/frontend/utils/iconButton/iconButton.component.js @@ -0,0 +1,32 @@ +(function () { + 'use strict'; + + /** + * Icon button component that receives an icon and an icon color as a binding. + * If no icon color was passed, it will be defined to be equals to the default + * color (#EEE). The on click function should be added by ng-click on the component + * tag. + * @class iconButton + * @example + * + */ + angular.module("app").component("iconButton", { + templateUrl: "app/utils/iconButton/iconButton.html", + controller: iconButtonController, + controllerAs: "iconButtonCtrl", + bindings: { + icon: "@", + iconColor: "@", + action: '<', + }, + }); + + function iconButtonController() { + const iconButtonCtrl = this; + + iconButtonCtrl.$onInit = () => { + iconButtonCtrl.iconColor = iconButtonCtrl.iconColor || "#EEE"; + }; + } + +})(); \ No newline at end of file diff --git a/frontend/utils/iconButton/iconButton.html b/frontend/utils/iconButton/iconButton.html new file mode 100644 index 000000000..59baee4d8 --- /dev/null +++ b/frontend/utils/iconButton/iconButton.html @@ -0,0 +1,5 @@ + + + {{ iconButtonCtrl.icon }} + + \ No newline at end of file From 43e5a2d4168d09cc0ffee607ced35652e5bb635c Mon Sep 17 00:00:00 2001 From: MaianaB Date: Mon, 25 Feb 2019 09:35:32 -0300 Subject: [PATCH 360/606] added margin input --- frontend/institution/management_institution.css | 4 ++++ frontend/institution/management_members.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/institution/management_institution.css b/frontend/institution/management_institution.css index 7972cff6a..d3021594c 100644 --- a/frontend/institution/management_institution.css +++ b/frontend/institution/management_institution.css @@ -42,6 +42,10 @@ width: 16%; } +.margin-input-info{ + margin-top: 9px; +} + .manage-member-content { overflow: auto; max-height: 220px; diff --git a/frontend/institution/management_members.html b/frontend/institution/management_members.html index 032748a42..dbeec8c55 100644 --- a/frontend/institution/management_members.html +++ b/frontend/institution/management_members.html @@ -91,7 +91,7 @@

    {{ manageMemberCtrl.institution.admin.name }}

    -
    From 1361e3ba6ead12e3ee101575ba0851cdeab8c211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 25 Feb 2019 09:52:53 -0300 Subject: [PATCH 361/606] Add entityShowcase jsdoc --- .../entityShowcase.component.js | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/frontend/utils/entityShowcase/entityShowcase.component.js b/frontend/utils/entityShowcase/entityShowcase.component.js index 7cf540b0e..8edc934e0 100644 --- a/frontend/utils/entityShowcase/entityShowcase.component.js +++ b/frontend/utils/entityShowcase/entityShowcase.component.js @@ -1,6 +1,32 @@ (function () { 'use strict'; + /** + * Component that shows an entity (user or institution). It receives a title (entity name), + * an subtitle (an entity information) and a avatar (the image to be shown). Also it could + * receive an icon in case the entity doesn't have an avatar url. It could receive an left + * action that will be triggered when the user clicks on the avatar or the icon and a array + * of rightIconBtns objects that has a icon, a icon-color and a action. You should use one + * icon or one avatar, and not both of them. + * rightIconBtns example: + * [ + * { + * icon: aIcon, + * iconColor: aIconColor, + * action: aAction, + * }, + * ] + * @class entityShowcase + * @example + * + * + */ angular.module("app").component("entityShowcase", { templateUrl: "app/utils/entityShowcase/entityShowcase.html", controller: entityShowcaseController, From 51461bff2526461a8f1d7affb521aadddc690315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 25 Feb 2019 10:09:42 -0300 Subject: [PATCH 362/606] Removes padding and margin from iconButton --- frontend/utils/iconButton/iconButton.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/utils/iconButton/iconButton.html b/frontend/utils/iconButton/iconButton.html index 59baee4d8..1d1b79311 100644 --- a/frontend/utils/iconButton/iconButton.html +++ b/frontend/utils/iconButton/iconButton.html @@ -1,4 +1,4 @@ - + {{ iconButtonCtrl.icon }} From 163986016e73da7c96b41409d28f947c8efea0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Mon, 25 Feb 2019 10:15:18 -0300 Subject: [PATCH 363/606] Fix entityShowcase and iconButton jsdoc --- .../utils/entityShowcase/entityShowcase.component.js | 10 +++++----- frontend/utils/iconButton/iconButton.component.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/utils/entityShowcase/entityShowcase.component.js b/frontend/utils/entityShowcase/entityShowcase.component.js index 8edc934e0..af59f7ae1 100644 --- a/frontend/utils/entityShowcase/entityShowcase.component.js +++ b/frontend/utils/entityShowcase/entityShowcase.component.js @@ -3,11 +3,11 @@ /** * Component that shows an entity (user or institution). It receives a title (entity name), - * an subtitle (an entity information) and a avatar (the image to be shown). Also it could - * receive an icon in case the entity doesn't have an avatar url. It could receive an left - * action that will be triggered when the user clicks on the avatar or the icon and a array - * of rightIconBtns objects that has a icon, a icon-color and a action. You should use one - * icon or one avatar, and not both of them. + * a subtitle (an entity information) and an avatar (the image to be shown). Also, it can + * receive an icon in case the entity doesn't have an avatar url. It can receive a left + * action that will be triggered when the user clicks on the avatar or the icon and an array + * of rightIconBtns objects that has an icon, an icon-color and an action. You shouldn't use + * both icon and avatar at the same time. * rightIconBtns example: * [ * { diff --git a/frontend/utils/iconButton/iconButton.component.js b/frontend/utils/iconButton/iconButton.component.js index ed14222e7..244adc05a 100644 --- a/frontend/utils/iconButton/iconButton.component.js +++ b/frontend/utils/iconButton/iconButton.component.js @@ -3,7 +3,7 @@ /** * Icon button component that receives an icon and an icon color as a binding. - * If no icon color was passed, it will be defined to be equals to the default + * If no icon color has been passed, it will be defined to be equals to the default * color (#EEE). The on click function should be added by ng-click on the component * tag. * @class iconButton From 0fd2e282f72330c87c2cd8896ec26ea6910cc5ea Mon Sep 17 00:00:00 2001 From: ruanres Date: Mon, 25 Feb 2019 13:47:58 -0300 Subject: [PATCH 364/606] created search field component --- frontend/index.html | 2 ++ .../managementMembersController.js | 3 +-- .../management_members_mobile.html | 5 +++- frontend/styles/custom.css | 4 --- .../searchField/searchField.component.js | 26 +++++++++++++++++++ frontend/utils/searchField/search_field.css | 20 ++++++++++++++ frontend/utils/searchField/search_field.html | 8 ++++++ 7 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 frontend/utils/searchField/searchField.component.js create mode 100644 frontend/utils/searchField/search_field.css create mode 100644 frontend/utils/searchField/search_field.html diff --git a/frontend/index.html b/frontend/index.html index ec36006d8..4fdf05dec 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -78,6 +78,7 @@ + @@ -176,6 +177,7 @@ + diff --git a/frontend/institution/managementMembersController.js b/frontend/institution/managementMembersController.js index afa7e55e1..be5a69b89 100644 --- a/frontend/institution/managementMembersController.js +++ b/frontend/institution/managementMembersController.js @@ -180,8 +180,7 @@ manageMemberCtrl._getMembers = () => { InstitutionService.getMembers(currentInstitutionKey).then(function success(response) { - manageMemberCtrl.members = Utils.isMobileScreen(475) ? - Utils.groupUsersByInitialLetter(response) : response; + manageMemberCtrl.members = response; getAdmin(response); manageMemberCtrl.isLoadingMembers = false; }, function error() { diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index d27a8685c..a76b8ef56 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -26,13 +26,16 @@

    Convidar Membros

    - + + + +
    \ No newline at end of file diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index 491ad4b4f..bb7c48a92 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -212,10 +212,6 @@ background-color:#F5F5F5; } -.search-field{ - height: 75px; -} - a:link { text-decoration: none; } diff --git a/frontend/utils/searchField/searchField.component.js b/frontend/utils/searchField/searchField.component.js new file mode 100644 index 000000000..4b27b811d --- /dev/null +++ b/frontend/utils/searchField/searchField.component.js @@ -0,0 +1,26 @@ +"use strict"; + +(function() { + angular + .module('app') + .component('searchField', { + templateUrl: 'app/utils/searchField/search_field.html', + controller: searchFieldController, + controllerAs: 'searchFieldCtrl', + bindings: { + placeholder: '@', + keyword: '=' + } + }); + + function searchFieldController() { + const searchFieldCtrl = this; + + searchFieldCtrl.$onInit = () => { + _.defaults(searchFieldCtrl, { + placeholder: 'Pesquisar', + keyword: '' + }); + }; + } +})(); \ No newline at end of file diff --git a/frontend/utils/searchField/search_field.css b/frontend/utils/searchField/search_field.css new file mode 100644 index 000000000..4b78ce666 --- /dev/null +++ b/frontend/utils/searchField/search_field.css @@ -0,0 +1,20 @@ +.search-field { + display: grid; +} + +.search-field md-input-container { + padding: 0; + margin: 0; + width: 100%; +} + +.search-field md-input-container:not(.md-input-invalid).md-input-focused input, +.search-field md-input-container:not(.md-input-invalid).md-input-has-value.md-input-focused input { + border-color:#707070; + border-width: 0 0 2px; +} + +.search-field md-icon , +.search-field md-input-container.md-input-focused md-icon { + color: #707070; +} \ No newline at end of file diff --git a/frontend/utils/searchField/search_field.html b/frontend/utils/searchField/search_field.html new file mode 100644 index 000000000..a622aa669 --- /dev/null +++ b/frontend/utils/searchField/search_field.html @@ -0,0 +1,8 @@ +
    +
    + + + search + +
    +
    \ No newline at end of file From 793f0b19deeb81755ac16f800a2c4772232021cb Mon Sep 17 00:00:00 2001 From: ruanres Date: Mon, 25 Feb 2019 13:52:32 -0300 Subject: [PATCH 365/606] set clickable card component to use the lodash defaults function --- frontend/institution/management_members_mobile.html | 2 +- frontend/utils/clickableCard/clickableCard.component.js | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index a76b8ef56..b3a0df60d 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -26,7 +26,7 @@

    Convidar Membros

    - + diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js index 016afd6c8..9d82deeae 100644 --- a/frontend/utils/clickableCard/clickableCard.component.js +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -19,9 +19,8 @@ const clickableCardCtrl = this; clickableCardCtrl.$onInit = () => { - Object.assign(clickableCardCtrl, { - isOpen: false, - ...clickableCardCtrl + _.defaults(clickableCardCtrl, { + isOpen: false }); }; From 7fd342f6f3074f83b74b585fc24ea7a9d7c3562f Mon Sep 17 00:00:00 2001 From: ruanres Date: Mon, 25 Feb 2019 14:28:59 -0300 Subject: [PATCH 366/606] fixed tests for management Members controller --- frontend/institution/managementMembersController.js | 7 ++++--- .../specs/institution/managementMembersControllerSpec.js | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/institution/managementMembersController.js b/frontend/institution/managementMembersController.js index be5a69b89..bbf61989f 100644 --- a/frontend/institution/managementMembersController.js +++ b/frontend/institution/managementMembersController.js @@ -179,9 +179,10 @@ } manageMemberCtrl._getMembers = () => { - InstitutionService.getMembers(currentInstitutionKey).then(function success(response) { + InstitutionService.getMembers(currentInstitutionKey) + .then(function success(response) { manageMemberCtrl.members = response; - getAdmin(response); + manageMemberCtrl._getAdmin(response); manageMemberCtrl.isLoadingMembers = false; }, function error() { manageMemberCtrl.isLoadingMembers = true; @@ -195,7 +196,7 @@ }); } - function getAdmin(members) { + manageMemberCtrl._getAdmin = (members) => { manageMemberCtrl.institution.admin = _.find(members, function(member){ return member.key === manageMemberCtrl.institution.admin.key; diff --git a/frontend/test/specs/institution/managementMembersControllerSpec.js b/frontend/test/specs/institution/managementMembersControllerSpec.js index 0503f30c1..d3fcc254a 100644 --- a/frontend/test/specs/institution/managementMembersControllerSpec.js +++ b/frontend/test/specs/institution/managementMembersControllerSpec.js @@ -337,10 +337,9 @@ }); it('should call Utils.groupUsersByInitialLetter if is mobile screen', () => { - spyOn(Utils, 'isMobileScreen').and.returnValue(true); - spyOn(Utils, 'groupUsersByInitialLetter'); + spyOn(manageMemberCtrl,'_getAdmin'); manageMemberCtrl._getMembers(); - expect(Utils.groupUsersByInitialLetter).toHaveBeenCalledWith([member, user]); + expect(manageMemberCtrl._getAdmin).toHaveBeenCalledWith([member, user]); }); }); }); From 8de7600f5466288b64ccea737922515893ddfc15 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Mon, 25 Feb 2019 14:50:18 -0300 Subject: [PATCH 367/606] added disable --- frontend/app.js | 2 +- frontend/event/create_event.html | 8 ++++++-- frontend/event/event_dialog.html | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 3e76c0033..23514e91c 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -612,6 +612,6 @@ } (function main() { - initServiceWorker(); + //initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/event/create_event.html b/frontend/event/create_event.html index ee33d8fd1..e51bd76c2 100644 --- a/frontend/event/create_event.html +++ b/frontend/event/create_event.html @@ -135,12 +135,16 @@ Dia inteiro
    -
    -
    diff --git a/frontend/event/event_dialog.html b/frontend/event/event_dialog.html index 0ff848342..ebb19283a 100644 --- a/frontend/event/event_dialog.html +++ b/frontend/event/event_dialog.html @@ -157,12 +157,14 @@ From a24d6b69b97481392b5748dfdbb07c66d19f84ad Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 19 Feb 2019 10:44:20 -0300 Subject: [PATCH 368/606] created manage institution menu --- frontend/app.js | 6 ++-- frontend/index.html | 2 ++ .../menu/manageInstMenuController.js | 29 +++++++++++++++++++ .../menu/manage_institution_menu.css | 5 ++++ .../menu/manage_institution_menu.html | 10 +++++++ 5 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 frontend/institution/manageInstitution/menu/manageInstMenuController.js create mode 100644 frontend/institution/manageInstitution/menu/manage_institution_menu.css create mode 100644 frontend/institution/manageInstitution/menu/manage_institution_menu.html diff --git a/frontend/app.js b/frontend/app.js index 3e76c0033..0b340562f 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -262,8 +262,10 @@ url: "/edit", views: { content_manage_institution: { - templateUrl: Utils.selectFieldBasedOnScreenSize("app/institution/edit_info.html", - "app/institution/edit_info_mobile.html", 475) + templateUrl: Utils.selectFieldBasedOnScreenSize( + "app/institution/manage_institution_page.html", + "app/institution/manageInstitution/menu/manage_institution_menu.html", 475), + controller: "ManageInstMenuController as manageInstMenuCtrl" } } }) diff --git a/frontend/index.html b/frontend/index.html index 4408ab934..dd1ed5fbc 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -64,6 +64,7 @@ + @@ -246,6 +247,7 @@ + diff --git a/frontend/institution/manageInstitution/menu/manageInstMenuController.js b/frontend/institution/manageInstitution/menu/manageInstMenuController.js new file mode 100644 index 000000000..b70197471 --- /dev/null +++ b/frontend/institution/manageInstitution/menu/manageInstMenuController.js @@ -0,0 +1,29 @@ +"use strict"; + +(() => { + angular + .module("app") + .controller("ManageInstMenuController", ManageInstMenuController); + + function ManageInstMenuController($state, AuthService, InstitutionService) { + const manageInstMenuCtrl = this; + + manageInstMenuCtrl.$onInit = () => { + manageInstMenuCtrl.user = AuthService.getCurrentUser(); + manageInstMenuCtrl._loadInstitution(); + }; + + manageInstMenuCtrl._loadInstitution = () => { + InstitutionService.getInstitution($state.params.institutionKey) + .then(institution => { + manageInstMenuCtrl.institution = institution; + console.log(institution); + + }); + } + + manageInstMenuCtrl.getActionButtons = { + goBack: () => window.history.back(), + } + } +})(); \ No newline at end of file diff --git a/frontend/institution/manageInstitution/menu/manage_institution_menu.css b/frontend/institution/manageInstitution/menu/manage_institution_menu.css new file mode 100644 index 000000000..663775859 --- /dev/null +++ b/frontend/institution/manageInstitution/menu/manage_institution_menu.css @@ -0,0 +1,5 @@ +.manage-inst-menu { + display: grid; + grid-template-columns: 1fr; + +} \ No newline at end of file diff --git a/frontend/institution/manageInstitution/menu/manage_institution_menu.html b/frontend/institution/manageInstitution/menu/manage_institution_menu.html new file mode 100644 index 000000000..e464895f5 --- /dev/null +++ b/frontend/institution/manageInstitution/menu/manage_institution_menu.html @@ -0,0 +1,10 @@ +
    + + + +
    \ No newline at end of file From 9f3de077ba61ce9a943424023add3f0ef2513851 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 19 Feb 2019 10:44:54 -0300 Subject: [PATCH 369/606] improved the institution header getTitle function --- .../institutionHeader.component.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/institution/institutionHeader.component.js b/frontend/institution/institutionHeader.component.js index e237d9482..63d284bbd 100644 --- a/frontend/institution/institutionHeader.component.js +++ b/frontend/institution/institutionHeader.component.js @@ -7,7 +7,7 @@ templateUrl: "/app/institution/institution_header.html", controller: ['$state', 'STATES', function($state, STATES){ const instHeaderCtrl = this; - + /** Return if should show or hide button more, * show if in timeline and is admin or member. */ @@ -42,18 +42,18 @@ /** Return the title of page according current state. */ - instHeaderCtrl.getTitle = function getTitle(){ - const getLimitedName = instHeaderCtrl.actionsButtons && - instHeaderCtrl.actionsButtons.getLimitedName(110); - const tileState = { - [STATES.INST_TIMELINE]: getLimitedName, - [STATES.INST_REGISTRATION_DATA]: "Dados cadastrais", - [STATES.INST_LINKS]: "Vínculos Institucionais", - [STATES.INST_DESCRIPTION]: "Descrição", - [STATES.INST_MEMBERS]: "Membros", - [STATES.INST_FOLLOWERS]: "Seguidores" + instHeaderCtrl.getTitle = function getTitle(){ + const instName = instHeaderCtrl.institution ? instHeaderCtrl.institution.name : ""; + const limitedInstName = Utils.limitString(instName, 110); + + switch($state.current.name) { + case STATES.INST_TIMELINE: + case STATES.MANAGE_INST_EDIT: return limitedInstName; + case STATES.INST_REGISTRATION_DATA: return "Dados cadastrais"; + case STATES.INST_LINKS: return "Vínculos Institucionais"; + case STATES.INST_MEMBERS: return "Membros"; + case STATES.INST_FOLLOWERS: return "Seguidores"; }; - return tileState[$state.current.name]; }; instHeaderCtrl.showButtonEdit = function showButtonEdit(){ From fef634008fd0088be987c57d723f7eb57fbb272b Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 19 Feb 2019 11:40:13 -0300 Subject: [PATCH 370/606] added menu options --- .../menu/manageInstMenuController.js | 11 ++++++--- .../menu/manage_institution_menu.css | 23 ++++++++++++++++++- .../menu/manage_institution_menu.html | 8 +++++++ 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/frontend/institution/manageInstitution/menu/manageInstMenuController.js b/frontend/institution/manageInstitution/menu/manageInstMenuController.js index b70197471..03f9de320 100644 --- a/frontend/institution/manageInstitution/menu/manageInstMenuController.js +++ b/frontend/institution/manageInstitution/menu/manageInstMenuController.js @@ -5,7 +5,7 @@ .module("app") .controller("ManageInstMenuController", ManageInstMenuController); - function ManageInstMenuController($state, AuthService, InstitutionService) { + function ManageInstMenuController($state, AuthService, InstitutionService, ManageInstItemsFactory) { const manageInstMenuCtrl = this; manageInstMenuCtrl.$onInit = () => { @@ -17,13 +17,18 @@ InstitutionService.getInstitution($state.params.institutionKey) .then(institution => { manageInstMenuCtrl.institution = institution; + manageInstMenuCtrl._loadMenuOptions(institution); console.log(institution); - }); + }; + + manageInstMenuCtrl._loadMenuOptions = (institution) => { + // the slice was used to get just the first four items + manageInstMenuCtrl.options = ManageInstItemsFactory.getItems(institution).slice(0,4); } manageInstMenuCtrl.getActionButtons = { goBack: () => window.history.back(), - } + }; } })(); \ No newline at end of file diff --git a/frontend/institution/manageInstitution/menu/manage_institution_menu.css b/frontend/institution/manageInstitution/menu/manage_institution_menu.css index 663775859..1b5248eb1 100644 --- a/frontend/institution/manageInstitution/menu/manage_institution_menu.css +++ b/frontend/institution/manageInstitution/menu/manage_institution_menu.css @@ -1,5 +1,26 @@ .manage-inst-menu { display: grid; grid-template-columns: 1fr; - + grid-template-rows: auto 2em auto; +} + +.manage-inst-menu__divider { + border: none; + background-color: #84C45E; + height: 4px; + width: 30%; + align-self: center; +} + +.manage-inst-menu__option { + background: #009688; + color: white; + text-align: start; + width: 90%; + justify-self: center; +} + +.manage-inst-menu__option > md-icon { + color: white; + margin: 0 0.5em; } \ No newline at end of file diff --git a/frontend/institution/manageInstitution/menu/manage_institution_menu.html b/frontend/institution/manageInstitution/menu/manage_institution_menu.html index e464895f5..aff8a517c 100644 --- a/frontend/institution/manageInstitution/menu/manage_institution_menu.html +++ b/frontend/institution/manageInstitution/menu/manage_institution_menu.html @@ -7,4 +7,12 @@ actions-buttons="manageInstMenuCtrl.getActionButtons"> +
    + + + {{option.icon}} + {{option.description}} +
    \ No newline at end of file From a4f62dac608037f020bbf003b408d801d8f1fee4 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 19 Feb 2019 13:55:54 -0300 Subject: [PATCH 371/606] created a state to load the manage institution menu --- frontend/app.js | 28 +++++++++++++------ .../institutionHeader.component.js | 2 +- .../menu/manage_institution_menu.html | 3 +- .../sideMenu/factories/homeItems.factory.js | 11 ++++++-- frontend/utils/statesConstants.js | 1 + 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 0b340562f..c110eab5d 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -75,7 +75,7 @@ views: { user_content: { templateUrl: Utils.selectFieldBasedOnScreenSize("app/institution/institutions.html", - "app/institution/registered_institutions_mobile.html", 450), + "app/institution/registered_institutions_mobile.html", SCREEN_SIZES.SMARTPHONE), controller: "AllInstitutionsController as allInstitutionsCtrl" } } @@ -85,7 +85,7 @@ views: { user_content: { templateUrl: Utils.selectFieldBasedOnScreenSize("app/event/events.html", - "app/event/events_mobile.html", 475), + "app/event/events_mobile.html", SCREEN_SIZES.SMARTPHONE), controller: "EventController as eventCtrl", } } @@ -159,7 +159,7 @@ views: { institution_content: { templateUrl: Utils.selectFieldBasedOnScreenSize("app/institution/followers.html", - "app/institution/followers_mobile.html", 475), + "app/institution/followers_mobile.html", SCREEN_SIZES.SMARTPHONE), controller: "FollowersInstController as followersCtrl" } } @@ -190,7 +190,7 @@ views: { institution_content: { templateUrl: Utils.selectFieldBasedOnScreenSize("app/institution/members.html", - "app/institution/members_mobile.html", 475), + "app/institution/members_mobile.html", SCREEN_SIZES.SMARTPHONE), controller: "ManagementMembersController as membersCtrl" } } @@ -200,7 +200,7 @@ views: { institution_content: { templateUrl: Utils.selectFieldBasedOnScreenSize("app/institution/registration_data.html", - "app/institution/registration_data_mobile.html", 475), + "app/institution/registration_data_mobile.html", SCREEN_SIZES.SMARTPHONE), controller: "InstitutionController as institutionCtrl" } } @@ -240,6 +240,15 @@ } } }) + .state(STATES.MANAGE_INST_MENU, { + url: "/menu", + views: { + content_manage_institution: { + templateUrl: "app/institution/manageInstitution/menu/manage_institution_menu.html", + controller: "ManageInstMenuController as manageInstMenuCtrl" + } + } + }) .state(STATES.MANAGE_INST_MEMBERS, { url: "/managementMembers", views: { @@ -263,9 +272,10 @@ views: { content_manage_institution: { templateUrl: Utils.selectFieldBasedOnScreenSize( - "app/institution/manage_institution_page.html", - "app/institution/manageInstitution/menu/manage_institution_menu.html", 475), - controller: "ManageInstMenuController as manageInstMenuCtrl" + "app/institution/edit_info.html", + "app/institution/edit_info_mobile.html", + SCREEN_SIZES.SMARTPHONE + ) } } }) @@ -614,6 +624,6 @@ } (function main() { - initServiceWorker(); + // initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/institution/institutionHeader.component.js b/frontend/institution/institutionHeader.component.js index 63d284bbd..9d9818e16 100644 --- a/frontend/institution/institutionHeader.component.js +++ b/frontend/institution/institutionHeader.component.js @@ -48,7 +48,7 @@ switch($state.current.name) { case STATES.INST_TIMELINE: - case STATES.MANAGE_INST_EDIT: return limitedInstName; + case STATES.MANAGE_INST_MENU: return limitedInstName; case STATES.INST_REGISTRATION_DATA: return "Dados cadastrais"; case STATES.INST_LINKS: return "Vínculos Institucionais"; case STATES.INST_MEMBERS: return "Membros"; diff --git a/frontend/institution/manageInstitution/menu/manage_institution_menu.html b/frontend/institution/manageInstitution/menu/manage_institution_menu.html index aff8a517c..914ec98ff 100644 --- a/frontend/institution/manageInstitution/menu/manage_institution_menu.html +++ b/frontend/institution/manageInstitution/menu/manage_institution_menu.html @@ -10,8 +10,7 @@
    + class="manage-inst-menu__option" ng-click="option.onClick()"> {{option.icon}} {{option.description}} diff --git a/frontend/sideMenu/factories/homeItems.factory.js b/frontend/sideMenu/factories/homeItems.factory.js index 17388c9e6..18931e04a 100644 --- a/frontend/sideMenu/factories/homeItems.factory.js +++ b/frontend/sideMenu/factories/homeItems.factory.js @@ -3,7 +3,7 @@ (function () { angular .module('app') - .factory('HomeItemsFactory', function ($state, STATES, AuthService, $mdDialog, $window) { + .factory('HomeItemsFactory', function ($state, STATES, AuthService, $mdDialog, $window, SCREEN_SIZES) { const factory = {}; const url_report = Config.SUPPORT_URL + "/report"; @@ -58,11 +58,16 @@ { icon: 'account_balance', description: 'Gerenciar instituição', - stateName: 'MANAGE_INST_EDIT', + stateName: 'MANAGE_INST', showIf: () => user.isAdminOfCurrentInst(), sectionTitle: 'INSTITUIÇÃO', topDivider: true, - onClick: () => $state.go(STATES.MANAGE_INST_EDIT, {institutionKey: getInstitutionKey()}), + onClick: () => { + const state = Utils.selectFieldBasedOnScreenSize( + STATES.MANAGE_INST, STATES.MANAGE_INST_MENU, SCREEN_SIZES.SMARTPHONE + ); + $state.go(state, {institutionKey: getInstitutionKey()}); + }, }, { icon: 'account_circle', diff --git a/frontend/utils/statesConstants.js b/frontend/utils/statesConstants.js index 5c74d2543..3ce04bf06 100644 --- a/frontend/utils/statesConstants.js +++ b/frontend/utils/statesConstants.js @@ -24,6 +24,7 @@ INST_LINKS: "app.institution.institutional_links", POST: "app.post", MANAGE_INST: "app.manage_institution", + MANAGE_INST_MENU: "app.manage_institution.menu", MANAGE_INST_MEMBERS: "app.manage_institution.members", MANAGE_INST_EDIT: "app.manage_institution.edit_info", MANAGE_INST_INVITE_INST: "app.manage_institution.invite_inst", From e79684305842caf0f7ba89a058d6b92ffa41aa86 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 19 Feb 2019 16:19:36 -0300 Subject: [PATCH 372/606] set to show institution cover image --- .../manageInstitution/menu/manageInstMenuController.js | 1 + .../manageInstitution/menu/manage_institution_menu.html | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/manageInstitution/menu/manageInstMenuController.js b/frontend/institution/manageInstitution/menu/manageInstMenuController.js index 03f9de320..070650437 100644 --- a/frontend/institution/manageInstitution/menu/manageInstMenuController.js +++ b/frontend/institution/manageInstitution/menu/manageInstMenuController.js @@ -29,6 +29,7 @@ manageInstMenuCtrl.getActionButtons = { goBack: () => window.history.back(), + showImageCover: () => true }; } })(); \ No newline at end of file diff --git a/frontend/institution/manageInstitution/menu/manage_institution_menu.html b/frontend/institution/manageInstitution/menu/manage_institution_menu.html index 914ec98ff..0351e866f 100644 --- a/frontend/institution/manageInstitution/menu/manage_institution_menu.html +++ b/frontend/institution/manageInstitution/menu/manage_institution_menu.html @@ -3,7 +3,6 @@ user="manageInstMenuCtrl.user" institution="manageInstMenuCtrl.institution" photo="manageInstMenuCtrl.institution.photo_url" - file-background="manageInstMenuCtrl.file" actions-buttons="manageInstMenuCtrl.getActionButtons"> From 897314133453c17e7696af2b74976ab810043e8f Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 10:10:15 -0300 Subject: [PATCH 373/606] moved files from editInfo and manageMembers page to subfolders --- frontend/app.js | 6 +++--- frontend/index.html | 4 ++-- .../configInstitution}/configInstDirective.js | 5 +++-- .../configInstitution}/edit_registration_data.html | 0 .../configInstitution}/submit_form.html | 0 .../{ => manageInstitution/editInfo}/edit_info.html | 0 .../{ => manageInstitution/editInfo}/edit_info_mobile.html | 0 .../manageMembers}/managementMembersController.js | 0 .../manageMembers}/management_members.html | 0 9 files changed, 8 insertions(+), 7 deletions(-) rename frontend/institution/{ => manageInstitution/configInstitution}/configInstDirective.js (98%) rename frontend/institution/{ => manageInstitution/configInstitution}/edit_registration_data.html (100%) rename frontend/institution/{ => manageInstitution/configInstitution}/submit_form.html (100%) rename frontend/institution/{ => manageInstitution/editInfo}/edit_info.html (100%) rename frontend/institution/{ => manageInstitution/editInfo}/edit_info_mobile.html (100%) rename frontend/institution/{ => manageInstitution/manageMembers}/managementMembersController.js (100%) rename frontend/institution/{ => manageInstitution/manageMembers}/management_members.html (100%) diff --git a/frontend/app.js b/frontend/app.js index c110eab5d..32d7b2aab 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -253,7 +253,7 @@ url: "/managementMembers", views: { content_manage_institution: { - templateUrl: "app/institution/management_members.html", + templateUrl: "app/institution/manageInstitution/manageMembers/management_members.html", controller: "ManagementMembersController as manageMemberCtrl" } } @@ -272,8 +272,8 @@ views: { content_manage_institution: { templateUrl: Utils.selectFieldBasedOnScreenSize( - "app/institution/edit_info.html", - "app/institution/edit_info_mobile.html", + "app/institution/manageInstitution/editInfo/edit_info.html", + "app/institution/manageInstitution/editInfo/edit_info_mobile.html", SCREEN_SIZES.SMARTPHONE ) } diff --git a/frontend/index.html b/frontend/index.html index dd1ed5fbc..1b52d91b4 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -231,8 +231,6 @@ - - @@ -248,6 +246,8 @@ + + diff --git a/frontend/institution/configInstDirective.js b/frontend/institution/manageInstitution/configInstitution/configInstDirective.js similarity index 98% rename from frontend/institution/configInstDirective.js rename to frontend/institution/manageInstitution/configInstitution/configInstDirective.js index 2f8f13714..ea655ade9 100644 --- a/frontend/institution/configInstDirective.js +++ b/frontend/institution/manageInstitution/configInstitution/configInstDirective.js @@ -479,8 +479,9 @@ app.directive("configInstitution", function() { return { restrict: 'E', - templateUrl: Utils.selectFieldBasedOnScreenSize("app/institution/submit_form.html", - "app/institution/edit_registration_data.html", 475), + templateUrl: Utils.selectFieldBasedOnScreenSize( + "app/institution/manageInstitution/configInstitution/submit_form.html", + "app/institution/manageInstitution/configInstitution/edit_registration_data.html", 475), controller: "ConfigInstController", controllerAs: "configInstCtrl", scope: {}, diff --git a/frontend/institution/edit_registration_data.html b/frontend/institution/manageInstitution/configInstitution/edit_registration_data.html similarity index 100% rename from frontend/institution/edit_registration_data.html rename to frontend/institution/manageInstitution/configInstitution/edit_registration_data.html diff --git a/frontend/institution/submit_form.html b/frontend/institution/manageInstitution/configInstitution/submit_form.html similarity index 100% rename from frontend/institution/submit_form.html rename to frontend/institution/manageInstitution/configInstitution/submit_form.html diff --git a/frontend/institution/edit_info.html b/frontend/institution/manageInstitution/editInfo/edit_info.html similarity index 100% rename from frontend/institution/edit_info.html rename to frontend/institution/manageInstitution/editInfo/edit_info.html diff --git a/frontend/institution/edit_info_mobile.html b/frontend/institution/manageInstitution/editInfo/edit_info_mobile.html similarity index 100% rename from frontend/institution/edit_info_mobile.html rename to frontend/institution/manageInstitution/editInfo/edit_info_mobile.html diff --git a/frontend/institution/managementMembersController.js b/frontend/institution/manageInstitution/manageMembers/managementMembersController.js similarity index 100% rename from frontend/institution/managementMembersController.js rename to frontend/institution/manageInstitution/manageMembers/managementMembersController.js diff --git a/frontend/institution/management_members.html b/frontend/institution/manageInstitution/manageMembers/management_members.html similarity index 100% rename from frontend/institution/management_members.html rename to frontend/institution/manageInstitution/manageMembers/management_members.html From 8fcfe9ce94f9080c2f8d8971cc637428b07c8744 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 20 Feb 2019 10:15:07 -0300 Subject: [PATCH 374/606] removed log and fixed transition to manageInstitution page on web --- .../manageInstitution/menu/manageInstMenuController.js | 1 - frontend/sideMenu/factories/homeItems.factory.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/institution/manageInstitution/menu/manageInstMenuController.js b/frontend/institution/manageInstitution/menu/manageInstMenuController.js index 070650437..603a0fe28 100644 --- a/frontend/institution/manageInstitution/menu/manageInstMenuController.js +++ b/frontend/institution/manageInstitution/menu/manageInstMenuController.js @@ -18,7 +18,6 @@ .then(institution => { manageInstMenuCtrl.institution = institution; manageInstMenuCtrl._loadMenuOptions(institution); - console.log(institution); }); }; diff --git a/frontend/sideMenu/factories/homeItems.factory.js b/frontend/sideMenu/factories/homeItems.factory.js index 18931e04a..6f11e5c1c 100644 --- a/frontend/sideMenu/factories/homeItems.factory.js +++ b/frontend/sideMenu/factories/homeItems.factory.js @@ -58,13 +58,13 @@ { icon: 'account_balance', description: 'Gerenciar instituição', - stateName: 'MANAGE_INST', + stateName: 'MANAGE_INST_EDIT', showIf: () => user.isAdminOfCurrentInst(), sectionTitle: 'INSTITUIÇÃO', topDivider: true, onClick: () => { const state = Utils.selectFieldBasedOnScreenSize( - STATES.MANAGE_INST, STATES.MANAGE_INST_MENU, SCREEN_SIZES.SMARTPHONE + STATES.MANAGE_INST_EDIT, STATES.MANAGE_INST_MENU, SCREEN_SIZES.SMARTPHONE ); $state.go(state, {institutionKey: getInstitutionKey()}); }, From bcb35c041d4450ae155d0aadf18895186c634fb1 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Mon, 25 Feb 2019 17:01:20 -0300 Subject: [PATCH 375/606] adding tests --- .../notification/pushNotificationService.js | 22 +++-- .../specs/user/configProfileControllerSpec.js | 93 ++++++++++++++++++- .../configProfile/configProfileController.js | 27 +++--- 3 files changed, 119 insertions(+), 23 deletions(-) diff --git a/frontend/notification/pushNotificationService.js b/frontend/notification/pushNotificationService.js index e157cf8a4..4f9afed89 100644 --- a/frontend/notification/pushNotificationService.js +++ b/frontend/notification/pushNotificationService.js @@ -27,7 +27,8 @@ service.firebaseArrayNotifications; /** - * + * Setup necessary properties as: + * Initilize firebase array with user's device tokens. */ service.setupPushNotificationPermission = () => { service._initFirebaseArray(); @@ -35,6 +36,7 @@ /** * Check if the user has blocked push notification in the browser for this application. + * @returns {boolean} True if is blocked, false otherwise */ service.isPushNotificationBlockedOnBrowser = function isPushNotificationBlockedOnBrowser() { const { permission } = Notification; @@ -42,7 +44,8 @@ }; /** - * + * Check if the user has already allowed push Notification in this application + * @returns {Promise} True if notification is active, false otherwise */ service.isPushNotificationActive = function () { return service._getTokenObjectInFirebaseArray().then((tokenObject) => { @@ -51,15 +54,17 @@ }; /** - * + * Unsubscribe User for push notification in current device. + * @return {Promise} */ service.unsubscribeUserNotification = () => { return service._removeTokenFromFirebaseArray(); }; /** - * - * @returns {*} + * Remove the current device token from firebase array, blocking the device from + * receive push notifications. + * @returns {Promise} * @private */ service._removeTokenFromFirebaseArray = () => { @@ -69,7 +74,8 @@ }; /** - * + * Subscribe User for push notification in current device. + * * @return {Promise} */ service.subscribeUserNotification = () => { return service._requestNotificationPermission(); @@ -141,8 +147,8 @@ }; /** - * - * @returns {null|*} + * Look for firebase object, in firebase array, corresponding to the current device token. + * @returns {Promise} * @private */ service._getTokenObjectInFirebaseArray = () => { diff --git a/frontend/test/specs/user/configProfileControllerSpec.js b/frontend/test/specs/user/configProfileControllerSpec.js index 024133110..8c9cff067 100644 --- a/frontend/test/specs/user/configProfileControllerSpec.js +++ b/frontend/test/specs/user/configProfileControllerSpec.js @@ -3,7 +3,7 @@ (describe('Test ConfigProfileController', function() { let configCtrl, q, scope, userService, createCrtl, authService, imageService, mdDialog, cropImageService, messageService, - stateParams, observerRecorderService; + stateParams, observerRecorderService, pushNotificationService; let institution, other_institution, user, newUser, authUser; @@ -48,7 +48,7 @@ beforeEach(module('app')); beforeEach(inject(function($controller, $q, $rootScope, $mdDialog, UserService, - AuthService, ImageService, CropImageService, MessageService, $stateParams, ObserverRecorderService) { + AuthService, ImageService, CropImageService, MessageService, $stateParams, ObserverRecorderService, PushNotificationService) { q = $q; scope = $rootScope.$new(); @@ -60,7 +60,7 @@ authService = AuthService; stateParams = $stateParams; observerRecorderService = ObserverRecorderService; - + pushNotificationService = PushNotificationService; createCrtl = function() { return $controller('ConfigProfileController', { @@ -84,7 +84,21 @@ spyOn(configCtrl, '_setupUser'); configCtrl.$onInit(); expect(configCtrl._setupUser).toHaveBeenCalled(); - }); + }); + + it('should set configProfileCtrl.pushNotification according to PushNotificationService.isPushNotificationActive', () => { + spyOn(pushNotificationService, 'isPushNotificationActive').and.callFake(()=> q.when(true)); + configCtrl.$onInit(); + scope.$apply(); + expect(configCtrl.pushNotification).toBe(true); + expect(pushNotificationService.isPushNotificationActive).toHaveBeenCalled(); + + pushNotificationService.isPushNotificationActive.and.callFake(()=> q.when(false)); + configCtrl.$onInit(); + scope.$apply(); + expect(configCtrl.pushNotification).toBe(false); + expect(pushNotificationService.isPushNotificationActive).toHaveBeenCalled(); + }); }); describe('_setupUser()', function() { @@ -305,4 +319,75 @@ expect(window.history.back).toHaveBeenCalled(); }); }); + + describe('pushChange', () => { + beforeEach( function () { + spyOn(configCtrl,'_subscribeUser'); + spyOn(configCtrl,'_unsubscribeUser'); + }); + + it('should call subscribeUser user if configProfileCtrl.pushNotification is true', () => { + configCtrl.pushNotification = true; + configCtrl.pushChange(); + expect(configCtrl._subscribeUser).toHaveBeenCalled(); + expect(configCtrl._unsubscribeUser).not.toHaveBeenCalled(); + }); + + it('should call unsubscribeUser user if configProfileCtrl.pushNotification is false', () => { + configCtrl.pushNotification = false; + configCtrl.pushChange(); + expect(configCtrl._subscribeUser).not.toHaveBeenCalled(); + expect(configCtrl._unsubscribeUser).toHaveBeenCalled() + }) + }); + + describe('_unsubscribeUser', () => { + beforeEach( function () { + spyOn(configCtrl,'_openDialog').and.callFake(() => q.when()); + spyOn(pushNotificationService, 'unsubscribeUserNotification'); + configCtrl.pushNotification = false; + }); + + it('should call PushNotificationService.unsubscribeUserNotification() if user confirm dialog', () => { + configCtrl._unsubscribeUser(); + scope.$apply(); + expect(configCtrl._openDialog).toHaveBeenCalled(); + expect(pushNotificationService.unsubscribeUserNotification).toHaveBeenCalled(); + expect(configCtrl.pushNotification).toBe(false); + }); + + it('should set configProfileCtrl.pushNotification to true if user cancel dialog', () => { + configCtrl._openDialog.and.callFake(() => q.reject()); + configCtrl._unsubscribeUser(); + scope.$apply(); + expect(configCtrl._openDialog).toHaveBeenCalled(); + expect(pushNotificationService.unsubscribeUserNotification).not.toHaveBeenCalled(); + expect(configCtrl.pushNotification).toBe(true); + }) + }); + + describe('_subscribeUser', () => { + beforeEach( function () { + spyOn(configCtrl,'_openDialog').and.callFake(() => q.when()); + spyOn(pushNotificationService, 'subscribeUserNotification'); + configCtrl.pushNotification = true; + }); + + it('should call PushNotificationService.subscribeUserNotification() if user confirm dialog', () => { + configCtrl._subscribeUser(); + scope.$apply(); + expect(configCtrl._openDialog).toHaveBeenCalled(); + expect(pushNotificationService.subscribeUserNotification).toHaveBeenCalled(); + expect(configCtrl.pushNotification).toBe(true); + }); + + it('should set configProfileCtrl.pushNotification to false if user cancel dialog', () => { + configCtrl._openDialog.and.callFake(() => q.reject()); + configCtrl._subscribeUser(); + scope.$apply(); + expect(configCtrl._openDialog).toHaveBeenCalled(); + expect(pushNotificationService.subscribeUserNotification).not.toHaveBeenCalled(); + expect(configCtrl.pushNotification).toBe(false); + }) + }); })); \ No newline at end of file diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index 3d38f9f13..5b6bca6c1 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -192,15 +192,18 @@ } /** - * + * Subscribe or Unsubscribe user for push notification + * according to configProfileCtrl.pushNotification model value. */ configProfileCtrl.pushChange = () => { - configProfileCtrl.pushNotification && subscribeUser(); - !configProfileCtrl.pushNotification && unsubscribeUser(); + configProfileCtrl.pushNotification && configProfileCtrl._subscribeUser(); + !configProfileCtrl.pushNotification && configProfileCtrl._unsubscribeUser(); }; /** - * + * Set configProfileCtrl.pushNotification according to the user's + * push notification subscription. + * True if push notification is active, false otherwise. */ function setPushNotificationModel() { PushNotificationService.isPushNotificationActive().then((result) => { @@ -209,31 +212,33 @@ } /** - * + * Stop device from receive push notification * @returns {Promise} + * @private */ - function unsubscribeUser() { + configProfileCtrl._unsubscribeUser = () => { return configProfileCtrl._openDialog().then(() => { return PushNotificationService.unsubscribeUserNotification(); }).catch(() => { configProfileCtrl.pushNotification = true; }); - } + }; /** - * + * Allow device to receive push notification * @returns {Promise} + * @private */ - function subscribeUser() { + configProfileCtrl._subscribeUser = () => { return configProfileCtrl._openDialog().then(() => { return PushNotificationService.subscribeUserNotification(); }).catch(() => { configProfileCtrl.pushNotification = false; }); - } + }; /** - * + * Dialog to double check user's choice about push notification permission. * @param event * @returns {*|Promise|void} * @private From f1ec137cdc8fa11af1506960a047d3ce78440cf7 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Mon, 25 Feb 2019 17:10:02 -0300 Subject: [PATCH 376/606] removing debug coments --- backend/handlers/post_comment_handler.py | 13 +++----- frontend/sw.js | 32 +++++++++---------- .../test/specs/main/mainControllerSpec.js | 6 ++-- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/backend/handlers/post_comment_handler.py b/backend/handlers/post_comment_handler.py index 12df87716..060a7a9ad 100644 --- a/backend/handlers/post_comment_handler.py +++ b/backend/handlers/post_comment_handler.py @@ -67,14 +67,11 @@ def post(self, user, post_key): 'field': 'subscribers' } enqueue_task('multiple-notification', params) - - is_first_comment = post.get_number_of_comment() == 1 - if True: - enqueue_task('send-push-notification', { - 'type': entity_type, - 'receivers': [subscriber.urlsafe() for subscriber in post.subscribers], - 'entity': post.key.urlsafe() - }) + enqueue_task('send-push-notification', { + 'type': entity_type, + 'receivers': [subscriber.urlsafe() for subscriber in post.subscribers], + 'entity': post.key.urlsafe() + }) self.response.write(json.dumps(Utils.toJson(comment))) diff --git a/frontend/sw.js b/frontend/sw.js index 565b16ad1..4bca0fe8a 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'push-notification-permission'; + const CACHE_SUFIX = 'master'; let messaging; @@ -99,23 +99,23 @@ ], }) ); - // - // workbox.routing.registerRoute( - // /\.(?:js|css|html)$/, - // workbox.strategies.staleWhileRevalidate({ - // cacheName: precacheCacheName, - // }) - // ); - // - // workbox.routing.registerRoute( - // new RegExp(Config.BACKEND_URL), - // workbox.strategies.networkFirst({ - // cacheName: runtimeCacheName - // }) - // ); + + workbox.routing.registerRoute( + /\.(?:js|css|html)$/, + workbox.strategies.staleWhileRevalidate({ + cacheName: precacheCacheName, + }) + ); + + workbox.routing.registerRoute( + new RegExp(Config.BACKEND_URL), + workbox.strategies.networkFirst({ + cacheName: runtimeCacheName + }) + ); (function initSw() { - // self.skipWaiting(); + self.skipWaiting(); setupFirebase(); addToCache(['/']); })(); diff --git a/frontend/test/specs/main/mainControllerSpec.js b/frontend/test/specs/main/mainControllerSpec.js index 07eb285f4..ee67d80f5 100644 --- a/frontend/test/specs/main/mainControllerSpec.js +++ b/frontend/test/specs/main/mainControllerSpec.js @@ -2,7 +2,7 @@ (describe('Test MainController', function() { let mainCtrl, httpBackend, scope, createCtrl, state, states, mainToolbar; - let authService, requestInvitationService, notificationListenerService, utilsService; + let authService, requestInvitationService, notificationListenerService, utilsService, pushNotificationService; const user = { name: 'user', @@ -45,7 +45,7 @@ beforeEach(module('app')); beforeEach(inject(function($controller, $httpBackend, $rootScope, $state, AuthService, - RequestInvitationService, NotificationListenerService, STATES, UtilsService) { + RequestInvitationService, NotificationListenerService, STATES, UtilsService, PushNotificationService) { httpBackend = $httpBackend; scope = $rootScope.$new(); state = $state; @@ -54,6 +54,7 @@ requestInvitationService = RequestInvitationService; notificationListenerService = NotificationListenerService; utilsService = UtilsService; + pushNotificationService = PushNotificationService; mainToolbar = document.createElement('div'); mainToolbar.setAttribute("id", "main-toolbar"); @@ -78,6 +79,7 @@ spyOn(requestInvitationService, 'getParentRequests').and.callFake(callFake); spyOn(requestInvitationService, 'getChildrenRequests').and.callFake(callFake); spyOn(NotificationListenerService, 'multipleEventsListener').and.callFake(eventsListenerFake); + spyOn(pushNotificationService, 'setupPushNotificationPermission').and.callFake(callFake); authService.login(user); From 812afb7e1721f9944e126a209d993b1c759ead48 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Mon, 25 Feb 2019 17:27:07 -0300 Subject: [PATCH 377/606] adding css style --- .../user/configProfile/config_profile_mobile.css | 3 +++ .../user/configProfile/config_profile_mobile.html | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/frontend/user/configProfile/config_profile_mobile.css b/frontend/user/configProfile/config_profile_mobile.css index 712d4c6c2..dac0e43ea 100644 --- a/frontend/user/configProfile/config_profile_mobile.css +++ b/frontend/user/configProfile/config_profile_mobile.css @@ -123,3 +123,6 @@ margin: 0 2em; } +.config-profile__form > md-input-container > md-switch .md-container { + margin: auto 0 auto auto; +} \ No newline at end of file diff --git a/frontend/user/configProfile/config_profile_mobile.html b/frontend/user/configProfile/config_profile_mobile.html index ed88f9326..768bb27fd 100644 --- a/frontend/user/configProfile/config_profile_mobile.html +++ b/frontend/user/configProfile/config_profile_mobile.html @@ -59,10 +59,14 @@ - -

    NOTIFICAÇÕES NO CELULAR

    -     - oioiioi + + +

    NOTIFICAÇÕES NO CELULAR

    +     +     +
    Date: Mon, 25 Feb 2019 17:40:34 -0300 Subject: [PATCH 378/606] issue --- frontend/notification/pushNotificationService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/notification/pushNotificationService.js b/frontend/notification/pushNotificationService.js index 4f9afed89..d373ac83a 100644 --- a/frontend/notification/pushNotificationService.js +++ b/frontend/notification/pushNotificationService.js @@ -120,7 +120,7 @@ * @private */ service._initFirebaseArray = function initFirebaseArray() { - const endPoint = PUSH_NOTIFICATIONS_URL + AuthService.getCurrentUser().key; + const endPoint = `${PUSH_NOTIFICATIONS_URL}${AuthService.getCurrentUser().key}`; const notificationsRef = ref.child(endPoint); if (!service.firebaseArrayNotifications) { From 7259f2fcf702fa7577b9ae85323871ba74e0b307 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 26 Feb 2019 09:45:19 -0300 Subject: [PATCH 379/606] implementing the menu for institution change --- .../menu/manageInstMenuController.js | 19 ++++++++++++++++++- .../menu/manage_institution_menu.css | 16 ++++++++++++++++ .../menu/manage_institution_menu.html | 8 ++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/frontend/institution/manageInstitution/menu/manageInstMenuController.js b/frontend/institution/manageInstitution/menu/manageInstMenuController.js index 603a0fe28..7f5c7567b 100644 --- a/frontend/institution/manageInstitution/menu/manageInstMenuController.js +++ b/frontend/institution/manageInstitution/menu/manageInstMenuController.js @@ -9,7 +9,12 @@ const manageInstMenuCtrl = this; manageInstMenuCtrl.$onInit = () => { - manageInstMenuCtrl.user = AuthService.getCurrentUser(); + _.defaults(manageInstMenuCtrl, { + user: AuthService.getCurrentUser(), + + }); + + console.log(manageInstMenuCtrl.user); manageInstMenuCtrl._loadInstitution(); }; @@ -30,5 +35,17 @@ goBack: () => window.history.back(), showImageCover: () => true }; + + manageInstMenuCtrl._loadSwitchInstOptions = () => { + return manageInstMenuCtrl.user && manageInstMenuCtrl.user + .institution_profiles + .map(prof => { + return { + icon: 'bookmark', + title: prof.institution.name + }; + }); + } + } })(); \ No newline at end of file diff --git a/frontend/institution/manageInstitution/menu/manage_institution_menu.css b/frontend/institution/manageInstitution/menu/manage_institution_menu.css index 1b5248eb1..71a83df94 100644 --- a/frontend/institution/manageInstitution/menu/manage_institution_menu.css +++ b/frontend/institution/manageInstitution/menu/manage_institution_menu.css @@ -1,9 +1,25 @@ +.manage-inst-menu__toolbar { + position: fixed; + z-index: 3; + width: 100%; +} + +.manage-inst-menu__toolbar--title { + white-space: nowrap; + text-transform: uppercase; + font-size: 0.9em; +} + .manage-inst-menu { display: grid; grid-template-columns: 1fr; grid-template-rows: auto 2em auto; } +.manage-inst-menu #buttons-navbar-inst-container { + display: none; +} + .manage-inst-menu__divider { border: none; background-color: #84C45E; diff --git a/frontend/institution/manageInstitution/menu/manage_institution_menu.html b/frontend/institution/manageInstitution/menu/manage_institution_menu.html index 0351e866f..b283a4b87 100644 --- a/frontend/institution/manageInstitution/menu/manage_institution_menu.html +++ b/frontend/institution/manageInstitution/menu/manage_institution_menu.html @@ -1,3 +1,11 @@ + + +
    Date: Tue, 26 Feb 2019 10:05:57 -0300 Subject: [PATCH 380/606] solving issues --- frontend/notification/pushNotificationService.js | 2 +- frontend/user/configProfile/configProfileController.js | 2 +- frontend/user/configProfile/config_profile_mobile.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/notification/pushNotificationService.js b/frontend/notification/pushNotificationService.js index d373ac83a..fb09ab6af 100644 --- a/frontend/notification/pushNotificationService.js +++ b/frontend/notification/pushNotificationService.js @@ -160,7 +160,7 @@ tokenObject = objectToken; } }); - return tokenObject; + return updatedArray.find((obj) => obj.token === deviceToken); }); }); }; diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index 5b6bca6c1..d590cf1c3 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -245,7 +245,7 @@ */ configProfileCtrl._openDialog = (event) => { const DIALOG_TEXT_SUBSCRIBE = "Deseja permitir notificação no dispositivo?"; - const DIALOG_TEXT_UNSUBSCRIBE = "Tem certeza que deseja não de receber notificação no dispositivo?"; + const DIALOG_TEXT_UNSUBSCRIBE = "Tem certeza que não deseja receber notificação no dispositivo?"; const DIALOG_TEXT = configProfileCtrl.pushNotification? DIALOG_TEXT_SUBSCRIBE : DIALOG_TEXT_UNSUBSCRIBE; const confirm = $mdDialog.confirm(); confirm diff --git a/frontend/user/configProfile/config_profile_mobile.html b/frontend/user/configProfile/config_profile_mobile.html index 768bb27fd..257d2cf6d 100644 --- a/frontend/user/configProfile/config_profile_mobile.html +++ b/frontend/user/configProfile/config_profile_mobile.html @@ -63,7 +63,7 @@ -

    NOTIFICAÇÕES NO CELULAR

    +

    NOTIFICAÇÕES NO DISPOSITIVO

    From 0d9d61b82f88ee96ad5dd8b667927d41bc09d970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Tue, 26 Feb 2019 11:53:20 -0300 Subject: [PATCH 381/606] Fix is-empty-card component text align --- frontend/utils/is-empty-card/is-empty-card.css | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/utils/is-empty-card/is-empty-card.css b/frontend/utils/is-empty-card/is-empty-card.css index fa5d358eb..6dcbd8dfe 100644 --- a/frontend/utils/is-empty-card/is-empty-card.css +++ b/frontend/utils/is-empty-card/is-empty-card.css @@ -22,4 +22,5 @@ font-weight: bold; color: #009688; text-align: center; + justify-content: center; } \ No newline at end of file From 63a7842d47c3360ed911b9c0e3e585eb3c399387 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 26 Feb 2019 13:50:38 -0300 Subject: [PATCH 382/606] create menu to change institution --- .../menu/manageInstMenuController.js | 31 ++++++++++++------- .../menu/manage_institution_menu.html | 2 +- frontend/toolbar/white_toolbar_mobile.css | 7 ++++- frontend/toolbar/white_toolbar_mobile.html | 6 ++-- 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/frontend/institution/manageInstitution/menu/manageInstMenuController.js b/frontend/institution/manageInstitution/menu/manageInstMenuController.js index 7f5c7567b..c4551390c 100644 --- a/frontend/institution/manageInstitution/menu/manageInstMenuController.js +++ b/frontend/institution/manageInstitution/menu/manageInstMenuController.js @@ -5,21 +5,20 @@ .module("app") .controller("ManageInstMenuController", ManageInstMenuController); - function ManageInstMenuController($state, AuthService, InstitutionService, ManageInstItemsFactory) { + function ManageInstMenuController(AuthService, InstitutionService, ManageInstItemsFactory) { const manageInstMenuCtrl = this; manageInstMenuCtrl.$onInit = () => { _.defaults(manageInstMenuCtrl, { user: AuthService.getCurrentUser(), - }); - - console.log(manageInstMenuCtrl.user); + + manageInstMenuCtrl._loadSwitchInstOptions(); manageInstMenuCtrl._loadInstitution(); }; manageInstMenuCtrl._loadInstitution = () => { - InstitutionService.getInstitution($state.params.institutionKey) + InstitutionService.getInstitution(manageInstMenuCtrl.user.current_institution.key) .then(institution => { manageInstMenuCtrl.institution = institution; manageInstMenuCtrl._loadMenuOptions(institution); @@ -37,15 +36,25 @@ }; manageInstMenuCtrl._loadSwitchInstOptions = () => { - return manageInstMenuCtrl.user && manageInstMenuCtrl.user - .institution_profiles + const getIcon = (instKey) => { + const isInstSelected = manageInstMenuCtrl.user.current_institution.key === instKey; + return isInstSelected ? "radio_button_checked" : "radio_button_unchecked"; + }; + + manageInstMenuCtrl.switchInstOptions = manageInstMenuCtrl.user.institution_profiles + .filter(prof => manageInstMenuCtrl.user.isAdmin(prof.institution_key)) .map(prof => { return { - icon: 'bookmark', - title: prof.institution.name + getIcon: () => getIcon(prof.institution_key), + title: prof.institution.name, + action: () => switchInstitution(prof.institution) }; }); - } - + }; + + const switchInstitution = institution => { + manageInstMenuCtrl.user.changeInstitution(institution); + manageInstMenuCtrl._loadInstitution(); + }; } })(); \ No newline at end of file diff --git a/frontend/institution/manageInstitution/menu/manage_institution_menu.html b/frontend/institution/manageInstitution/menu/manage_institution_menu.html index b283a4b87..c0a425b04 100644 --- a/frontend/institution/manageInstitution/menu/manage_institution_menu.html +++ b/frontend/institution/manageInstitution/menu/manage_institution_menu.html @@ -2,7 +2,7 @@ primary-button-icon="close" title="Gerenciar Instituição" title-class="manage-inst-menu__toolbar--title" - menu-options=" manageInstMenuCtrl.user && manageInstMenuCtrl._loadSwitchInstOptions()" + menu-options="manageInstMenuCtrl.switchInstOptions" class="manage-inst-menu__toolbar"> diff --git a/frontend/toolbar/white_toolbar_mobile.css b/frontend/toolbar/white_toolbar_mobile.css index 58c627209..8db5d5b25 100644 --- a/frontend/toolbar/white_toolbar_mobile.css +++ b/frontend/toolbar/white_toolbar_mobile.css @@ -41,4 +41,9 @@ .white-toolbar-menu-content { width: 100%; -} \ No newline at end of file +} + +.white-toolbar__menu__item { + display: grid; + grid-template-columns: 10% auto; +} diff --git a/frontend/toolbar/white_toolbar_mobile.html b/frontend/toolbar/white_toolbar_mobile.html index b2c428448..70bf6c9c2 100644 --- a/frontend/toolbar/white_toolbar_mobile.html +++ b/frontend/toolbar/white_toolbar_mobile.html @@ -21,11 +21,11 @@ -
    +
    - {{option.icon}} + {{option.getIcon()}} - {{option.title}} + {{option.title}}
    From ee836185beec893d04c8c16664897fbf00be840b Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 26 Feb 2019 14:11:14 -0300 Subject: [PATCH 383/606] refact manageInstMenu controller --- .../menu/manageInstMenuController.js | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/frontend/institution/manageInstitution/menu/manageInstMenuController.js b/frontend/institution/manageInstitution/menu/manageInstMenuController.js index c4551390c..8d778680b 100644 --- a/frontend/institution/manageInstitution/menu/manageInstMenuController.js +++ b/frontend/institution/manageInstitution/menu/manageInstMenuController.js @@ -1,11 +1,13 @@ "use strict"; -(() => { +(function() { angular .module("app") - .controller("ManageInstMenuController", ManageInstMenuController); + .controller("ManageInstMenuController", [ + 'AuthService', 'ManageInstItemsFactory', + ManageInstMenuController]); - function ManageInstMenuController(AuthService, InstitutionService, ManageInstItemsFactory) { + function ManageInstMenuController(AuthService, ManageInstItemsFactory) { const manageInstMenuCtrl = this; manageInstMenuCtrl.$onInit = () => { @@ -18,16 +20,16 @@ }; manageInstMenuCtrl._loadInstitution = () => { - InstitutionService.getInstitution(manageInstMenuCtrl.user.current_institution.key) - .then(institution => { - manageInstMenuCtrl.institution = institution; - manageInstMenuCtrl._loadMenuOptions(institution); - }); + const currentProfile = getProfilesAdmin() + .find(prof => prof.institution_key === manageInstMenuCtrl.user.current_institution.key); + + manageInstMenuCtrl.institution = currentProfile.institution; + manageInstMenuCtrl._loadMenuOptions(); }; manageInstMenuCtrl._loadMenuOptions = (institution) => { // the slice was used to get just the first four items - manageInstMenuCtrl.options = ManageInstItemsFactory.getItems(institution).slice(0,4); + manageInstMenuCtrl.options = ManageInstItemsFactory.getItems(manageInstMenuCtrl.institution).slice(0,4); } manageInstMenuCtrl.getActionButtons = { @@ -41,20 +43,23 @@ return isInstSelected ? "radio_button_checked" : "radio_button_unchecked"; }; - manageInstMenuCtrl.switchInstOptions = manageInstMenuCtrl.user.institution_profiles - .filter(prof => manageInstMenuCtrl.user.isAdmin(prof.institution_key)) - .map(prof => { - return { - getIcon: () => getIcon(prof.institution_key), - title: prof.institution.name, - action: () => switchInstitution(prof.institution) - }; - }); + manageInstMenuCtrl.switchInstOptions = getProfilesAdmin().map(prof => { + return { + getIcon: () => getIcon(prof.institution_key), + title: prof.institution.name, + action: () => switchInstitution(prof.institution) + }; + }); }; const switchInstitution = institution => { manageInstMenuCtrl.user.changeInstitution(institution); manageInstMenuCtrl._loadInstitution(); }; + + const getProfilesAdmin = () => { + return manageInstMenuCtrl.user.institution_profiles + .filter(prof => manageInstMenuCtrl.user.isAdmin(prof.institution_key)); + }; } })(); \ No newline at end of file From 9d773998c4cabb8ac3564273c652fa44bc8122f8 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 26 Feb 2019 14:59:42 -0300 Subject: [PATCH 384/606] moved the configInstitution directory up --- frontend/index.html | 4 ++-- .../configInstitution/configInstDirective.js | 4 ++-- .../configInstitution/edit_registration_data.html | 0 .../{ => configInstitution}/edit_registration_data_mobile.css | 0 .../configInstitution/submit_form.html | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename frontend/institution/{manageInstitution => }/configInstitution/configInstDirective.js (99%) rename frontend/institution/{manageInstitution => }/configInstitution/edit_registration_data.html (100%) rename frontend/institution/{ => configInstitution}/edit_registration_data_mobile.css (100%) rename frontend/institution/{manageInstitution => }/configInstitution/submit_form.html (100%) diff --git a/frontend/index.html b/frontend/index.html index 1b52d91b4..443ccfe6b 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -63,7 +63,7 @@ - + @@ -247,7 +247,7 @@ - + diff --git a/frontend/institution/manageInstitution/configInstitution/configInstDirective.js b/frontend/institution/configInstitution/configInstDirective.js similarity index 99% rename from frontend/institution/manageInstitution/configInstitution/configInstDirective.js rename to frontend/institution/configInstitution/configInstDirective.js index ea655ade9..1efc8b2d1 100644 --- a/frontend/institution/manageInstitution/configInstitution/configInstDirective.js +++ b/frontend/institution/configInstitution/configInstDirective.js @@ -480,8 +480,8 @@ return { restrict: 'E', templateUrl: Utils.selectFieldBasedOnScreenSize( - "app/institution/manageInstitution/configInstitution/submit_form.html", - "app/institution/manageInstitution/configInstitution/edit_registration_data.html", 475), + "app/institution/configInstitution/submit_form.html", + "app/institution/configInstitution/edit_registration_data.html", 475), controller: "ConfigInstController", controllerAs: "configInstCtrl", scope: {}, diff --git a/frontend/institution/manageInstitution/configInstitution/edit_registration_data.html b/frontend/institution/configInstitution/edit_registration_data.html similarity index 100% rename from frontend/institution/manageInstitution/configInstitution/edit_registration_data.html rename to frontend/institution/configInstitution/edit_registration_data.html diff --git a/frontend/institution/edit_registration_data_mobile.css b/frontend/institution/configInstitution/edit_registration_data_mobile.css similarity index 100% rename from frontend/institution/edit_registration_data_mobile.css rename to frontend/institution/configInstitution/edit_registration_data_mobile.css diff --git a/frontend/institution/manageInstitution/configInstitution/submit_form.html b/frontend/institution/configInstitution/submit_form.html similarity index 100% rename from frontend/institution/manageInstitution/configInstitution/submit_form.html rename to frontend/institution/configInstitution/submit_form.html From 9994147678307b66e8d4d8c36f544f47a8e1ceb0 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 26 Feb 2019 15:02:41 -0300 Subject: [PATCH 385/606] moved the editInfo dictory up in the file tree --- frontend/app.js | 4 ++-- .../{manageInstitution => }/editInfo/edit_info.html | 0 .../{manageInstitution => }/editInfo/edit_info_mobile.html | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename frontend/institution/{manageInstitution => }/editInfo/edit_info.html (100%) rename frontend/institution/{manageInstitution => }/editInfo/edit_info_mobile.html (100%) diff --git a/frontend/app.js b/frontend/app.js index 32d7b2aab..7694a8c49 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -272,8 +272,8 @@ views: { content_manage_institution: { templateUrl: Utils.selectFieldBasedOnScreenSize( - "app/institution/manageInstitution/editInfo/edit_info.html", - "app/institution/manageInstitution/editInfo/edit_info_mobile.html", + "app/institution/editInfo/edit_info.html", + "app/institution/editInfo/edit_info_mobile.html", SCREEN_SIZES.SMARTPHONE ) } diff --git a/frontend/institution/manageInstitution/editInfo/edit_info.html b/frontend/institution/editInfo/edit_info.html similarity index 100% rename from frontend/institution/manageInstitution/editInfo/edit_info.html rename to frontend/institution/editInfo/edit_info.html diff --git a/frontend/institution/manageInstitution/editInfo/edit_info_mobile.html b/frontend/institution/editInfo/edit_info_mobile.html similarity index 100% rename from frontend/institution/manageInstitution/editInfo/edit_info_mobile.html rename to frontend/institution/editInfo/edit_info_mobile.html From ee3a50616b3c36348dc6871c7ff103fc22f65a65 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 26 Feb 2019 15:05:35 -0300 Subject: [PATCH 386/606] moved the manageMembers directory up in the file tree --- frontend/app.js | 2 +- frontend/index.html | 2 +- .../manageMembers/managementMembersController.js | 0 .../manageMembers/management_members.html | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename frontend/institution/{manageInstitution => }/manageMembers/managementMembersController.js (100%) rename frontend/institution/{manageInstitution => }/manageMembers/management_members.html (100%) diff --git a/frontend/app.js b/frontend/app.js index 7694a8c49..4b1b9ffeb 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -253,7 +253,7 @@ url: "/managementMembers", views: { content_manage_institution: { - templateUrl: "app/institution/manageInstitution/manageMembers/management_members.html", + templateUrl: "app/institution/manageMembers/management_members.html", controller: "ManagementMembersController as manageMemberCtrl" } } diff --git a/frontend/index.html b/frontend/index.html index 443ccfe6b..ba0322046 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -246,7 +246,7 @@ - + diff --git a/frontend/institution/manageInstitution/manageMembers/managementMembersController.js b/frontend/institution/manageMembers/managementMembersController.js similarity index 100% rename from frontend/institution/manageInstitution/manageMembers/managementMembersController.js rename to frontend/institution/manageMembers/managementMembersController.js diff --git a/frontend/institution/manageInstitution/manageMembers/management_members.html b/frontend/institution/manageMembers/management_members.html similarity index 100% rename from frontend/institution/manageInstitution/manageMembers/management_members.html rename to frontend/institution/manageMembers/management_members.html From 0da6a5c2fb898c16545b5f438c1a96f71204617c Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 26 Feb 2019 15:11:14 -0300 Subject: [PATCH 387/606] moved the files of the menu folder to the manageInstMenu --- frontend/app.js | 2 +- frontend/index.html | 4 ++-- .../menu => manageInstMenu}/manageInstMenuController.js | 0 .../menu => manageInstMenu}/manage_institution_menu.css | 0 .../menu => manageInstMenu}/manage_institution_menu.html | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename frontend/institution/{manageInstitution/menu => manageInstMenu}/manageInstMenuController.js (100%) rename frontend/institution/{manageInstitution/menu => manageInstMenu}/manage_institution_menu.css (100%) rename frontend/institution/{manageInstitution/menu => manageInstMenu}/manage_institution_menu.html (100%) diff --git a/frontend/app.js b/frontend/app.js index 4b1b9ffeb..7e16a3d84 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -244,7 +244,7 @@ url: "/menu", views: { content_manage_institution: { - templateUrl: "app/institution/manageInstitution/menu/manage_institution_menu.html", + templateUrl: "app/institution/manageInstMenu/manage_institution_menu.html", controller: "ManageInstMenuController as manageInstMenuCtrl" } } diff --git a/frontend/index.html b/frontend/index.html index ba0322046..e62c70236 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -64,7 +64,7 @@ - + @@ -245,7 +245,7 @@ - + diff --git a/frontend/institution/manageInstitution/menu/manageInstMenuController.js b/frontend/institution/manageInstMenu/manageInstMenuController.js similarity index 100% rename from frontend/institution/manageInstitution/menu/manageInstMenuController.js rename to frontend/institution/manageInstMenu/manageInstMenuController.js diff --git a/frontend/institution/manageInstitution/menu/manage_institution_menu.css b/frontend/institution/manageInstMenu/manage_institution_menu.css similarity index 100% rename from frontend/institution/manageInstitution/menu/manage_institution_menu.css rename to frontend/institution/manageInstMenu/manage_institution_menu.css diff --git a/frontend/institution/manageInstitution/menu/manage_institution_menu.html b/frontend/institution/manageInstMenu/manage_institution_menu.html similarity index 100% rename from frontend/institution/manageInstitution/menu/manage_institution_menu.html rename to frontend/institution/manageInstMenu/manage_institution_menu.html From 5f83c3c769e60fa79fd048087bd9c96ec447ebb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 27 Feb 2019 08:03:19 -0300 Subject: [PATCH 388/606] Add request_state_email template --- backend/templates/request_state_email.html | 120 +++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 backend/templates/request_state_email.html diff --git a/backend/templates/request_state_email.html b/backend/templates/request_state_email.html new file mode 100644 index 000000000..a580a362b --- /dev/null +++ b/backend/templates/request_state_email.html @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + +
    + + + + + +
    + + +
    + + + + + +
    +
    +
    +
    +
    +
    + +
    +
    +
    + AQUI ESTÁ O LINK QUE VOCÊ SOLICITOU +
    +
    +
    + + VOCÊ SOLICITOU O LINK DE UM FORMULARIO DA PLATAFORMA PARA PREENCHE-LO DEPOIS E AQUI ESTÁ ELE. CLIQUE NO BOTÃO ABAIXO PARA ACESSA-LO. + +
    + +
    +
    +
    +
    +
    +
    + + + + + +
    + + +
    + + + + + +
    +
    +
    +
    + + +
    +
    + +
    +
    + +
    +
    + + Copyright © 2017 Plataforma CIS - Ministério da Saúde. + +
    +
    + + Todos os direitos reservados. + +
    +
    +
    +
    +
    +
    +
    + + + From d64a4f287ad5063ddb32273492c1a2898f8815b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 27 Feb 2019 08:03:45 -0300 Subject: [PATCH 389/606] Add request_state_email_sender to send_email_hierarchy --- backend/send_email_hierarchy/__init__.py | 5 +-- .../request_state_email_sender.py | 35 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 backend/send_email_hierarchy/request_state_email_sender.py diff --git a/backend/send_email_hierarchy/__init__.py b/backend/send_email_hierarchy/__init__.py index 910a0cd11..3a2a4db30 100644 --- a/backend/send_email_hierarchy/__init__.py +++ b/backend/send_email_hierarchy/__init__.py @@ -10,13 +10,14 @@ from .request_link_email_sender import * from .request_user_email_sender import * from .transfer_admin_email_sender import * - +from .request_state_email_sender import * email_modules = [ email_sender, request_institution_email_sender, invite_institution_email_sender, invite_user_email_sender, leave_institution_email_sender, remove_institution_email_sender, remove_member_email_sender, - request_link_email_sender, request_user_email_sender, transfer_admin_email_sender + request_link_email_sender, request_user_email_sender, transfer_admin_email_sender, + request_state_email_sender ] __all__ = [prop for email_module in email_modules for prop in email_module.__all__] \ No newline at end of file diff --git a/backend/send_email_hierarchy/request_state_email_sender.py b/backend/send_email_hierarchy/request_state_email_sender.py new file mode 100644 index 000000000..558485fda --- /dev/null +++ b/backend/send_email_hierarchy/request_state_email_sender.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +"""User Request Handler.""" + +from . import EmailSender + +__all__ = ['RequestStateEmailSender'] + + +class RequestStateEmailSender(EmailSender): + """Entity responsible to send state link email.""" + + def __init__(self, **kwargs): + """The class constructor. + + It initializes the object with its html and its specific properties. + """ + super(RequestStateEmailSender, self).__init__(**kwargs) + self.subject = "Link para preenchimento de formulario" + self.html = "request_state_email.html" + + def send_email(self): + """It enqueue a sending email task with the json that will fill the entity's html. + + For that, it call its super with email_json property. + """ + email_json = { + 'state_link': self.__get_state_link() + } + super(RequestStateEmailSender, self).send_email(email_json) + + def __get_state_link(self): + return self.__get_data()['state-link'] + + def __get_data(self): + return self.body['data'] From 491022a2332b52b0c63796a7e5d6d38a42049ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 27 Feb 2019 08:04:26 -0300 Subject: [PATCH 390/606] Add current_state_email_request_handler to handle state link request --- backend/handlers/__init__.py | 4 ++- .../current_state_email_request_handler.py | 29 +++++++++++++++++++ backend/main.py | 2 ++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 backend/handlers/current_state_email_request_handler.py diff --git a/backend/handlers/__init__.py b/backend/handlers/__init__.py index 34e4f1810..4269bdbf1 100644 --- a/backend/handlers/__init__.py +++ b/backend/handlers/__init__.py @@ -44,6 +44,7 @@ from .institution_children_handler import * from .event_followers_handler import * from .feature_toggle_handler import * +from .current_state_email_request_handler import * handlers = [ base_handler, erro_handler, event_collection_handler, event_handler, @@ -63,7 +64,8 @@ user_request_collection_handler, user_timeline_handler, vote_handler, invite_hierarchy_collection_handler, invite_user_collection_handler, invite_institution_handler, invite_user_handler, institution_parent_handler, - institution_children_handler, event_followers_handler, feature_toggle_handler + institution_children_handler, event_followers_handler, feature_toggle_handler, + current_state_email_request_handler ] __all__ = [prop for handler in handlers for prop in handler.__all__] diff --git a/backend/handlers/current_state_email_request_handler.py b/backend/handlers/current_state_email_request_handler.py new file mode 100644 index 000000000..49f261656 --- /dev/null +++ b/backend/handlers/current_state_email_request_handler.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +"""User Request Handler.""" + +import json + +from util import login_required +from utils import json_response +from . import BaseHandler +from send_email_hierarchy import RequestStateEmailSender + +__all__ = ['CurrentStateEmailRequestHandler'] + + +class CurrentStateEmailRequestHandler(BaseHandler): + """Email request handler.""" + + @login_required + @json_response + def post(self, user): + body = json.loads(self.request.body) + + subject = "Link para preenchimento de formulario" + + email_sender = RequestStateEmailSender(**{ + 'receiver': user.email, + 'subject': subject, + 'body': body + }) + email_sender.send_email() diff --git a/backend/main.py b/backend/main.py index d135f30d8..aad167f7a 100644 --- a/backend/main.py +++ b/backend/main.py @@ -47,6 +47,7 @@ from handlers import InstitutionChildrenHandler from handlers import EventFollowersHandler from handlers import FeatureToggleHandler +from handlers import CurrentStateEmailRequestHandler methods = set(webapp2.WSGIApplication.allowed_methods) methods.add('PATCH') @@ -100,6 +101,7 @@ ("/api/user/timeline.*", UserTimelineHandler), ("/api/search/institution", SearchHandler), ("/api/feature-toggle.*", FeatureToggleHandler), + ("/api/email/current-state", CurrentStateEmailRequestHandler), ("/login", LoginHandler), ("/logout", LogoutHandler), ("/api/.*", ErroHandler) From 25bc6008ca58bc2e85411bfae9ad1d78b0622409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 27 Feb 2019 08:07:54 -0300 Subject: [PATCH 391/606] Fix doc --- backend/handlers/current_state_email_request_handler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/handlers/current_state_email_request_handler.py b/backend/handlers/current_state_email_request_handler.py index 49f261656..ce27e18fb 100644 --- a/backend/handlers/current_state_email_request_handler.py +++ b/backend/handlers/current_state_email_request_handler.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -"""User Request Handler.""" +"""Current state link request email handler.""" import json @@ -12,7 +12,7 @@ class CurrentStateEmailRequestHandler(BaseHandler): - """Email request handler.""" + """Current state email request handler.""" @login_required @json_response From 365401b5c18084c720e439242d19c16c30c24926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Wed, 27 Feb 2019 08:34:28 -0300 Subject: [PATCH 392/606] Fix request state email sender doc --- backend/send_email_hierarchy/request_state_email_sender.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/send_email_hierarchy/request_state_email_sender.py b/backend/send_email_hierarchy/request_state_email_sender.py index 558485fda..e2cd6f858 100644 --- a/backend/send_email_hierarchy/request_state_email_sender.py +++ b/backend/send_email_hierarchy/request_state_email_sender.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -"""User Request Handler.""" +"""Request state email sender.""" from . import EmailSender From c46463abf9f0f12a9078dd13ed7c9a4b2d7278a9 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 27 Feb 2019 11:25:45 -0300 Subject: [PATCH 393/606] Changing the way the search result is shown --- backend/search_module/search_institution.py | 15 +++- .../registeredInstitution.component.js | 8 ++ frontend/search/searchController.js | 33 ++++---- frontend/search/search_dialog.html | 26 ------ frontend/search/search_mobile.html | 84 +++++++++++-------- 5 files changed, 83 insertions(+), 83 deletions(-) delete mode 100644 frontend/search/search_dialog.html diff --git a/backend/search_module/search_institution.py b/backend/search_module/search_institution.py index 123591174..4337affc7 100644 --- a/backend/search_module/search_institution.py +++ b/backend/search_module/search_institution.py @@ -4,6 +4,7 @@ from google.appengine.api import search from . import SearchDocument from utils import text_normalize +import json __all__ = ['SearchInstitution'] @@ -42,7 +43,6 @@ def createDocument(self, institution): admin = institution.email if institution.admin: admin = institution.admin.get().email[0] - content = { 'id': institution.key.urlsafe(), 'name': institution.name, @@ -53,7 +53,10 @@ def createDocument(self, institution): 'actuation_area': institution.actuation_area, 'legal_nature': institution.legal_nature, 'federal_state': institution.address and institution.address.federal_state, - 'description': institution.description + 'description': institution.description, + 'creation_date': institution.creation_date.isoformat(), + 'address': institution.address and json.dumps(dict(institution.address)), + 'photo_url': institution.photo_url } # Make the structure of the document by setting the fields and its id. document = search.Document( @@ -71,7 +74,10 @@ def createDocument(self, institution): search.TextField(name='legal_nature', value=content['legal_nature']), search.TextField(name='federal_state', value=content['federal_state']), - search.TextField(name='description', value=content['description']) + search.TextField(name='description', value=content['description']), + search.TextField(name='creation_date', value=content['creation_date']), + search.TextField(name='address', value=content['address']), + search.TextField(name='photo_url', value=content['photo_url']) ] ) self.saveDocument(document) @@ -84,7 +90,8 @@ def getDocuments(self, value, state): index = search.Index(self.index_name) query_options = search.QueryOptions( returned_fields=['name', 'state', 'email', 'admin', 'acronym', - 'actuation_area', 'legal_nature', 'federal_state', 'description'] + 'actuation_area', 'legal_nature', 'federal_state', + 'description', 'creation_date', 'address', 'photo_url'] ) query = search.Query( query_string=query_string, options=query_options) diff --git a/frontend/institution/registeredInstitution.component.js b/frontend/institution/registeredInstitution.component.js index a7f9eb6b2..030b6e388 100644 --- a/frontend/institution/registeredInstitution.component.js +++ b/frontend/institution/registeredInstitution.component.js @@ -80,7 +80,15 @@ * was after the current institution's creation. */ regInstCtrl.hasSeenInstitution = function hasSeenInstitution() { + console.log(regInstCtrl.institution); return regInstCtrl.user.last_seen_institutions && regInstCtrl.user.last_seen_institutions > regInstCtrl.institution.creation_date; }; + + regInstCtrl.$onInit = () => { + const address = regInstCtrl.institution.address; + if (_.isString(address)) { + regInstCtrl.institution.address = JSON.parse(address); + } + }; }); })(); \ No newline at end of file diff --git a/frontend/search/searchController.js b/frontend/search/searchController.js index f81b09ce7..3eacee869 100644 --- a/frontend/search/searchController.js +++ b/frontend/search/searchController.js @@ -4,7 +4,7 @@ var app = angular.module('app'); app.controller("SearchController", function SearchController($state, InstitutionService, - brCidadesEstados, HttpService, $mdDialog, $window, STATES) { + brCidadesEstados, HttpService, $mdDialog, $window, STATES, AuthService) { var searchCtrl = this; @@ -18,6 +18,8 @@ var legalNatures; searchCtrl.loading = false; searchCtrl.hasChanges = false; + searchCtrl.hasNotSearched = true; + searchCtrl.user = AuthService.getCurrentUser(); searchCtrl.makeSearch = function makeSearch(value, type) { searchCtrl.loading = false; @@ -55,17 +57,14 @@ searchCtrl.search = function search(ev) { if (searchCtrl.search_keyword) { let promise = searchCtrl.makeSearch(searchCtrl.search_keyword, 'institution'); - promise.then(() => { - if (Utils.isMobileScreen()) { - searchCtrl.showSearchFromMobile(ev); - } + searchCtrl.setupResultsInMobile(); }); refreshPreviousKeyword(); return promise; } else { - searchCtrl.showSearchFromMobile('$event'); + searchCtrl.setupResultsInMobile(); } }; @@ -82,19 +81,15 @@ } }; - /** - * Open up a mdDialog to show the search result in a mobile fone - * @param {Event} ev - */ - searchCtrl.showSearchFromMobile = (ev) => { - $mdDialog.show({ - controller: SearchDialogController, - controllerAs: "searchCtrl", - templateUrl: '/app/search/search_dialog.html', - parent: angular.element(document.body), - targetEvent: ev, - clickOutsideToClose: true, - }); + searchCtrl.setupResultsInMobile = () => { + if (searchCtrl.isMobileScreen()) { + const title = document.getElementById('search-title'); + if (title) { + title.style.marginTop = '1em'; + } + + searchCtrl.hasNotSearched = false; + } }; /** diff --git a/frontend/search/search_dialog.html b/frontend/search/search_dialog.html deleted file mode 100644 index 5e4e5c6c1..000000000 --- a/frontend/search/search_dialog.html +++ /dev/null @@ -1,26 +0,0 @@ - -
    - -

    Resultado da pesquisa

    - -
    - - account_balance - -
    - - {{ institution.name | limitTo: 45}}{{institution.name.length > 45 ? '...' : ''}} -
    -
    -     - -
    - • Nenhuma instituição encontrada -
    -     -     -
    - -     \ No newline at end of file diff --git a/frontend/search/search_mobile.html b/frontend/search/search_mobile.html index 28a79f090..b2a3f266e 100644 --- a/frontend/search/search_mobile.html +++ b/frontend/search/search_mobile.html @@ -1,7 +1,7 @@
    -
    +
    @@ -11,41 +11,57 @@
    -
    +
    Pesquisa avançada
    -
    - - - - {{actuation_area.name}} - - - - - - - {{nature.name}} - - - - - - - {{state.nome}} - - - +
    +
    + + + + {{actuation_area.name}} + + + + + + + {{nature.name}} + + + + + + + {{state.nome}} + + + +
    +
    + + CANCELAR + + + PESQUISAR + +
    -
    - - CANCELAR - - - PESQUISAR - +
    +
    + + +
    +
    + + +
    +
    + • Nenhuma instituição encontrada +
    \ No newline at end of file From e349e2d9fb940c834648c9fbd99cf9177e5174eb Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 27 Feb 2019 11:34:36 -0300 Subject: [PATCH 394/606] fix tests --- .../test/specs/search/searchControllerSpec.js | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/frontend/test/specs/search/searchControllerSpec.js b/frontend/test/specs/search/searchControllerSpec.js index 2dd7a4c36..96505fcf0 100644 --- a/frontend/test/specs/search/searchControllerSpec.js +++ b/frontend/test/specs/search/searchControllerSpec.js @@ -95,15 +95,13 @@ } }; }); - spyOn(searchCtrl, 'showSearchFromMobile').and.callThrough(); - spyOn(mdDialog, 'show'); + spyOn(searchCtrl, 'setupResultsInMobile').and.callThrough(); searchCtrl.search_keyword = 'splab'; searchCtrl.search(); expect(searchCtrl.makeSearch).toHaveBeenCalled(); - expect(searchCtrl.showSearchFromMobile).toHaveBeenCalled(); - expect(mdDialog.show).toHaveBeenCalled(); + expect(searchCtrl.setupResultsInMobile).toHaveBeenCalled(); }); it('should call makeSearch(); not mobile screen', () => { @@ -114,17 +112,13 @@ } }; }); - spyOn(searchCtrl, 'showSearchFromMobile').and.callThrough(); - spyOn(mdDialog, 'show'); spyOn(Utils, 'isMobileScreen').and.returnValue(false); searchCtrl.search_keyword = 'splab'; searchCtrl.search(); expect(searchCtrl.makeSearch).toHaveBeenCalled(); - expect(searchCtrl.showSearchFromMobile).not.toHaveBeenCalled(); - expect(mdDialog.show).not.toHaveBeenCalled(); - }) + }); }); describe('makeSearch()', function() { @@ -183,14 +177,6 @@ }); }); - describe('showSearchFromMobile', () => { - it('should call mdDialog.show', () => { - spyOn(mdDialog, 'show'); - searchCtrl.showSearchFromMobile(); - expect(mdDialog.show).toHaveBeenCalled(); - }); - }); - describe('leaveMobileSearchPage()', () => { it('should call window.history.back', () => { spyOn(window.history, 'back'); From 8c979498003484636abb8b1d111809adf0328f93 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 27 Feb 2019 11:35:31 -0300 Subject: [PATCH 395/606] created ManageInstMenuController tests --- .../manageInstMenuController.js | 25 ++-- .../manageInstMenuControllerSpec.js | 108 ++++++++++++++++++ frontend/user/user.js | 2 +- 3 files changed, 122 insertions(+), 13 deletions(-) create mode 100644 frontend/test/specs/institution/manageInstMenuControllerSpec.js diff --git a/frontend/institution/manageInstMenu/manageInstMenuController.js b/frontend/institution/manageInstMenu/manageInstMenuController.js index 8d778680b..36fd15fb4 100644 --- a/frontend/institution/manageInstMenu/manageInstMenuController.js +++ b/frontend/institution/manageInstMenu/manageInstMenuController.js @@ -20,14 +20,14 @@ }; manageInstMenuCtrl._loadInstitution = () => { - const currentProfile = getProfilesAdmin() + const currentProfile = manageInstMenuCtrl._getProfilesAdmin() .find(prof => prof.institution_key === manageInstMenuCtrl.user.current_institution.key); manageInstMenuCtrl.institution = currentProfile.institution; manageInstMenuCtrl._loadMenuOptions(); }; - manageInstMenuCtrl._loadMenuOptions = (institution) => { + manageInstMenuCtrl._loadMenuOptions = () => { // the slice was used to get just the first four items manageInstMenuCtrl.options = ManageInstItemsFactory.getItems(manageInstMenuCtrl.institution).slice(0,4); } @@ -38,26 +38,27 @@ }; manageInstMenuCtrl._loadSwitchInstOptions = () => { - const getIcon = (instKey) => { - const isInstSelected = manageInstMenuCtrl.user.current_institution.key === instKey; - return isInstSelected ? "radio_button_checked" : "radio_button_unchecked"; - }; - - manageInstMenuCtrl.switchInstOptions = getProfilesAdmin().map(prof => { + manageInstMenuCtrl.switchInstOptions = manageInstMenuCtrl._getProfilesAdmin() + .map(prof => { return { - getIcon: () => getIcon(prof.institution_key), + getIcon: () => manageInstMenuCtrl._getIcon(prof.institution_key), title: prof.institution.name, - action: () => switchInstitution(prof.institution) + action: () => manageInstMenuCtrl._switchInstitution(prof.institution) }; }); }; - const switchInstitution = institution => { + manageInstMenuCtrl._getIcon = (instKey) => { + const isInstSelected = manageInstMenuCtrl.user.current_institution.key === instKey; + return isInstSelected ? "radio_button_checked" : "radio_button_unchecked"; + }; + + manageInstMenuCtrl._switchInstitution = institution => { manageInstMenuCtrl.user.changeInstitution(institution); manageInstMenuCtrl._loadInstitution(); }; - const getProfilesAdmin = () => { + manageInstMenuCtrl._getProfilesAdmin = () => { return manageInstMenuCtrl.user.institution_profiles .filter(prof => manageInstMenuCtrl.user.isAdmin(prof.institution_key)); }; diff --git a/frontend/test/specs/institution/manageInstMenuControllerSpec.js b/frontend/test/specs/institution/manageInstMenuControllerSpec.js new file mode 100644 index 000000000..8bf2d7e2c --- /dev/null +++ b/frontend/test/specs/institution/manageInstMenuControllerSpec.js @@ -0,0 +1,108 @@ +"use strict"; + +describe('ManageInstMenuController', () => { + + let manageInstItemsFactory, manageInstMenuCtrl, + user, instA, instB, profileA, profileB; + + const initModels = () => { + instA = new Institution({ + key: "instA-key", + name: "instA" + }); + + instB = new Institution({ + key: "instB-key", + name: "instB" + }); + + profileA = { + institution: instA, + institution_key: instA.key + }; + + profileB = { + institution: instB, + institution_key: instB.key + }; + + user = new User({ + key: "user-key", + institution_profiles: [profileA, profileB], + current_institution: instA, + institutions_admin: [ + `http://localhost/api/key/${instA.key}`, + `http://localhost/api/key/${instB.key}`, + ] + }) + }; + + beforeEach(module("app")); + + beforeEach(inject(function(AuthService, ManageInstItemsFactory, $controller) { + manageInstItemsFactory = ManageInstItemsFactory; + initModels(); + AuthService.login(user); + manageInstMenuCtrl = $controller("ManageInstMenuController"); + manageInstMenuCtrl.$onInit(); + })); + + describe('onInit()', () => { + it('should load the institution and the switchInstOption', () => { + spyOn(manageInstMenuCtrl, '_loadSwitchInstOptions'); + spyOn(manageInstMenuCtrl, '_loadInstitution'); + manageInstMenuCtrl.$onInit(); + expect(manageInstMenuCtrl._loadSwitchInstOptions).toHaveBeenCalled(); + expect(manageInstMenuCtrl._loadInstitution).toHaveBeenCalled(); + }); + }); + + describe('_loadInstitution()', () => { + it('should set the institution and load the menu options', () => { + spyOn(manageInstMenuCtrl, '_loadMenuOptions'); + manageInstMenuCtrl._loadInstitution(); + expect(manageInstMenuCtrl.institution).toBe(instA); + expect(manageInstMenuCtrl._loadMenuOptions).toHaveBeenCalled(); + }); + }); + + describe('_loadMenuOptions()', () => { + it('should call the ManageInstItemsFactory getItems function', () => { + spyOn(manageInstItemsFactory, 'getItems').and.callThrough(); + manageInstMenuCtrl._loadMenuOptions(); + expect(manageInstItemsFactory.getItems).toHaveBeenCalledWith(manageInstMenuCtrl.institution); + }); + }); + + describe('_getIcon()', () => { + it('should return the radio_button_checked icon', () => { + expect(manageInstMenuCtrl._getIcon(instA.key)).toBe('radio_button_checked'); + }); + + it('should return the radio_button_unchecked icon', () => { + expect(manageInstMenuCtrl._getIcon(instB.key)).toBe('radio_button_unchecked'); + }); + }); + + describe('_switchInstitution()', () => { + it('should have called changeInstitution and _loadInstitution', () => { + spyOn(manageInstMenuCtrl.user, 'changeInstitution'); + spyOn(manageInstMenuCtrl, '_loadInstitution'); + manageInstMenuCtrl._switchInstitution(instB); + expect(manageInstMenuCtrl.user.changeInstitution).toHaveBeenCalledWith(instB); + expect(manageInstMenuCtrl._loadInstitution).toHaveBeenCalled(); + }); + }); + + describe('_getProfilesAdmin()', () => { + it(`should return just the profiles in which the user is admin + of the correspondent institution`, () => { + const instC = new Institution({key: 'instC'}); + const profileC = {institution: instC, institution_key: instC.key}; + manageInstMenuCtrl.user.institution_profiles.push(profileC); + expect(manageInstMenuCtrl.user.institution_profiles).toEqual([profileA, profileB, profileC]); + expect(manageInstMenuCtrl._getProfilesAdmin()).toEqual([profileA, profileB]); + }); + }); + +}); \ No newline at end of file diff --git a/frontend/user/user.js b/frontend/user/user.js index 988d6b736..02fb0cc67 100644 --- a/frontend/user/user.js +++ b/frontend/user/user.js @@ -49,7 +49,7 @@ User.prototype.isFollower = function isFollower(institution) { }; User.prototype.isAdmin = function isAdmin(keyInstitution) { - return _.find(this.institutions_admin, institution => getKey(institution) == keyInstitution); + return _.find(this.institutions_admin, institution => getKey(institution) == keyInstitution); }; User.prototype.isAdminOfCurrentInst = function isAdminOfCurrentInst() { From 6d808d889cedd1df0c0ac4d39b370800e2677e89 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 27 Feb 2019 11:37:00 -0300 Subject: [PATCH 396/606] uncomment the initServiceWorker --- frontend/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app.js b/frontend/app.js index 7e16a3d84..9024af002 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -624,6 +624,6 @@ } (function main() { - // initServiceWorker(); + initServiceWorker(); })(); })(); \ No newline at end of file From 544c43e9a63bfbc064c6645145854f82c891d9cd Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 27 Feb 2019 11:56:49 -0300 Subject: [PATCH 397/606] create directive --- frontend/event/create_event.html | 2 +- frontend/event/eventDialogController.js | 4 +++- frontend/event/event_dialog.html | 2 +- .../event/validateYoutubeLinkDirective.js | 21 +++++++++++++++++++ frontend/index.html | 1 + 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 frontend/event/validateYoutubeLinkDirective.js diff --git a/frontend/event/create_event.html b/frontend/event/create_event.html index e51bd76c2..7cbebf25f 100644 --- a/frontend/event/create_event.html +++ b/frontend/event/create_event.html @@ -178,7 +178,7 @@ + ng-change="createEventCtrl.changeUrlLink(usefulLink, createEventCtrl.usefulLinks)"/> diff --git a/frontend/event/eventDialogController.js b/frontend/event/eventDialogController.js index 719b14ff5..69b239941 100644 --- a/frontend/event/eventDialogController.js +++ b/frontend/event/eventDialogController.js @@ -37,6 +37,7 @@ }; dialogCtrl.changeUrlLink = function (urlLink, urlList) { + console.log(dialogCtrl.videoUrls); urlLink.url ? dialogCtrl.addUrl(urlList) : urlList.length > 1 && dialogCtrl.removeUrl(urlLink, urlList); }; @@ -504,8 +505,9 @@ const address = { country: "Brasil" }; getCountries(); loadFederalStates(); - initUrlFields(); dialogCtrl._loadStateParams(); + initUrlFields(); + if (dialogCtrl.event) { dialogCtrl._loadStatesToEdit(); } else if(!dialogCtrl.event && $state.params.eventKey) { diff --git a/frontend/event/event_dialog.html b/frontend/event/event_dialog.html index ebb19283a..3626cba99 100644 --- a/frontend/event/event_dialog.html +++ b/frontend/event/event_dialog.html @@ -181,7 +181,7 @@
    Link do Youtube inválido.
    diff --git a/frontend/event/validateYoutubeLinkDirective.js b/frontend/event/validateYoutubeLinkDirective.js new file mode 100644 index 000000000..9e5b7af53 --- /dev/null +++ b/frontend/event/validateYoutubeLinkDirective.js @@ -0,0 +1,21 @@ +var app = angular.module('app'); +app.directive('validateYoutubeLinkDirective', function() { + return { + require: 'ngModel', + link: function(scope, element, attr, mCtrl) { + + function validateLink(value) { + var regexp = /(?:http(s)?:\/\/)?(www\.)?youtube\.com\/watch\\?v=.+/; + console.log(":::::::::::::::::::::::::::::::::::::::::") + console.log(regexp.test(value)); + if (regexp.test(value)) { + mCtrl.$setValidity('pattern', true); + } else { + mCtrl.$setValidity('pattern', false); + } + return value; + } + mCtrl.$parsers.push(validateLink); + } + }; +}); \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html index 4408ab934..919fec681 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -226,6 +226,7 @@ + From dff8bbdcbbd1034c857ad5fc181c804d47f0b71d Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 27 Feb 2019 15:24:47 -0300 Subject: [PATCH 398/606] added top toolbar --- frontend/institution/management_members_mobile.css | 9 ++++++++- frontend/institution/management_members_mobile.html | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/management_members_mobile.css index 85c122aae..8a71d0915 100644 --- a/frontend/institution/management_members_mobile.css +++ b/frontend/institution/management_members_mobile.css @@ -1,6 +1,13 @@ .manage-members { display: grid; - grid-template-rows: 6em auto 1em; + padding: 1em 0; + margin-top: 25%; +} + +.manage-members__toolbar { + position: fixed; + z-index: 3; + width: 100%; } .manage-members__toolbar__title { diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index b3a0df60d..04fdef97c 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -1,3 +1,10 @@ + + +
    From 0a2d72ca6d3f2f573998b663b7cf0d53ea8a77e9 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 27 Feb 2019 15:59:40 -0300 Subject: [PATCH 399/606] added admin card content --- .../institution/management_members_mobile.css | 8 ++++---- .../institution/management_members_mobile.html | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/management_members_mobile.css index 8a71d0915..775afab1d 100644 --- a/frontend/institution/management_members_mobile.css +++ b/frontend/institution/management_members_mobile.css @@ -22,12 +22,12 @@ grid-row-gap: 1em; } -/* Send invites section */ -.manage-members__send__invites { +.manage-members__card__content { display: grid; grid-row-gap: 1em; } +/* Send invites section */ .manage-members__send__invites > h3, .manage-members__send__invites > p { margin: 0; @@ -49,8 +49,8 @@ color: #9E9E9E; } -.manage-members__send__invites--btn { - width: 30%; +.manage-members__btn { + width: min-content; justify-self: end; background-color: #009688; color: white; diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index 04fdef97c..d696b3450 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -8,7 +8,7 @@
    -
    +

    Convidar Membros

    Coloque abaixo os endereços de e-mail das pessoas que você deseja convidar @@ -22,7 +22,7 @@

    Convidar Membros

    md-maxlength="120" type="email" name="email" placeholder="+ Adicionar e-mail"> - Enviar @@ -31,6 +31,19 @@

    Convidar Membros

    +
    + + + + Transferir + +
    From 9585e456dc68324a3cc800bf4be7c367514a3bbf Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 27 Feb 2019 17:48:41 -0300 Subject: [PATCH 400/606] started to implement the manage members card --- .../institution/managementMembersController.js | 17 +++++++++++++++++ .../institution/management_members_mobile.css | 5 +++++ .../institution/management_members_mobile.html | 15 ++++++++++++++- .../entityShowcase/entityShowcase.component.js | 5 +++++ .../utils/entityShowcase/entityShowcase.html | 9 +++++---- 5 files changed, 46 insertions(+), 5 deletions(-) diff --git a/frontend/institution/managementMembersController.js b/frontend/institution/managementMembersController.js index bbf61989f..e4abbb09b 100644 --- a/frontend/institution/managementMembersController.js +++ b/frontend/institution/managementMembersController.js @@ -97,6 +97,23 @@ ProfileService.showProfile(userKey, ev, manageMemberCtrl.institution.key); }; + manageMemberCtrl.getMembersDeleteBtn = (event, member) => { + return { + icon: 'delete', + iconColor: '#9E9E9E', + showIf: () => !manageMemberCtrl.isAdmin(member), + action: () => manageMemberCtrl.openRemoveMemberDialog(event, member) + }; + }; + + manageMemberCtrl.getMembersProfileBtn = (event, member) => { + return { + icon: 'info', + iconColor: '#9E9E9E', + action: () => manageMemberCtrl.showUserProfile(member.key, event) + }; + }; + manageMemberCtrl.sendUserInvite = function sendInvite(loadedEmails) { manageMemberCtrl.invite.institution_key = currentInstitutionKey; manageMemberCtrl.invite.admin_key = manageMemberCtrl.user.key; diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/management_members_mobile.css index 775afab1d..8c52f65e7 100644 --- a/frontend/institution/management_members_mobile.css +++ b/frontend/institution/management_members_mobile.css @@ -55,4 +55,9 @@ background-color: #009688; color: white; margin-right: 0; +} + +.manage-members__list { + display: grid; + grid-row-gap: 0.5em; } \ No newline at end of file diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index d696b3450..7ef28d97f 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -47,7 +47,20 @@

    Convidar Membros

     - +
    + + + + + +
    diff --git a/frontend/utils/entityShowcase/entityShowcase.component.js b/frontend/utils/entityShowcase/entityShowcase.component.js index af59f7ae1..a0bb7a2be 100644 --- a/frontend/utils/entityShowcase/entityShowcase.component.js +++ b/frontend/utils/entityShowcase/entityShowcase.component.js @@ -14,6 +14,7 @@ * icon: aIcon, * iconColor: aIconColor, * action: aAction, + * showIf: function * }, * ] * @class entityShowcase @@ -45,6 +46,10 @@ const entityShowcaseCtrl = this; entityShowcaseCtrl.showIcon = () => !_.isNil(entityShowcaseCtrl.icon); + + entityShowcaseCtrl.showIconBtn = iconBtn => { + return iconBtn.showIf ? iconBtn.showIf() : true; + } } })(); \ No newline at end of file diff --git a/frontend/utils/entityShowcase/entityShowcase.html b/frontend/utils/entityShowcase/entityShowcase.html index 64a9ad883..94d46fb46 100644 --- a/frontend/utils/entityShowcase/entityShowcase.html +++ b/frontend/utils/entityShowcase/entityShowcase.html @@ -7,10 +7,11 @@ {{entityShowcaseCtrl.subtitle }}
    + ng-repeat="rightIconBtn in entityShowcaseCtrl.rightIconBtns" + ng-if="entityShowcaseCtrl.showIconBtn(rightIconBtn)" + icon="{{ rightIconBtn.icon }}" + icon-color="{{ rightIconBtn.iconColor }}" + action="rightIconBtn.action">
    \ No newline at end of file From 464fc1037ff2c216a88e0eccb5a46d33e384ad9d Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 28 Feb 2019 09:23:06 -0300 Subject: [PATCH 401/606] set max height to items list --- frontend/institution/management_members_mobile.css | 1 + frontend/institution/management_members_mobile.html | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/management_members_mobile.css index 8c52f65e7..4b9079d2b 100644 --- a/frontend/institution/management_members_mobile.css +++ b/frontend/institution/management_members_mobile.css @@ -60,4 +60,5 @@ .manage-members__list { display: grid; grid-row-gap: 0.5em; + max-height: 18em; } \ No newline at end of file diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index 7ef28d97f..45b857044 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -48,9 +48,9 @@

    Convidar Membros

    - - - + + Date: Thu, 28 Feb 2019 09:47:47 -0300 Subject: [PATCH 402/606] set invites card content --- frontend/institution/managementMembersController.js | 10 ++++++++++ frontend/institution/management_members_mobile.html | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/frontend/institution/managementMembersController.js b/frontend/institution/managementMembersController.js index e4abbb09b..fa96156b7 100644 --- a/frontend/institution/managementMembersController.js +++ b/frontend/institution/managementMembersController.js @@ -114,6 +114,16 @@ }; }; + manageMemberCtrl.getDefaultAvatar = () => "app/images/avatar.png"; + + manageMemberCtrl.getInvitesBtn = (event, invite) => { + return { + icon: 'send', + iconColor: '#9E9E9E', + action: () => manageMemberCtrl.resendInvite(invite.key, event) + }; + } + manageMemberCtrl.sendUserInvite = function sendInvite(loadedEmails) { manageMemberCtrl.invite.institution_key = currentInstitutionKey; manageMemberCtrl.invite.admin_key = manageMemberCtrl.user.key; diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index 45b857044..ec2436ed5 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -64,7 +64,17 @@

    Convidar Membros

    - +
    + + + + + +
    From 92d97f2f604f12a37759626d9226dd2759c3c41e Mon Sep 17 00:00:00 2001 From: MaianaB Date: Thu, 28 Feb 2019 10:15:06 -0300 Subject: [PATCH 403/606] Create directive to validate youtube link --- frontend/event/validateYoutubeLinkDirective.js | 5 +---- frontend/sw.js | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/frontend/event/validateYoutubeLinkDirective.js b/frontend/event/validateYoutubeLinkDirective.js index 9e5b7af53..0e63252a6 100644 --- a/frontend/event/validateYoutubeLinkDirective.js +++ b/frontend/event/validateYoutubeLinkDirective.js @@ -3,11 +3,8 @@ app.directive('validateYoutubeLinkDirective', function() { return { require: 'ngModel', link: function(scope, element, attr, mCtrl) { - function validateLink(value) { - var regexp = /(?:http(s)?:\/\/)?(www\.)?youtube\.com\/watch\\?v=.+/; - console.log(":::::::::::::::::::::::::::::::::::::::::") - console.log(regexp.test(value)); + var regexp =/http(?:s?):\/\/(?:www\.)?youtu(?:be\.com\/watch\?v=|\.be\/)([\w\-\_]*)(&(amp;)?‌​[\w\?‌​=]*)?/; if (regexp.test(value)) { mCtrl.$setValidity('pattern', true); } else { diff --git a/frontend/sw.js b/frontend/sw.js index 4bca0fe8a..4792568f3 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'master'; + const CACHE_SUFIX = 'edit-expired-event'; let messaging; From a48dd2b52c350986de43962c6faae2128922f960 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Thu, 28 Feb 2019 10:22:27 -0300 Subject: [PATCH 404/606] remove comment --- frontend/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app.js b/frontend/app.js index 23514e91c..3e76c0033 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -612,6 +612,6 @@ } (function main() { - //initServiceWorker(); + initServiceWorker(); })(); })(); \ No newline at end of file From 698edd80ac12798f43283d20bdb206a48fbe05b3 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Thu, 28 Feb 2019 10:23:48 -0300 Subject: [PATCH 405/606] remove console.log --- frontend/event/eventDialogController.js | 1 - frontend/sw.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/event/eventDialogController.js b/frontend/event/eventDialogController.js index 69b239941..e46484495 100644 --- a/frontend/event/eventDialogController.js +++ b/frontend/event/eventDialogController.js @@ -37,7 +37,6 @@ }; dialogCtrl.changeUrlLink = function (urlLink, urlList) { - console.log(dialogCtrl.videoUrls); urlLink.url ? dialogCtrl.addUrl(urlList) : urlList.length > 1 && dialogCtrl.removeUrl(urlLink, urlList); }; diff --git a/frontend/sw.js b/frontend/sw.js index 4792568f3..4bca0fe8a 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'edit-expired-event'; + const CACHE_SUFIX = 'master'; let messaging; From f61652984a173335b3b3a606946cb33a520f953a Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 28 Feb 2019 10:32:05 -0300 Subject: [PATCH 406/606] set requests card content --- .../institution/managementMembersController.js | 10 ++++++++++ .../institution/management_members_mobile.html | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/frontend/institution/managementMembersController.js b/frontend/institution/managementMembersController.js index fa96156b7..32d72a8a4 100644 --- a/frontend/institution/managementMembersController.js +++ b/frontend/institution/managementMembersController.js @@ -116,6 +116,8 @@ manageMemberCtrl.getDefaultAvatar = () => "app/images/avatar.png"; + manageMemberCtrl.getInviteSubtitle = (invite) => `Convidado por: ${invite.sender_name}`; + manageMemberCtrl.getInvitesBtn = (event, invite) => { return { icon: 'send', @@ -124,6 +126,14 @@ }; } + manageMemberCtrl.getRequestBtn = (event, request) => { + return { + icon: 'error', + iconColor: '#009688', + action: () => manageMemberCtrl.openAcceptRequestDialog(request, event) + }; + } + manageMemberCtrl.sendUserInvite = function sendInvite(loadedEmails) { manageMemberCtrl.invite.institution_key = currentInstitutionKey; manageMemberCtrl.invite.admin_key = manageMemberCtrl.user.key; diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index ec2436ed5..bf63245e0 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -70,7 +70,7 @@

    Convidar Membros

     @@ -78,7 +78,17 @@

    Convidar Membros

    - +
    + + + + + +
    \ No newline at end of file From 69f188dd56ef0fb04b655066dfddcdb4fc8e52b5 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Thu, 28 Feb 2019 10:32:58 -0300 Subject: [PATCH 407/606] Testing, adding jsdoc and removing useless console --- .../registeredInstitution.component.js | 1 - frontend/search/searchController.js | 4 ++++ .../test/specs/search/searchControllerSpec.js | 20 +++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/frontend/institution/registeredInstitution.component.js b/frontend/institution/registeredInstitution.component.js index 030b6e388..503b6e31f 100644 --- a/frontend/institution/registeredInstitution.component.js +++ b/frontend/institution/registeredInstitution.component.js @@ -80,7 +80,6 @@ * was after the current institution's creation. */ regInstCtrl.hasSeenInstitution = function hasSeenInstitution() { - console.log(regInstCtrl.institution); return regInstCtrl.user.last_seen_institutions && regInstCtrl.user.last_seen_institutions > regInstCtrl.institution.creation_date; }; diff --git a/frontend/search/searchController.js b/frontend/search/searchController.js index 3eacee869..94ffdcf89 100644 --- a/frontend/search/searchController.js +++ b/frontend/search/searchController.js @@ -81,6 +81,10 @@ } }; + /** + * Change the title position and the flag that decides + * if the results gotta be shown or not. + */ searchCtrl.setupResultsInMobile = () => { if (searchCtrl.isMobileScreen()) { const title = document.getElementById('search-title'); diff --git a/frontend/test/specs/search/searchControllerSpec.js b/frontend/test/specs/search/searchControllerSpec.js index 96505fcf0..23b8241ab 100644 --- a/frontend/test/specs/search/searchControllerSpec.js +++ b/frontend/test/specs/search/searchControllerSpec.js @@ -207,5 +207,25 @@ expect(searchCtrl.hasChanges).toEqual(false); }); }); + + describe('setupResultsInMobile()', () => { + it('should unset hasNotSearched when is a mobile screen', () => { + window.screen = {width: 200}; + expect(searchCtrl.hasNotSearched).toEqual(true); + + searchCtrl.setupResultsInMobile(); + + expect(searchCtrl.hasNotSearched).toEqual(false); + }); + + it('should not unset hasNotSearched when is not a mobile screen', () => { + window.screen = { width: 1000 }; + expect(searchCtrl.hasNotSearched).toEqual(true); + + searchCtrl.setupResultsInMobile(); + + expect(searchCtrl.hasNotSearched).toEqual(true); + }); + }); }); })); \ No newline at end of file From 5f7ea8e976757f5209ef1699eb7409517923e958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 28 Feb 2019 10:36:32 -0300 Subject: [PATCH 408/606] Fix entityShowcase alligment and margin --- frontend/utils/entityShowcase/entityShowcase.css | 2 +- frontend/utils/iconButton/iconButton.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/utils/entityShowcase/entityShowcase.css b/frontend/utils/entityShowcase/entityShowcase.css index 0c124c6cc..bcdf08127 100644 --- a/frontend/utils/entityShowcase/entityShowcase.css +++ b/frontend/utils/entityShowcase/entityShowcase.css @@ -1,6 +1,6 @@ .entity-showcase { display: grid; - grid-template-columns: max-content auto auto; + grid-template-columns: max-content auto max-content; grid-template-rows: max-content max-content; grid-template-areas: 'avatar title right-icon-buttons' diff --git a/frontend/utils/iconButton/iconButton.html b/frontend/utils/iconButton/iconButton.html index 1d1b79311..6e2255f58 100644 --- a/frontend/utils/iconButton/iconButton.html +++ b/frontend/utils/iconButton/iconButton.html @@ -1,4 +1,4 @@ - + {{ iconButtonCtrl.icon }} From a25861152ab4ac16eda0da5924f4e7f8c54b1211 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Thu, 28 Feb 2019 11:04:20 -0300 Subject: [PATCH 409/606] added verification to mobile --- frontend/event/create_event.html | 6 +++--- frontend/event/eventDialogController.js | 4 ++++ frontend/event/event_dialog.html | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/frontend/event/create_event.html b/frontend/event/create_event.html index 7cbebf25f..32e0df171 100644 --- a/frontend/event/create_event.html +++ b/frontend/event/create_event.html @@ -158,8 +158,8 @@ + ng-change="createEventCtrl.changeUrlLink(videoUrl, createEventCtrl.videoUrls)" + name="video" validate-youtube-link-directive/>
    Link do Youtube inválido.
    @@ -215,7 +215,7 @@

    Inserir foto de capa

    Cancelar - + {{createEventCtrl.lastStep() ? "publicar" : "avançar"}}
    diff --git a/frontend/event/eventDialogController.js b/frontend/event/eventDialogController.js index e46484495..50c8e6f51 100644 --- a/frontend/event/eventDialogController.js +++ b/frontend/event/eventDialogController.js @@ -30,6 +30,10 @@ var saveImgPromise = saveImage(callback); }; + dialogCtrl.colorButtonSubmit = function colorButtonSubmit(formValid) { + return formValid ?'default-teal-500':'default-grey-400'; + }; + dialogCtrl.removeUrl = function (url, urlList) { _.remove(urlList, function (element) { return element === url; diff --git a/frontend/event/event_dialog.html b/frontend/event/event_dialog.html index 3626cba99..08bd64bbc 100644 --- a/frontend/event/event_dialog.html +++ b/frontend/event/event_dialog.html @@ -221,7 +221,7 @@ hide-gt-xs ng-if="(controller.getStep(2) || controller.getStep(3)) && !controller.loading"> voltar - + {{controller.getStep(3) ? "publicar" : "avançar"}} From c0400dacda83b460eaa345ebf74f8fe295eff82c Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 28 Feb 2019 11:32:53 -0300 Subject: [PATCH 410/606] added jsDoc --- frontend/app.js | 3 +- .../configInstitution/configInstDirective.js | 4 +-- .../manageInstMenuController.js | 30 ++++++++++++++++++- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 9024af002..afb9dff3e 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -540,7 +540,8 @@ app.run(function mobileInterceptor($transitions, $state, STATES, SCREEN_SIZES) { const permitted_routes = [ STATES.CREATE_EVENT, - STATES.INST_DESCRIPTION + STATES.INST_DESCRIPTION, + STATES.MANAGE_INST_MENU ]; $transitions.onStart({ diff --git a/frontend/institution/configInstitution/configInstDirective.js b/frontend/institution/configInstitution/configInstDirective.js index 1efc8b2d1..6938ece5c 100644 --- a/frontend/institution/configInstitution/configInstDirective.js +++ b/frontend/institution/configInstitution/configInstDirective.js @@ -476,12 +476,12 @@ })(); }); - app.directive("configInstitution", function() { + app.directive("configInstitution", function(SCREEN_SIZES) { return { restrict: 'E', templateUrl: Utils.selectFieldBasedOnScreenSize( "app/institution/configInstitution/submit_form.html", - "app/institution/configInstitution/edit_registration_data.html", 475), + "app/institution/configInstitution/edit_registration_data.html", SCREEN_SIZES.SMARTPHONE), controller: "ConfigInstController", controllerAs: "configInstCtrl", scope: {}, diff --git a/frontend/institution/manageInstMenu/manageInstMenuController.js b/frontend/institution/manageInstMenu/manageInstMenuController.js index 36fd15fb4..533b8249e 100644 --- a/frontend/institution/manageInstMenu/manageInstMenuController.js +++ b/frontend/institution/manageInstMenu/manageInstMenuController.js @@ -9,7 +9,7 @@ function ManageInstMenuController(AuthService, ManageInstItemsFactory) { const manageInstMenuCtrl = this; - + manageInstMenuCtrl.$onInit = () => { _.defaults(manageInstMenuCtrl, { user: AuthService.getCurrentUser(), @@ -19,6 +19,10 @@ manageInstMenuCtrl._loadInstitution(); }; + /** + * Sets the user current institution in the controller + * than it loads the menu options + */ manageInstMenuCtrl._loadInstitution = () => { const currentProfile = manageInstMenuCtrl._getProfilesAdmin() .find(prof => prof.institution_key === manageInstMenuCtrl.user.current_institution.key); @@ -27,16 +31,28 @@ manageInstMenuCtrl._loadMenuOptions(); }; + /** + * Sets the options that are going to be showed on the menu + */ manageInstMenuCtrl._loadMenuOptions = () => { // the slice was used to get just the first four items manageInstMenuCtrl.options = ManageInstItemsFactory.getItems(manageInstMenuCtrl.institution).slice(0,4); } + /** + * Property with the actions that are going to be used by the + * institution-header component + */ manageInstMenuCtrl.getActionButtons = { goBack: () => window.history.back(), showImageCover: () => true }; + /** + * For each profile in which the user is admin, + * a menu option is generated to be used in the + * switch institution menu, on the white-toolbar component + */ manageInstMenuCtrl._loadSwitchInstOptions = () => { manageInstMenuCtrl.switchInstOptions = manageInstMenuCtrl._getProfilesAdmin() .map(prof => { @@ -48,16 +64,28 @@ }); }; + /** + * Returns the corresponding icon button depending + * on the given institution key if it is the user current institution + * @param {string} instKey - institution key + */ manageInstMenuCtrl._getIcon = (instKey) => { const isInstSelected = manageInstMenuCtrl.user.current_institution.key === instKey; return isInstSelected ? "radio_button_checked" : "radio_button_unchecked"; }; + /** + * Changes the user current institution to the given one + * than reloads the controller institution + */ manageInstMenuCtrl._switchInstitution = institution => { manageInstMenuCtrl.user.changeInstitution(institution); manageInstMenuCtrl._loadInstitution(); }; + /** + * Returns all the user instituton profiles in which she is admin + */ manageInstMenuCtrl._getProfilesAdmin = () => { return manageInstMenuCtrl.user.institution_profiles .filter(prof => manageInstMenuCtrl.user.isAdmin(prof.institution_key)); From 3beac9380b29f41deb3b5ce8477712abd728dd8b Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 28 Feb 2019 13:10:56 -0300 Subject: [PATCH 411/606] renamed institution menu state name --- frontend/app.js | 4 ++-- frontend/institution/institutionHeader.component.js | 2 +- .../institution/manageInstMenu/manageInstMenuController.js | 5 +---- frontend/sideMenu/factories/homeItems.factory.js | 2 +- frontend/utils/statesConstants.js | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index afb9dff3e..63d507caa 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -240,7 +240,7 @@ } } }) - .state(STATES.MANAGE_INST_MENU, { + .state(STATES.MANAGE_INST_MENU_MOB, { url: "/menu", views: { content_manage_institution: { @@ -541,7 +541,7 @@ const permitted_routes = [ STATES.CREATE_EVENT, STATES.INST_DESCRIPTION, - STATES.MANAGE_INST_MENU + STATES.MANAGE_INST_MENU_MOB ]; $transitions.onStart({ diff --git a/frontend/institution/institutionHeader.component.js b/frontend/institution/institutionHeader.component.js index 9d9818e16..07cf758ec 100644 --- a/frontend/institution/institutionHeader.component.js +++ b/frontend/institution/institutionHeader.component.js @@ -48,7 +48,7 @@ switch($state.current.name) { case STATES.INST_TIMELINE: - case STATES.MANAGE_INST_MENU: return limitedInstName; + case STATES.MANAGE_INST_MENU_MOB: return limitedInstName; case STATES.INST_REGISTRATION_DATA: return "Dados cadastrais"; case STATES.INST_LINKS: return "Vínculos Institucionais"; case STATES.INST_MEMBERS: return "Membros"; diff --git a/frontend/institution/manageInstMenu/manageInstMenuController.js b/frontend/institution/manageInstMenu/manageInstMenuController.js index 533b8249e..5b6bf41cf 100644 --- a/frontend/institution/manageInstMenu/manageInstMenuController.js +++ b/frontend/institution/manageInstMenu/manageInstMenuController.js @@ -24,10 +24,7 @@ * than it loads the menu options */ manageInstMenuCtrl._loadInstitution = () => { - const currentProfile = manageInstMenuCtrl._getProfilesAdmin() - .find(prof => prof.institution_key === manageInstMenuCtrl.user.current_institution.key); - - manageInstMenuCtrl.institution = currentProfile.institution; + manageInstMenuCtrl.institution = manageInstMenuCtrl.user.current_institution; manageInstMenuCtrl._loadMenuOptions(); }; diff --git a/frontend/sideMenu/factories/homeItems.factory.js b/frontend/sideMenu/factories/homeItems.factory.js index 6f11e5c1c..08c618ab7 100644 --- a/frontend/sideMenu/factories/homeItems.factory.js +++ b/frontend/sideMenu/factories/homeItems.factory.js @@ -64,7 +64,7 @@ topDivider: true, onClick: () => { const state = Utils.selectFieldBasedOnScreenSize( - STATES.MANAGE_INST_EDIT, STATES.MANAGE_INST_MENU, SCREEN_SIZES.SMARTPHONE + STATES.MANAGE_INST_EDIT, STATES.MANAGE_INST_MENU_MOB, SCREEN_SIZES.SMARTPHONE ); $state.go(state, {institutionKey: getInstitutionKey()}); }, diff --git a/frontend/utils/statesConstants.js b/frontend/utils/statesConstants.js index 3ce04bf06..bb4725d61 100644 --- a/frontend/utils/statesConstants.js +++ b/frontend/utils/statesConstants.js @@ -24,7 +24,7 @@ INST_LINKS: "app.institution.institutional_links", POST: "app.post", MANAGE_INST: "app.manage_institution", - MANAGE_INST_MENU: "app.manage_institution.menu", + MANAGE_INST_MENU_MOB: "app.manage_institution.menu", MANAGE_INST_MEMBERS: "app.manage_institution.members", MANAGE_INST_EDIT: "app.manage_institution.edit_info", MANAGE_INST_INVITE_INST: "app.manage_institution.invite_inst", From c39a176d7d3044e8d63c72ec5577ef7bffb6faa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 28 Feb 2019 13:17:08 -0300 Subject: [PATCH 412/606] Fix css class in icon button --- frontend/utils/iconButton/iconButton.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/utils/iconButton/iconButton.html b/frontend/utils/iconButton/iconButton.html index 6e2255f58..70372d96d 100644 --- a/frontend/utils/iconButton/iconButton.html +++ b/frontend/utils/iconButton/iconButton.html @@ -1,4 +1,4 @@ - + {{ iconButtonCtrl.icon }} From 7ea0e414c1035a88f372491158bd0e217aff7a03 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 28 Feb 2019 13:19:06 -0300 Subject: [PATCH 413/606] added hide-scrollbar-mobile to the manage institution menu page --- .../institution/manageInstMenu/manage_institution_menu.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/institution/manageInstMenu/manage_institution_menu.html b/frontend/institution/manageInstMenu/manage_institution_menu.html index c0a425b04..962ebf1a6 100644 --- a/frontend/institution/manageInstMenu/manage_institution_menu.html +++ b/frontend/institution/manageInstMenu/manage_institution_menu.html @@ -6,7 +6,7 @@ class="manage-inst-menu__toolbar"> -
    + {{option.icon}} {{option.description}} -
    \ No newline at end of file + \ No newline at end of file From f6d27397416f164ce12c60d37bf91621aa80d1a4 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 28 Feb 2019 13:42:14 -0300 Subject: [PATCH 414/606] fixed send invites form button --- frontend/institution/managementMembersController.js | 2 +- frontend/institution/management_members_mobile.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/institution/managementMembersController.js b/frontend/institution/managementMembersController.js index 32d72a8a4..328a0da80 100644 --- a/frontend/institution/managementMembersController.js +++ b/frontend/institution/managementMembersController.js @@ -108,7 +108,7 @@ manageMemberCtrl.getMembersProfileBtn = (event, member) => { return { - icon: 'info', + icon: 'more_vert', iconColor: '#9E9E9E', action: () => manageMemberCtrl.showUserProfile(member.key, event) }; diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index bf63245e0..177dbdd48 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -15,14 +15,14 @@

    Convidar Membros

    para fazer parte da sua instituição na Plataforma CIS.

    Endereço de e-mail

    -
    +
    - Enviar From edf8624767944a7161c06ed62e368f35087fa5fd Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 28 Feb 2019 15:17:58 -0300 Subject: [PATCH 415/606] create a state for the manage inst liks mobile --- frontend/app.js | 12 +++- frontend/index.html | 1 + .../management_institution_mobile.css | 64 +++++++++++++++++++ .../management_institution_mobile.html | 54 ++++++++++++++++ .../factories/manageInstItems.factory.js | 11 +++- frontend/utils/statesConstants.js | 1 + 6 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 frontend/institution/management_institution_mobile.css create mode 100644 frontend/institution/management_institution_mobile.html diff --git a/frontend/app.js b/frontend/app.js index 9ec4df090..6ae76fa67 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -253,6 +253,15 @@ } } }) + .state(STATES.MANAGE_INST_LINKS, { + url: "/links", + views: { + content_manage_institution: { + templateUrl: "app/institution/management_institution_mobile.html", + controller: "InviteInstHierarchieController as inviteInstHierCtrl" + } + } + }) .state(STATES.EVENT_DETAILS, { url: "/event/:eventKey/details", views: { @@ -532,7 +541,8 @@ app.run(function mobileInterceptor($transitions, $state, STATES, SCREEN_SIZES) { const permitted_routes = [ STATES.CREATE_EVENT, - STATES.INST_DESCRIPTION + STATES.INST_DESCRIPTION, + STATES.MANAGE_INST_LINKS ]; $transitions.onStart({ diff --git a/frontend/index.html b/frontend/index.html index 8a2d498bd..226c3e56e 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -43,6 +43,7 @@ + diff --git a/frontend/institution/management_institution_mobile.css b/frontend/institution/management_institution_mobile.css new file mode 100644 index 000000000..c6ce7d112 --- /dev/null +++ b/frontend/institution/management_institution_mobile.css @@ -0,0 +1,64 @@ +.manage-institution { + display: grid; + padding: 1em 0; + margin-top: 25%; +} + +.manage-institution__toolbar { + position: fixed; + z-index: 3; + width: 100%; +} + +.manage-institution__toolbar__title { + color: #737474; + text-transform: uppercase; + white-space: nowrap; +} + +.manage-institution__cards { + grid-row-start: 2; + display: grid; + grid-row-gap: 1em; +} + +.manage-institution__card__content { + display: grid; + grid-row-gap: 1em; +} + +/* Send invites section */ +.manage-institution__send__invites > h3, +.manage-institution__send__invites > p { + margin: 0; +} + +.manage-institution__send__invites > .description { + font-size: 0.9em; + color: grey; +} + +.manage-institution__send__invites > .subtitle { + font-size: 0.8em; + font-weight: 500; +} + +.manage-institution__send__invites md-input-container { + padding-right: 0; + margin: 0; + color: #9E9E9E; +} + +.manage-institution__btn { + width: min-content; + justify-self: end; + background-color: #009688; + color: white; + margin-right: 0; +} + +.manage-institution__list { + display: grid; + grid-row-gap: 0.5em; + max-height: 18em; +} \ No newline at end of file diff --git a/frontend/institution/management_institution_mobile.html b/frontend/institution/management_institution_mobile.html new file mode 100644 index 000000000..ba1076335 --- /dev/null +++ b/frontend/institution/management_institution_mobile.html @@ -0,0 +1,54 @@ + + + + +
    + +
    +
    +     + + +
    + +
    +     + + +
    + + + + +
    +     + + +
    + + + + +
    +     +
    +     \ No newline at end of file diff --git a/frontend/sideMenu/factories/manageInstItems.factory.js b/frontend/sideMenu/factories/manageInstItems.factory.js index 39704a451..312b1f89a 100644 --- a/frontend/sideMenu/factories/manageInstItems.factory.js +++ b/frontend/sideMenu/factories/manageInstItems.factory.js @@ -3,7 +3,7 @@ (function () { angular .module('app') - .factory('ManageInstItemsFactory', function ($state, STATES, $mdDialog) { + .factory('ManageInstItemsFactory', function ($state, STATES, $mdDialog, SCREEN_SIZES) { const factory = {}; const removeInstitution = (event, institution) => { @@ -36,7 +36,14 @@ icon: 'account_balance', description: 'Vínculos Institucionais', stateName: 'MANAGE_INST_INVITE_INST', - onClick: () => $state.go(STATES.MANAGE_INST_INVITE_INST, {institutionKey}) + onClick: () => { + const state = Utils.selectFieldBasedOnScreenSize( + STATES.MANAGE_INST_INVITE_INST, + STATES.MANAGE_INST_LINKS, + SCREEN_SIZES.SMARTPHONES + ); + $state.go(state, {institutionKey}); + } }, { icon: 'delete', diff --git a/frontend/utils/statesConstants.js b/frontend/utils/statesConstants.js index 5c74d2543..3c4207df4 100644 --- a/frontend/utils/statesConstants.js +++ b/frontend/utils/statesConstants.js @@ -26,6 +26,7 @@ MANAGE_INST: "app.manage_institution", MANAGE_INST_MEMBERS: "app.manage_institution.members", MANAGE_INST_EDIT: "app.manage_institution.edit_info", + MANAGE_INST_LINKS: "app.manage_institution.links", MANAGE_INST_INVITE_INST: "app.manage_institution.invite_inst", EVENT_DETAILS: "app.user.event", NEW_INVITE: "new_invite", From e3fc2c72a9a0d59f7c843a8516d24e831334cf6e Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 28 Feb 2019 16:31:11 -0300 Subject: [PATCH 416/606] set parent institution content card --- .../management_institution_mobile.html | 14 +++++++----- .../invites/inviteInstHierarchieController.js | 22 +++++++++++++++++-- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/frontend/institution/management_institution_mobile.html b/frontend/institution/management_institution_mobile.html index ba1076335..5f8d05375 100644 --- a/frontend/institution/management_institution_mobile.html +++ b/frontend/institution/management_institution_mobile.html @@ -14,12 +14,16 @@
    - + subtitle="inviteInstHierCtrl.getStatusMsg(inviteInstHierCtrl.linkParentStatus())" + right-icon-btns="[ + inviteInstHierCtrl.createIconBtn('more_vert', + inviteInstHierCtrl.removeLink, [inviteInstHierCtrl.institution.parent_institution, true, $event]) + ]"> +
    diff --git a/frontend/invites/inviteInstHierarchieController.js b/frontend/invites/inviteInstHierarchieController.js index 6ffc63818..cf30907e8 100644 --- a/frontend/invites/inviteInstHierarchieController.js +++ b/frontend/invites/inviteInstHierarchieController.js @@ -30,6 +30,10 @@ inviteInstHierCtrl.requested_invites = []; inviteInstHierCtrl.isLoadingSubmission = false; + inviteInstHierCtrl.$onInit = () => { + loadInstitution(); + } + inviteInstHierCtrl.toggleElement = function toggleElement(flagName) { inviteInstHierCtrl[flagName] = !inviteInstHierCtrl[flagName]; }; @@ -202,7 +206,7 @@ }; inviteInstHierCtrl.isActive = function isActive(institution) { - return institution.state === ACTIVE; + return institution && institution.state === ACTIVE; }; function loadInstitution() { @@ -354,6 +358,14 @@ return institution.parent_institution && institution.parent_institution === inviteInstHierCtrl.institution.key ? "confirmado" : "não confirmado"; }; + inviteInstHierCtrl.getStatusMsg = status => { + if(inviteInstHierCtrl.isActive(inviteInstHierCtrl.institution.parent_institution)) { + return `Status do vínculo: ${status}`; + } else { + return "Instituição ainda não cadastrada na plataforma" + } + }; + inviteInstHierCtrl.analyseRequest = function analyseRequest(event, request) { RequestDialogService .showHierarchyDialog(request, event) @@ -405,6 +417,12 @@ return Utils.limitString(string, size); }; - loadInstitution(); + inviteInstHierCtrl.createIconBtn = (icon, action, params) => { + return { + icon: icon, + iconColor: '#009688', + action: () => action(...params) + } + }; }); })(); \ No newline at end of file From 30766140ba4e9cd2b6a4092572f739e341fe8889 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Thu, 28 Feb 2019 16:44:32 -0300 Subject: [PATCH 417/606] Fixed empty poll option on mobile larger screens --- frontend/survey/survey.component.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/survey/survey.component.js b/frontend/survey/survey.component.js index 143a72eb6..37fe3caf5 100644 --- a/frontend/survey/survey.component.js +++ b/frontend/survey/survey.component.js @@ -48,8 +48,9 @@ /* This method add ids in each option and remove the options that are empty.*/ function modifyOptions(){ - let id = 0; - surveyCtrl.options.map(option => option.text ? option.id = id++ : surveyCtrl.removeOption(option)); + surveyCtrl.options = surveyCtrl.options + .map((option, index) => {option.id = index; return option;}) + .filter(option => option.text); } function formateDate(){ From 842837b547a49d96abc9e736153f2682890584a2 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Thu, 28 Feb 2019 17:01:43 -0300 Subject: [PATCH 418/606] inverting map filter order --- frontend/survey/survey.component.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/survey/survey.component.js b/frontend/survey/survey.component.js index 37fe3caf5..825b6b180 100644 --- a/frontend/survey/survey.component.js +++ b/frontend/survey/survey.component.js @@ -49,8 +49,8 @@ /* This method add ids in each option and remove the options that are empty.*/ function modifyOptions(){ surveyCtrl.options = surveyCtrl.options - .map((option, index) => {option.id = index; return option;}) - .filter(option => option.text); + .filter(option => option.text) + .map((option, index) => {option.id = index; return option;}); } function formateDate(){ From aa6516a3ab723b47f794e77d72b49662c1212881 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 28 Feb 2019 17:07:55 -0300 Subject: [PATCH 419/606] set children institution content card --- .../management_institution_mobile.html | 16 ++++++++++------ .../invites/inviteInstHierarchieController.js | 15 ++++++++------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/frontend/institution/management_institution_mobile.html b/frontend/institution/management_institution_mobile.html index 5f8d05375..8d358bcf9 100644 --- a/frontend/institution/management_institution_mobile.html +++ b/frontend/institution/management_institution_mobile.html @@ -18,7 +18,7 @@ ng-if="inviteInstHierCtrl.hasParent" icon="account_balance" title="inviteInstHierCtrl.institution.parent_institution.name" - subtitle="inviteInstHierCtrl.getStatusMsg(inviteInstHierCtrl.linkParentStatus())" + subtitle="inviteInstHierCtrl.getStatusMsg(inviteInstHierCtrl.institution.parent_institution, true)" right-icon-btns="[ inviteInstHierCtrl.createIconBtn('more_vert', inviteInstHierCtrl.removeLink, [inviteInstHierCtrl.institution.parent_institution, true, $event]) @@ -31,12 +31,16 @@
    - + subtitle="inviteInstHierCtrl.getStatusMsg(subInst, false)" + right-icon-btns="[ + inviteInstHierCtrl.createIconBtn('link', inviteInstHierCtrl.removeLink, [subInst, false, $event]), + inviteInstHierCtrl.createIconBtn('delete', inviteInstHierCtrl.removeChild, [subInst], inviteInstHierCtrl.canRemoveInst(subInst)) + ]"> +
    diff --git a/frontend/invites/inviteInstHierarchieController.js b/frontend/invites/inviteInstHierarchieController.js index cf30907e8..5aacb0634 100644 --- a/frontend/invites/inviteInstHierarchieController.js +++ b/frontend/invites/inviteInstHierarchieController.js @@ -344,8 +344,7 @@ inviteInstHierCtrl.canRemoveInst = function canRemoveInst(institution) { var hasChildrenLink = institution.parent_institution === inviteInstHierCtrl.institution.key; var removeInstPermission = inviteInstHierCtrl.user.permissions.remove_inst; - return removeInstPermission - && removeInstPermission[institution.key] && hasChildrenLink; + return removeInstPermission && removeInstPermission[institution.key] && hasChildrenLink ? true : false; }; inviteInstHierCtrl.linkParentStatus = function linkParentStatus() { @@ -358,8 +357,9 @@ return institution.parent_institution && institution.parent_institution === inviteInstHierCtrl.institution.key ? "confirmado" : "não confirmado"; }; - inviteInstHierCtrl.getStatusMsg = status => { - if(inviteInstHierCtrl.isActive(inviteInstHierCtrl.institution.parent_institution)) { + inviteInstHierCtrl.getStatusMsg = (institution, isParent) => { + const status = isParent ? inviteInstHierCtrl.linkParentStatus() : inviteInstHierCtrl.linkChildrenStatus(institution); + if(inviteInstHierCtrl.isActive(institution)) { return `Status do vínculo: ${status}`; } else { return "Instituição ainda não cadastrada na plataforma" @@ -417,12 +417,13 @@ return Utils.limitString(string, size); }; - inviteInstHierCtrl.createIconBtn = (icon, action, params) => { + inviteInstHierCtrl.createIconBtn = (icon, action, params, hideBtn) => { return { icon: icon, iconColor: '#009688', - action: () => action(...params) - } + action: () => action(...params), + showIf: () => hideBtn === undefined ? true : hideBtn + }; }; }); })(); \ No newline at end of file From 0781e0117976b50227eee4e02ea922a1203198d2 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Fri, 1 Mar 2019 08:15:04 -0300 Subject: [PATCH 420/606] undo changes of link --- frontend/event/create_event.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/event/create_event.html b/frontend/event/create_event.html index 32e0df171..58c12dbbf 100644 --- a/frontend/event/create_event.html +++ b/frontend/event/create_event.html @@ -178,7 +178,7 @@ + ng-change="createEventCtrl.changeUrlLink(usefulLink, createEventCtrl.usefulLinks)" type="url"/> From 025bdac30e7a4e68fd7f5289f5a9cbb31173357f Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Fri, 1 Mar 2019 09:20:10 -0300 Subject: [PATCH 421/606] fixing goTo in regInst component --- frontend/institution/registeredInstitution.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/registeredInstitution.component.js b/frontend/institution/registeredInstitution.component.js index 503b6e31f..fea9ed8b1 100644 --- a/frontend/institution/registeredInstitution.component.js +++ b/frontend/institution/registeredInstitution.component.js @@ -72,7 +72,7 @@ */ regInstCtrl.goToInst = () => { $state.go(STATES.INST_TIMELINE, - { institutionKey: regInstCtrl.institution.key }); + { institutionKey: regInstCtrl.institution.key || regInstCtrl.institution.id }); }; /** From 771a7da244a59767d8f09d8c236d6cc17d2ec5a1 Mon Sep 17 00:00:00 2001 From: ruanres Date: Fri, 1 Mar 2019 09:39:43 -0300 Subject: [PATCH 422/606] refact manageMembersCtrl and added js doc to some functions --- .../managementMembersController.js | 52 +++++++------------ .../management_members_mobile.html | 12 +++-- .../clickableCard/clickableCard.component.js | 4 ++ .../entityShowcase.component.js | 5 ++ 4 files changed, 36 insertions(+), 37 deletions(-) diff --git a/frontend/institution/managementMembersController.js b/frontend/institution/managementMembersController.js index 328a0da80..262092f1c 100644 --- a/frontend/institution/managementMembersController.js +++ b/frontend/institution/managementMembersController.js @@ -96,43 +96,29 @@ manageMemberCtrl.showUserProfile = function showUserProfile(userKey, ev) { ProfileService.showProfile(userKey, ev, manageMemberCtrl.institution.key); }; - - manageMemberCtrl.getMembersDeleteBtn = (event, member) => { - return { - icon: 'delete', - iconColor: '#9E9E9E', - showIf: () => !manageMemberCtrl.isAdmin(member), - action: () => manageMemberCtrl.openRemoveMemberDialog(event, member) - }; - }; - - manageMemberCtrl.getMembersProfileBtn = (event, member) => { - return { - icon: 'more_vert', - iconColor: '#9E9E9E', - action: () => manageMemberCtrl.showUserProfile(member.key, event) - }; - }; - + + /** + * Returns the default image for an user avatar + */ manageMemberCtrl.getDefaultAvatar = () => "app/images/avatar.png"; - + + /** + * Returns a message that indicates the name + * of the user who sent the given invite + */ manageMemberCtrl.getInviteSubtitle = (invite) => `Convidado por: ${invite.sender_name}`; - manageMemberCtrl.getInvitesBtn = (event, invite) => { - return { - icon: 'send', - iconColor: '#9E9E9E', - action: () => manageMemberCtrl.resendInvite(invite.key, event) - }; - } - - manageMemberCtrl.getRequestBtn = (event, request) => { + /** + * Constructs the object that will be used to create a button + * in the entity-showcase component + */ + manageMemberCtrl.getEntityShowcaseBtn = (icon, color, action, params) => { return { - icon: 'error', - iconColor: '#009688', - action: () => manageMemberCtrl.openAcceptRequestDialog(request, event) - }; - } + icon: icon, + iconColor: color, + action: () => action(...params) + } + }; manageMemberCtrl.sendUserInvite = function sendInvite(loadedEmails) { manageMemberCtrl.invite.institution_key = currentInstitutionKey; diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index 177dbdd48..ec52d105f 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -55,8 +55,8 @@

    Convidar Membros

    title="member.name" subtitle="member.email[0]" right-icon-btns="[ - manageMemberCtrl.getMembersDeleteBtn($event, member), - manageMemberCtrl.getMembersProfileBtn($event, member) + manageMemberCtrl.getEntityShowcaseBtn('delete', '#9E9E9E', manageMemberCtrl.openRemoveMemberDialog, [$event, member]), + manageMemberCtrl.getEntityShowcaseBtn('more_vert', '#9E9E9E', manageMemberCtrl.showUserProfile, [member.key, $event]) ]"> @@ -71,7 +71,9 @@

    Convidar Membros

    avatar="manageMemberCtrl.getDefaultAvatar()" title="invite.invitee" subtitle="manageMemberCtrl.getInviteSubtitle(invite)" - right-icon-btns="[manageMemberCtrl.getInvitesBtn($event, invite)]"> + right-icon-btns="[ + manageMemberCtrl.getEntityShowcaseBtn('send', '#9E9E9E', manageMemberCtrl.resendInvite, [invite.key, $event]) + ]">
    @@ -85,7 +87,9 @@

    Convidar Membros

    avatar="manageMemberCtrl.getDefaultAvatar()" title="request.sender_name" subtitle="request.institutional_email" - right-icon-btns="[manageMemberCtrl.getRequestBtn(event, request)]"> + right-icon-btns="[ + manageMemberCtrl.getEntityShowcaseBtn('error', '#009688', manageMemberCtrl.openAcceptRequestDialog, [request, $event]) + ]">
    diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js index 9d82deeae..21c49bfa5 100644 --- a/frontend/utils/clickableCard/clickableCard.component.js +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -24,6 +24,10 @@ }); }; + /** + * It opens or closes the card content depending + * on the previous value of the isOpen flag + */ clickableCardCtrl.onClick = () => { clickableCardCtrl.isOpen = !clickableCardCtrl.isOpen; } diff --git a/frontend/utils/entityShowcase/entityShowcase.component.js b/frontend/utils/entityShowcase/entityShowcase.component.js index a0bb7a2be..0cda43bdd 100644 --- a/frontend/utils/entityShowcase/entityShowcase.component.js +++ b/frontend/utils/entityShowcase/entityShowcase.component.js @@ -47,6 +47,11 @@ entityShowcaseCtrl.showIcon = () => !_.isNil(entityShowcaseCtrl.icon); + /** + * Checks if the button has the function showIf + * that will evaluate whether it should be showed or not, + * if don't the button is showed + */ entityShowcaseCtrl.showIconBtn = iconBtn => { return iconBtn.showIf ? iconBtn.showIf() : true; } From 0a5be682812a6fc155fc7a7c809e1c644ab3d9b2 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Fri, 1 Mar 2019 09:57:51 -0300 Subject: [PATCH 423/606] added test --- frontend/survey/survey.component.js | 11 ++++++---- .../test/specs/survey/surveyComponentSpec.js | 22 ++++++++++++++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/frontend/survey/survey.component.js b/frontend/survey/survey.component.js index 825b6b180..0f1fee332 100644 --- a/frontend/survey/survey.component.js +++ b/frontend/survey/survey.component.js @@ -46,12 +46,15 @@ return screen.width < 600; }; - /* This method add ids in each option and remove the options that are empty.*/ - function modifyOptions(){ + /** + * Remove empty objects in the options array and add 'id' property in all objects. + * @private + */ + surveyCtrl._processOptions = () => { surveyCtrl.options = surveyCtrl.options .filter(option => option.text) .map((option, index) => {option.id = index; return option;}); - } + }; function formateDate(){ var date = surveyCtrl.post.deadline.toISOString(); @@ -63,7 +66,7 @@ } function createSurvey(){ - modifyOptions(); + surveyCtrl._processOptions(); getTypeSurvey(); surveyCtrl.post.deadline && formateDate(); surveyCtrl.post.options = surveyCtrl.options; diff --git a/frontend/test/specs/survey/surveyComponentSpec.js b/frontend/test/specs/survey/surveyComponentSpec.js index 38efea37d..907fbfdfc 100644 --- a/frontend/test/specs/survey/surveyComponentSpec.js +++ b/frontend/test/specs/survey/surveyComponentSpec.js @@ -3,7 +3,7 @@ (describe('Test SurveyComponent', function() { beforeEach(module('app')); - var surveyCtrl, post, httpBackend, scope, deffered, mdDialog, rootScope, postService, mdToast, http, imageService; + var surveyCtrl, post, httpBackend, scope, deffered, mdDialog, rootScope, postService, mdToast, http, imageService, createCtrl; var user = { name: 'name', current_institution: {key: "institutuion_key"}, @@ -15,6 +15,17 @@ 'voters': [] }; + const unprocessed_options = + [{ + 'text': 'Option number 1', + 'number_votes': 0, + 'voters': [] }, + { + 'text': 'Option number 2', + 'number_votes': 0, + 'voters': [] + }]; + var options = [{'id' : 0, 'text': 'Option number 1', 'number_votes': 0, @@ -112,4 +123,13 @@ expect(surveyCtrl.post).toEqual({}); }); }); + + describe('_processOptions', function() { + it('should remove empty options and add "id" property in other options', () => { + unprocessed_options.push(option_empty); + surveyCtrl.options = unprocessed_options; + surveyCtrl._processOptions(); + expect(surveyCtrl.options).toEqual(options); + }); + }); })); \ No newline at end of file From dc2b28af1cf4fcb564143c11eb80d3838ea92313 Mon Sep 17 00:00:00 2001 From: JuliePessoa Date: Fri, 1 Mar 2019 10:03:04 -0300 Subject: [PATCH 424/606] removed unused --- frontend/test/specs/survey/surveyComponentSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/test/specs/survey/surveyComponentSpec.js b/frontend/test/specs/survey/surveyComponentSpec.js index 907fbfdfc..48a751818 100644 --- a/frontend/test/specs/survey/surveyComponentSpec.js +++ b/frontend/test/specs/survey/surveyComponentSpec.js @@ -3,7 +3,7 @@ (describe('Test SurveyComponent', function() { beforeEach(module('app')); - var surveyCtrl, post, httpBackend, scope, deffered, mdDialog, rootScope, postService, mdToast, http, imageService, createCtrl; + var surveyCtrl, post, httpBackend, scope, deffered, mdDialog, rootScope, postService, mdToast, http, imageService; var user = { name: 'name', current_institution: {key: "institutuion_key"}, From 622970215b07597aa384c3c0a9f73eca7c14d293 Mon Sep 17 00:00:00 2001 From: ruanres Date: Fri, 1 Mar 2019 10:09:56 -0300 Subject: [PATCH 425/606] added pendent admin to admin card --- .../managementMembersController.js | 2 +- .../management_members_mobile.html | 19 ++++++++++++++++--- .../utils/clickableCard/clickable_card.css | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/frontend/institution/managementMembersController.js b/frontend/institution/managementMembersController.js index 262092f1c..d5bca1b8e 100644 --- a/frontend/institution/managementMembersController.js +++ b/frontend/institution/managementMembersController.js @@ -117,7 +117,7 @@ icon: icon, iconColor: color, action: () => action(...params) - } + }; }; manageMemberCtrl.sendUserInvite = function sendInvite(loadedEmails) { diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index ec52d105f..7bd35b1ca 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -31,19 +31,32 @@

    Convidar Membros

    -
    + + right-icon-btns="[ + manageMemberCtrl.getEntityShowcaseBtn('more_vert', '#9E9E9E', manageMemberCtrl.showUserProfile, [manageMemberCtrl.institution.admin.key, $event]) + ]"> + + Transferir -
    +     diff --git a/frontend/utils/clickableCard/clickable_card.css b/frontend/utils/clickableCard/clickable_card.css index 3a6016d23..ac4f3fd62 100644 --- a/frontend/utils/clickableCard/clickable_card.css +++ b/frontend/utils/clickableCard/clickable_card.css @@ -19,7 +19,7 @@ } #clickable-card__icon--end { - color: #17ea17; + color: #84C45E; } .clickable-card__title { From 79d213620411527dca7483425cbcc56c4bec1cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 10:30:57 -0300 Subject: [PATCH 426/606] Create email service and URL constants --- frontend/email/EmailService.js | 17 +++++++++++++++++ frontend/index.html | 6 ++++++ frontend/utils/urlConstants.js | 10 ++++++++++ 3 files changed, 33 insertions(+) create mode 100644 frontend/email/EmailService.js create mode 100644 frontend/utils/urlConstants.js diff --git a/frontend/email/EmailService.js b/frontend/email/EmailService.js new file mode 100644 index 000000000..87ad53e95 --- /dev/null +++ b/frontend/email/EmailService.js @@ -0,0 +1,17 @@ +(function () { + 'use strict'; + + angular.module("app").service('EmailService', ["HttpService", "URL_CONSTANTS", function emailService(HttpService, URL_CONSTANTS) { + const emailService = this; + + emailService.STATE_LINK_EMAIL_API_URI = "/api/email/current-state"; + + emailService.sendStateLink = (stateLink) => { + return HttpService.post(emailService.STATE_LINK_EMAIL_API_URI, { + "data": { + "state-link": URL_CONSTANTS.FRONTEND + stateLink + } + }); + }; + }]); +})(); \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html index 4408ab934..05cf7560b 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -310,5 +310,11 @@ + + + + + + diff --git a/frontend/utils/urlConstants.js b/frontend/utils/urlConstants.js new file mode 100644 index 000000000..6f739232f --- /dev/null +++ b/frontend/utils/urlConstants.js @@ -0,0 +1,10 @@ +(function () { + 'use strict'; + + const MAIN_URL = "plataformacis.org"; + + angular.module("app").constant('URL_CONSTANTS', { + MAIN: MAIN_URL, + FRONTEND: "frontend." + MAIN_URL + }); +})(); \ No newline at end of file From e1beb200b47d4e3642315860d9014bbf223d34fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 10:32:46 -0300 Subject: [PATCH 427/606] Add state link request service --- .../StateLinkRequestService.js | 35 +++++++++++++++++++ .../stateLinkRequest/stateLinkConstants.js | 9 +++++ .../stateLinkRequestDialog.html | 9 +++++ frontend/index.html | 3 ++ 4 files changed, 56 insertions(+) create mode 100644 frontend/email/stateLinkRequest/StateLinkRequestService.js create mode 100644 frontend/email/stateLinkRequest/stateLinkConstants.js create mode 100644 frontend/email/stateLinkRequest/stateLinkRequestDialog.html diff --git a/frontend/email/stateLinkRequest/StateLinkRequestService.js b/frontend/email/stateLinkRequest/StateLinkRequestService.js new file mode 100644 index 000000000..7a167bddc --- /dev/null +++ b/frontend/email/stateLinkRequest/StateLinkRequestService.js @@ -0,0 +1,35 @@ +(function () { + 'use strict'; + + angular.module("app").service('StateLinkRequestService', ['$mdDialog', function StateLinkRequestService($mdDialog) { + const StateLinkRequestService = this; + + StateLinkRequestService.showLinkRequestDialog = (stateLink, previousState) => { + $mdDialog.show({ + templateUrl: "app/email/stateLinkRequest/stateLinkRequestDialog.html", + clickOutsideToClose:true, + locals: { + stateLink: stateLink, + previousState: previousState, + }, + controller: [ + 'EmailService', + '$state', + 'stateLink', + 'previousState', + StateLinkRequestController, + ], + controllerAs: 'ctrl' + }); + }; + + function StateLinkRequestController(EmailService, $state, stateLink, previousState) { + const ctrl = this; + + ctrl.sendStateLink = () => { + EmailService.sendStateLink(stateLink); + $state.go(previousState); + }; + } + }]); +})(); \ No newline at end of file diff --git a/frontend/email/stateLinkRequest/stateLinkConstants.js b/frontend/email/stateLinkRequest/stateLinkConstants.js new file mode 100644 index 000000000..0a0cf085b --- /dev/null +++ b/frontend/email/stateLinkRequest/stateLinkConstants.js @@ -0,0 +1,9 @@ +(function () { + 'use strict'; + + angular.module("app").constant('STATE_LINKS', { + 'CREATE_EVENT': '/events', + 'MANAGE_INSTITUTION': '/institution/INSTITUTION_KEY/edit', + 'INVITE_INSTITUTION': '/inviteInstitution' + }); +})(); \ No newline at end of file diff --git a/frontend/email/stateLinkRequest/stateLinkRequestDialog.html b/frontend/email/stateLinkRequest/stateLinkRequestDialog.html new file mode 100644 index 000000000..b87ae0cde --- /dev/null +++ b/frontend/email/stateLinkRequest/stateLinkRequestDialog.html @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html index 05cf7560b..9199dc995 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -309,10 +309,13 @@ + + + From 363594d2f2be312d27139a94aaa652c49d7b6ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 10:33:21 -0300 Subject: [PATCH 428/606] Apply stateLinkRequest service --- frontend/event/eventDialogController.js | 5 ++++- frontend/invites/inviteInstitutionController.js | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/frontend/event/eventDialogController.js b/frontend/event/eventDialogController.js index 719b14ff5..b03ba0bfa 100644 --- a/frontend/event/eventDialogController.js +++ b/frontend/event/eventDialogController.js @@ -4,7 +4,7 @@ const app = angular.module("app"); app.controller('EventDialogController', function EventDialogController(MessageService, brCidadesEstados, - ImageService, AuthService, EventService, $mdMenu, $state, $rootScope, $mdDialog, $http, STATES, SCREEN_SIZES, ObserverRecorderService) { + ImageService, AuthService, EventService, $mdMenu, $state, $rootScope, $mdDialog, $http, STATES, SCREEN_SIZES, ObserverRecorderService, StateLinkRequestService, STATE_LINKS) { var dialogCtrl = this; dialogCtrl.loading = false; @@ -513,6 +513,9 @@ } else { dialogCtrl.event = { address: address }; } + if (Utils.isMobileScreen()) { + StateLinkRequestService.showLinkRequestDialog(STATE_LINKS.CREATE_EVENT, STATES.EVENTS); + } }; }); })(); \ No newline at end of file diff --git a/frontend/invites/inviteInstitutionController.js b/frontend/invites/inviteInstitutionController.js index c4c8a7b79..eae2b41a6 100644 --- a/frontend/invites/inviteInstitutionController.js +++ b/frontend/invites/inviteInstitutionController.js @@ -4,7 +4,7 @@ app.controller("InviteInstitutionController", function InviteInstitutionController( InviteService, $state, AuthService, InstitutionService, RequestInvitationService, - STATES, $mdDialog, MessageService) { + STATES, $mdDialog, MessageService, StateLinkRequestService, STATE_LINKS) { var inviteInstCtrl = this; inviteInstCtrl.invite = {}; @@ -189,6 +189,12 @@ } } + inviteInstCtrl.$onInit = () => { + if (Utils.isMobileScreen()) { + StateLinkRequestService.showLinkRequestDialog(STATE_LINKS.INVITE_INSTITUTION, STATES.HOME); + } + }; + (function main() { loadSentInvitations(); loadSentRequests(); From d01e568fc48d7f79d5597271432353fbbef2a58e Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Fri, 1 Mar 2019 10:37:34 -0300 Subject: [PATCH 429/606] Resolving some issues --- frontend/search/search.css | 30 +++++++++++++++++++++++++++++- frontend/search/search_mobile.html | 12 ++++++------ 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/frontend/search/search.css b/frontend/search/search.css index 34dbc0182..7ba69d28c 100644 --- a/frontend/search/search.css +++ b/frontend/search/search.css @@ -55,7 +55,7 @@ .search-mobile-options-title { margin-top: 0.3em; - font-size: 1.5em; + font-size: 1.3em; margin-left: 7.5%; } @@ -89,4 +89,32 @@ #search-list-item div b { height: 2.8em; font-size: 0.75em; +} + +.registered-insts-as-search-result { + margin-bottom: 0.5em; +} + +.single-inst-as-search-result { + border-style: solid; + border-width: 0.5px 0px 0px 0.5px; + border-color: white; +} + +.empty-card-as-search-result { + margin-top: 1em; + margin-left: auto; + margin-right: auto; +} + +.single-inst-as-search-result-container { + margin-left: 0.5em; + margin-right: 0.5em; +} + +.registered-insts-as-search-result-container { + display: grid; + grid-template-columns: 49% 49%; + grid-column-gap: 0.4em; + margin-top: 1em; } \ No newline at end of file diff --git a/frontend/search/search_mobile.html b/frontend/search/search_mobile.html index b2a3f266e..cc878e0f6 100644 --- a/frontend/search/search_mobile.html +++ b/frontend/search/search_mobile.html @@ -49,19 +49,19 @@
    -
    +
    + institution="institution" user="searchCtrl.user" class="registered-insts-as-search-result">
    -
    +
    + user="searchCtrl.user" class="single-inst-as-search-result">
    -
    - • Nenhuma instituição encontrada +
    +
    \ No newline at end of file From 918332589acaa9e21e4076ed77369bb8612e48fe Mon Sep 17 00:00:00 2001 From: ruanres Date: Fri, 1 Mar 2019 10:44:39 -0300 Subject: [PATCH 430/606] fixed admin show profile btn --- frontend/institution/management_members_mobile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/management_members_mobile.html index 7bd35b1ca..5c8014b7f 100644 --- a/frontend/institution/management_members_mobile.html +++ b/frontend/institution/management_members_mobile.html @@ -37,7 +37,7 @@

    Convidar Membros

    title="manageMemberCtrl.institution.admin.name" subtitle="manageMemberCtrl.institution.admin.email[0]" right-icon-btns="[ - manageMemberCtrl.getEntityShowcaseBtn('more_vert', '#9E9E9E', manageMemberCtrl.showUserProfile, [manageMemberCtrl.institution.admin.key, $event]) + manageMemberCtrl.getEntityShowcaseBtn('more_vert', '#9E9E9E', manageMemberCtrl.showUserProfile, [manageMemberCtrl.user.current_institution.admin, $event]) ]"> Date: Fri, 1 Mar 2019 10:58:51 -0300 Subject: [PATCH 431/606] use components entity-showcase and search-field --- frontend/app.js | 2 +- .../institution/management_members_mobile.css | 21 +++++++++++++++++++ frontend/institution/removeMemberDialog.html | 15 ++++++------- .../institution/transfer_admin_dialog.html | 20 +++++++----------- .../utils/entityShowcase/entityShowcase.css | 9 +++++++- 5 files changed, 43 insertions(+), 24 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 9ec4df090..c05b84399 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -616,6 +616,6 @@ } (function main() { - initServiceWorker(); + //initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/management_members_mobile.css index 4b9079d2b..c339c3075 100644 --- a/frontend/institution/management_members_mobile.css +++ b/frontend/institution/management_members_mobile.css @@ -61,4 +61,25 @@ display: grid; grid-row-gap: 0.5em; max-height: 18em; +} + + +@media screen and (max-width: 361px) { + .remove-member-title{ + font-size: 15px; + } + + .remove-member-name-user{ + font-size: 13px; + } +} + +@media screen and (min-width: 361px) and (max-width: 460px) { + .remove-member-title{ + font-size: 16px; + } + + .remove-member-name-user{ + font-size: 14px; + } } \ No newline at end of file diff --git a/frontend/institution/removeMemberDialog.html b/frontend/institution/removeMemberDialog.html index 575537358..ed597e17f 100644 --- a/frontend/institution/removeMemberDialog.html +++ b/frontend/institution/removeMemberDialog.html @@ -1,20 +1,17 @@
    - Deseja remover este membro de sua instituição? + Deseja remover este membro de sua instituição? close
    - - -
    -

    {{ removeMemberCtrl.member.name | uppercase }}

    -

    {{ removeMemberCtrl.member.email[0]}}

    -
    -     + +
    Motivo da remoção (Opcional) diff --git a/frontend/institution/transfer_admin_dialog.html b/frontend/institution/transfer_admin_dialog.html index 46dde6143..c9c1aa8a5 100644 --- a/frontend/institution/transfer_admin_dialog.html +++ b/frontend/institution/transfer_admin_dialog.html @@ -5,20 +5,14 @@

    Transferir administração

    Cada institutição precisa ter um administrador na plataforma CIS. Escolha abaixo um novo administrador para sua instituição:

    - - - search - + - - -
    - {{ member.name }} - {{ member.email[0]}} -
    -     +

    Nenhum membro foi encontrado com esse nome ou email.

    diff --git a/frontend/utils/entityShowcase/entityShowcase.css b/frontend/utils/entityShowcase/entityShowcase.css index bcdf08127..26ea6cdc1 100644 --- a/frontend/utils/entityShowcase/entityShowcase.css +++ b/frontend/utils/entityShowcase/entityShowcase.css @@ -43,4 +43,11 @@ .entity-showcase__right-icon-buttons { grid-area: right-icon-buttons; -} \ No newline at end of file +} + +@media screen and (max-width: 320px) { + .small-avatar .entity-showcase__avatar{ + height: 2.5em; + width: 2.5em; + } +} From 314cb9a7838d3b3389fd2ee5b2a2c67c2a554cec Mon Sep 17 00:00:00 2001 From: ruanres Date: Fri, 1 Mar 2019 11:04:36 -0300 Subject: [PATCH 432/606] moved manage_members_mobile files to manageMembers directory --- frontend/app.js | 2 +- frontend/index.html | 2 +- .../{ => manageMembers}/management_members_mobile.css | 0 .../{ => manageMembers}/management_members_mobile.html | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename frontend/institution/{ => manageMembers}/management_members_mobile.css (100%) rename frontend/institution/{ => manageMembers}/management_members_mobile.html (100%) diff --git a/frontend/app.js b/frontend/app.js index c632feafa..c588aa15e 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -255,7 +255,7 @@ content_manage_institution: { templateUrl: Utils.selectFieldBasedOnScreenSize( "app/institution/manageMembers/management_members.html", - "app/institution/management_members_mobile.html", + "app/institution/manageMembers/management_members_mobile.html", SCREEN_SIZES.SMARTPHONE ), controller: "ManagementMembersController as manageMemberCtrl" diff --git a/frontend/index.html b/frontend/index.html index a0e7a750c..5c31459a4 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -42,7 +42,7 @@ - + diff --git a/frontend/institution/management_members_mobile.css b/frontend/institution/manageMembers/management_members_mobile.css similarity index 100% rename from frontend/institution/management_members_mobile.css rename to frontend/institution/manageMembers/management_members_mobile.css diff --git a/frontend/institution/management_members_mobile.html b/frontend/institution/manageMembers/management_members_mobile.html similarity index 100% rename from frontend/institution/management_members_mobile.html rename to frontend/institution/manageMembers/management_members_mobile.html From ca8c651b6946b492b147a8e8adcb884b9a1e71bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 11:09:52 -0300 Subject: [PATCH 433/606] Fix Tests --- frontend/test/specs/event/eventDialogCtrlSpec.js | 1 + frontend/test/specs/invites/inviteInstitutionControllerSpec.js | 1 + 2 files changed, 2 insertions(+) diff --git a/frontend/test/specs/event/eventDialogCtrlSpec.js b/frontend/test/specs/event/eventDialogCtrlSpec.js index 72d8678af..fc09ad9df 100644 --- a/frontend/test/specs/event/eventDialogCtrlSpec.js +++ b/frontend/test/specs/event/eventDialogCtrlSpec.js @@ -73,6 +73,7 @@ controller.events = []; controller.$onInit(); httpBackend.when('GET', 'app/institution/countries.json').respond(200); + httpBackend.when('GET', 'app/email/stateLinkRequest/stateLinkRequestDialog.html').respond(200); httpBackend.flush(); })); diff --git a/frontend/test/specs/invites/inviteInstitutionControllerSpec.js b/frontend/test/specs/invites/inviteInstitutionControllerSpec.js index 9c9c2a73e..210c4c143 100644 --- a/frontend/test/specs/invites/inviteInstitutionControllerSpec.js +++ b/frontend/test/specs/invites/inviteInstitutionControllerSpec.js @@ -56,6 +56,7 @@ httpBackend.when('GET', "main/main.html").respond(200); httpBackend.when('GET', "home/home.html").respond(200); httpBackend.when('GET', "auth/login.html").respond(200); + httpBackend.when('GET', 'app/email/stateLinkRequest/stateLinkRequestDialog.html').respond(200); createCtrl = function() { return $controller('InviteInstitutionController', From a18d6047925d9e54571495d483cc743ddb2311ce Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Fri, 1 Mar 2019 11:10:21 -0300 Subject: [PATCH 434/606] adding missing button --- frontend/search/search_mobile.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/search/search_mobile.html b/frontend/search/search_mobile.html index cc878e0f6..49d469c4d 100644 --- a/frontend/search/search_mobile.html +++ b/frontend/search/search_mobile.html @@ -11,8 +11,12 @@
    -
    +
    Pesquisa avançada + + arrow_drop_down +
    From 848452ae14cf40fb697ef9ffc2b23706e56582ce Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Fri, 1 Mar 2019 11:20:16 -0300 Subject: [PATCH 435/606] Clearing the search fields when get back from the result --- frontend/search/search_mobile.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/search/search_mobile.html b/frontend/search/search_mobile.html index 49d469c4d..58086d149 100644 --- a/frontend/search/search_mobile.html +++ b/frontend/search/search_mobile.html @@ -13,8 +13,8 @@
    Pesquisa avançada - + arrow_drop_down
    From 1ee429b3ac09157c4b92ae0a894e81038ba1bd04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 1 Mar 2019 11:42:56 -0300 Subject: [PATCH 436/606] Add showLinkRequestDialog on configInstDirective --- .../institution/configInstitution/configInstDirective.js | 9 ++++++++- .../test/specs/institution/configInstDirectiveSpec.js | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/frontend/institution/configInstitution/configInstDirective.js b/frontend/institution/configInstitution/configInstDirective.js index 6938ece5c..86c6ae813 100644 --- a/frontend/institution/configInstitution/configInstDirective.js +++ b/frontend/institution/configInstitution/configInstDirective.js @@ -3,7 +3,7 @@ var app = angular.module("app"); app.controller("ConfigInstController", function ConfigInstController(AuthService, InstitutionService, CropImageService,$state, $mdDialog, $http, STATES, ImageService, $rootScope, MessageService, PdfService, $q, $window, - RequestInvitationService, brCidadesEstados, ObserverRecorderService) { + RequestInvitationService, brCidadesEstados, ObserverRecorderService, StateLinkRequestService, STATE_LINKS) { var configInstCtrl = this; var institutionKey = $state.params.institutionKey; @@ -468,8 +468,15 @@ } else { $state.go(STATES.SIGNIN); } + if (Utils.isMobileScreen()) { + StateLinkRequestService.showLinkRequestDialog(getInstEditLink(), STATES.MANAGE_INST); + } }; + function getInstEditLink () { + return STATE_LINKS.MANAGE_INSTITUTION.replace("INSTITUTION_KEY", configInstCtrl.institutionKey); + } + (function main(){ configInstCtrl.institutionKey = institutionKey; configInstCtrl.initController(); diff --git a/frontend/test/specs/institution/configInstDirectiveSpec.js b/frontend/test/specs/institution/configInstDirectiveSpec.js index d19e7467f..ade9c9196 100644 --- a/frontend/test/specs/institution/configInstDirectiveSpec.js +++ b/frontend/test/specs/institution/configInstDirectiveSpec.js @@ -93,6 +93,7 @@ describe('Test ConfigInstDirective', function() { httpBackend.when('GET', 'main/main.html').respond(200); httpBackend.when('GET', 'home/home.html').respond(200); httpBackend.when('GET', 'auth/login.html').respond(200); + httpBackend.when('GET', 'app/email/stateLinkRequest/stateLinkRequestDialog.html').respond(200); scope = $rootScope.$new(); state = $state; deferred = $q.defer(); From 5ce25cad84a31a9700be7577caaa1bf8f7141b8b Mon Sep 17 00:00:00 2001 From: MaianaBt Date: Wed, 6 Mar 2019 06:49:03 -0300 Subject: [PATCH 437/606] fix request user dialog --- frontend/index.html | 1 + .../institution/transferAdminController.js | 4 ++ .../institution/transfer_admin_dialog.html | 10 ++-- frontend/invites/new_invite.css | 4 -- frontend/invites/new_invite_page.html | 14 +++--- .../requests/requestProcessingController.js | 11 ++--- frontend/requests/request_user_dialog.css | 46 +++++++++++++++++++ frontend/requests/request_user_dialog.html | 42 +++++++---------- frontend/styles/custom.css | 4 ++ .../utils/entityShowcase/entityShowcase.css | 4 ++ 10 files changed, 92 insertions(+), 48 deletions(-) create mode 100644 frontend/requests/request_user_dialog.css diff --git a/frontend/index.html b/frontend/index.html index 5c31459a4..0500e2b87 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -73,6 +73,7 @@ + diff --git a/frontend/institution/transferAdminController.js b/frontend/institution/transferAdminController.js index 4da2d8e97..bd9e045fa 100644 --- a/frontend/institution/transferAdminController.js +++ b/frontend/institution/transferAdminController.js @@ -20,6 +20,10 @@ return false; }; + transferAdminCtrl.getClass = function getClass(member){ + return (member === transferAdminCtrl.selectedMember) ? "small-avatar": "small-avatar white-background"; + } + transferAdminCtrl.selectMember = function selectMember(member) { transferAdminCtrl.selectedMember = member; transferAdminCtrl.member = member.email[0]; diff --git a/frontend/institution/transfer_admin_dialog.html b/frontend/institution/transfer_admin_dialog.html index c9c1aa8a5..1961a9735 100644 --- a/frontend/institution/transfer_admin_dialog.html +++ b/frontend/institution/transfer_admin_dialog.html @@ -1,5 +1,5 @@ - - + +

    Transferir administração

    Cada institutição precisa ter um administrador na plataforma CIS. @@ -7,7 +7,7 @@

    Transferir administração

    - Transferir administração

     - + CANCELAR - + CONFIRMAR diff --git a/frontend/invites/new_invite.css b/frontend/invites/new_invite.css index 6c9fe887d..d0805fac8 100644 --- a/frontend/invites/new_invite.css +++ b/frontend/invites/new_invite.css @@ -10,10 +10,6 @@ margin-left: -4.3em; } -.no-margin{ - margin: 0px; -} - @media screen and (min-width: 600px) and (max-width:800px) { .new-invite-page-card { max-width: 30em; diff --git a/frontend/invites/new_invite_page.html b/frontend/invites/new_invite_page.html index 4247951ba..f83ef19be 100644 --- a/frontend/invites/new_invite_page.html +++ b/frontend/invites/new_invite_page.html @@ -46,26 +46,26 @@

    {{ newInviteCtrl.invite.suggestion_institution_name }}

    - + - + - +
    - + - + @@ -73,7 +73,7 @@

    {{ newInviteCtrl.invite.suggestion_institution_name }}

    - + Rejeitar @@ -88,7 +88,7 @@

    {{ newInviteCtrl.invite.suggestion_institution_name }}

    - +
    diff --git a/frontend/requests/requestProcessingController.js b/frontend/requests/requestProcessingController.js index fa8e6cc5d..5ef0e3fee 100644 --- a/frontend/requests/requestProcessingController.js +++ b/frontend/requests/requestProcessingController.js @@ -79,16 +79,13 @@ }; requestController.getChildrenInstName = function getChildrenInstName(size) { - const returnValue = requestController.children ? - Utils.limitString(requestController.children.name || - requestController.children.sender_name, size) : ""; - return returnValue; + return requestController.children ? + (requestController.children.name || requestController.children.sender_name) : ""; }; requestController.getChildrenInstEmail = function getChildrenInstEmail(size) { - const returnValue = requestController.children ? - Utils.limitString(requestController.children.institutional_email, size) : ""; - return returnValue; + return requestController.children ? + (requestController.children.institutional_email) : ""; }; requestController.isAnotherCountry = function isAnotherCountry() { diff --git a/frontend/requests/request_user_dialog.css b/frontend/requests/request_user_dialog.css new file mode 100644 index 000000000..ccc1f23a3 --- /dev/null +++ b/frontend/requests/request_user_dialog.css @@ -0,0 +1,46 @@ +.request-user__avatar{ + grid-area: avatar; + height: 3em; + width: 3em; + border-radius: 50%; +} + +.request-user__description-dialog{ + margin: 0; + color: #707070; +} + +.request-user__margin-user{ + margin: 0 0 8px 0; +} + +.request-user__requester-entity{ + display: grid; + grid-template-columns: max-content auto; + grid-template-rows: max-content max-content max-content; + grid-template-areas: + 'avatar title' + 'avatar subtitle' + 'avatar sub'; + grid-gap: 0 0.6rem; + padding: 0.6rem; + align-items: center; + background-color: #E0E0E0; +} + +.request-user__title { + grid-area: title; + line-height: 1rem; +} + +.request-user__subtitle { + grid-area: subtitle; + font-size: 0.8em; + line-height: 1rem; +} + +.request-user__sub{ + grid-area: sub; + font-size: 0.8em; + line-height: 1rem; +} \ No newline at end of file diff --git a/frontend/requests/request_user_dialog.html b/frontend/requests/request_user_dialog.html index 2aed9e4f7..a5a88e8e3 100644 --- a/frontend/requests/request_user_dialog.html +++ b/frontend/requests/request_user_dialog.html @@ -1,37 +1,29 @@ - + -

    Confirmar Vínculo

    -

    +

    Confirmar Vínculo

    +

    {{requestCtrl.isRequestUser() ? "Um usuário da plataforma" : "Uma instituição"}} solicitou vincular-se a uma das instituições que você administra. Clique em confirmar para aceitar ou rejeitar para recusar vinculo.

    -
    -
    - {{requestCtrl.parent.name}} -
    -
    - {{ requestCtrl.parent.name }} - {{ requestCtrl.parent.email }} -
    -
    + +
    -
    -
    - {{ requestCtrl.children.name }} -
    -
    - {{ requestCtrl.getChildrenInstName(25)}} - {{ requestCtrl.getChildrenInstName(60)}} - {{ requestCtrl.getChildrenInstEmail(20) }} - {{ requestCtrl.getChildrenInstEmail(50) }} - {{ requestCtrl.children.office }} -
    +
    + + {{requestCtrl.getChildrenInstName()}} + + {{requestCtrl.getChildrenInstEmail()}} + + + Cargo: {{ requestCtrl.children.office }} +
    diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index 3a72edea3..a9901f4ae 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -1131,6 +1131,10 @@ md-input-container:not(.md-input-invalid).md-input-focused .green-input, font-weight: 500; } +.zero-margin{ + margin: 0px; +} + /* Smartphones */ @media screen and (max-width: 420px) { .custom-card { diff --git a/frontend/utils/entityShowcase/entityShowcase.css b/frontend/utils/entityShowcase/entityShowcase.css index 26ea6cdc1..9ca749f58 100644 --- a/frontend/utils/entityShowcase/entityShowcase.css +++ b/frontend/utils/entityShowcase/entityShowcase.css @@ -45,6 +45,10 @@ grid-area: right-icon-buttons; } +.white-background .entity-showcase{ + background-color: white; +} + @media screen and (max-width: 320px) { .small-avatar .entity-showcase__avatar{ height: 2.5em; From 6d9fb0cfb14f46554d7ef5ed938828fdc75754d4 Mon Sep 17 00:00:00 2001 From: MaianaBt Date: Wed, 6 Mar 2019 09:18:19 -0300 Subject: [PATCH 438/606] changed button of resend invite member --- .../institution/manageMembers/managementMembersController.js | 4 ++-- frontend/invites/inviteInstitutionController.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/institution/manageMembers/managementMembersController.js b/frontend/institution/manageMembers/managementMembersController.js index d5bca1b8e..a4392aa55 100644 --- a/frontend/institution/manageMembers/managementMembersController.js +++ b/frontend/institution/manageMembers/managementMembersController.js @@ -260,9 +260,9 @@ .clickOutsideToClose(false) .title('Reenviar convite') .textContent('Você deseja reenviar o convite?') - .ariaLabel('Reenviar convite') + .ariaLabel('Reenviar') .targetEvent(event) - .ok('Reenviar convite') + .ok('Reenviar') .cancel('Cancelar'); var promise = $mdDialog.show(confirm); promise.then(function () { diff --git a/frontend/invites/inviteInstitutionController.js b/frontend/invites/inviteInstitutionController.js index c4c8a7b79..08104da14 100644 --- a/frontend/invites/inviteInstitutionController.js +++ b/frontend/invites/inviteInstitutionController.js @@ -127,9 +127,9 @@ .clickOutsideToClose(false) .title('Reenviar convite') .textContent('Você deseja reenviar o convite?') - .ariaLabel('Reenviar convite') + .ariaLabel('Reenviar') .targetEvent(event) - .ok('Reenviar convite') + .ok('Reenviar') .cancel('Cancelar'); var promise = $mdDialog.show(confirm); promise.then(function () { From 21cb547cd19cfc631522b51f2782013be2329ab6 Mon Sep 17 00:00:00 2001 From: MaianaBt Date: Wed, 6 Mar 2019 09:18:45 -0300 Subject: [PATCH 439/606] remove comment --- frontend/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app.js b/frontend/app.js index b88f986ce..c588aa15e 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -629,6 +629,6 @@ } (function main() { - //initServiceWorker(); + initServiceWorker(); })(); })(); \ No newline at end of file From d7263f12f54f828cfe9b495d5f7db8f7209521b0 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 6 Mar 2019 09:38:09 -0300 Subject: [PATCH 440/606] Creating mobile dialog --- frontend/institution/removeInstController.js | 5 +++++ frontend/institution/remove_inst_mobile.html | 16 ++++++++++++++++ .../factories/manageInstItems.factory.js | 17 +++++++++-------- 3 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 frontend/institution/remove_inst_mobile.html diff --git a/frontend/institution/removeInstController.js b/frontend/institution/removeInstController.js index adb22ba80..766f7c27c 100644 --- a/frontend/institution/removeInstController.js +++ b/frontend/institution/removeInstController.js @@ -41,5 +41,10 @@ $state.go('app.institution.timeline', { institutionKey: removeInstCtrl.institution.key}); removeInstCtrl.closeDialog(); }; + + removeInstCtrl.getTitle = () => { + return removeInstCtrl.hasOneInstitution() ? + "Ao remover essa instituição você perderá o acesso a plataforma. Deseja remover?" : "Deseja remover esta instituição permanentemente ?"; + }; }); })(); \ No newline at end of file diff --git a/frontend/institution/remove_inst_mobile.html b/frontend/institution/remove_inst_mobile.html new file mode 100644 index 000000000..c238ef674 --- /dev/null +++ b/frontend/institution/remove_inst_mobile.html @@ -0,0 +1,16 @@ + + + +
    + + + Desejo remover toda a hierarquia abaixo dessa instituição + + + Desejo manter toda a hierarquia abaixo dessa instituição + + +
    +     +     \ No newline at end of file diff --git a/frontend/sideMenu/factories/manageInstItems.factory.js b/frontend/sideMenu/factories/manageInstItems.factory.js index 39704a451..5af180b21 100644 --- a/frontend/sideMenu/factories/manageInstItems.factory.js +++ b/frontend/sideMenu/factories/manageInstItems.factory.js @@ -7,14 +7,15 @@ const factory = {}; const removeInstitution = (event, institution) => { - $mdDialog.show({ - templateUrl: 'app/institution/removeInstDialog.html', - targetEvent: event, - clickOutsideToClose:true, - locals: { institution }, - controller: "RemoveInstController", - controllerAs: 'removeInstCtrl' - }); + $mdDialog.show({ + templateUrl: Utils.selectFieldBasedOnScreenSize( + 'app/institution/removeInstDialog.html', 'app/institution/remove_inst_mobile.html', SCREEN_SIZES.SMARTPHONE), + targetEvent: event, + clickOutsideToClose:true, + locals: { institution }, + controller: "RemoveInstController", + controllerAs: 'removeInstCtrl' + }); }; factory.getItems = institution => { From a157294b9c3f9ebc24bafae5a85879100a1b5b01 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 6 Mar 2019 10:15:15 -0300 Subject: [PATCH 441/606] Final details --- frontend/institution/removeInstController.js | 2 +- .../institution/removeInstControllerSpec.js | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/frontend/institution/removeInstController.js b/frontend/institution/removeInstController.js index 766f7c27c..2e8047b6f 100644 --- a/frontend/institution/removeInstController.js +++ b/frontend/institution/removeInstController.js @@ -41,7 +41,7 @@ $state.go('app.institution.timeline', { institutionKey: removeInstCtrl.institution.key}); removeInstCtrl.closeDialog(); }; - + removeInstCtrl.getTitle = () => { return removeInstCtrl.hasOneInstitution() ? "Ao remover essa instituição você perderá o acesso a plataforma. Deseja remover?" : "Deseja remover esta instituição permanentemente ?"; diff --git a/frontend/test/specs/institution/removeInstControllerSpec.js b/frontend/test/specs/institution/removeInstControllerSpec.js index bbf3f432b..1d3d93c6c 100644 --- a/frontend/test/specs/institution/removeInstControllerSpec.js +++ b/frontend/test/specs/institution/removeInstControllerSpec.js @@ -146,4 +146,24 @@ expect(removeInstCtrl.closeDialog).toHaveBeenCalled(); }); }); + + describe('getTitle()', () => { + beforeEach(() => { + spyOn(removeInstCtrl, 'hasOneInstitution').and.callThrough(); + }); + + afterEach(() => { + expect(removeInstCtrl.hasOneInstitution).toHaveBeenCalled(); + }); + + it('should return the first option when the user has only one institution', () => { + removeInstCtrl.user.institutions = [first_institution]; + expect(removeInstCtrl.getTitle()).toEqual("Ao remover essa instituição você perderá o acesso a plataforma. Deseja remover?"); + }); + + it('should return the second option when the user has more than one institution', () => { + removeInstCtrl.user.institutions = [first_institution, sec_institution]; + expect(removeInstCtrl.getTitle()).toEqual("Deseja remover esta instituição permanentemente ?"); + }); + }); })); \ No newline at end of file From 039f98f02d546f22a9578dd247c68baf30afefb9 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 6 Mar 2019 10:49:12 -0300 Subject: [PATCH 442/606] Adding small avatar --- frontend/institution/remove_inst_mobile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/remove_inst_mobile.html b/frontend/institution/remove_inst_mobile.html index c238ef674..7d38f422e 100644 --- a/frontend/institution/remove_inst_mobile.html +++ b/frontend/institution/remove_inst_mobile.html @@ -1,7 +1,7 @@ + avatar="removeInstCtrl.institution.photo_url" class="small-avatar">
    From 32dd200c731c5d50ec475c6b35f97f640054b863 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 6 Mar 2019 11:02:21 -0300 Subject: [PATCH 443/606] added jsDoc to components --- .../clickableCard/clickableCard.component.js | 17 +++++++++++++++-- .../utils/searchField/searchField.component.js | 15 +++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js index 21c49bfa5..f50f4beba 100644 --- a/frontend/utils/clickableCard/clickableCard.component.js +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -1,6 +1,19 @@ -"use strict"; - (function () { + "use strict"; + + /** + * Component used to render a card that opens or closes when clicked. + * It receives an icon and title to be showed at the card header, + * and the flag isOpen, that changes the initial state of the card + * to open or closed, its default value is 'false'. Implicitly, + * it also receives any template that will be rendered inside the card. + * + * @class clickableCard + * @example + * + * + * + */ angular .module('app') .component("clickableCard", { diff --git a/frontend/utils/searchField/searchField.component.js b/frontend/utils/searchField/searchField.component.js index 4b27b811d..a7641cbce 100644 --- a/frontend/utils/searchField/searchField.component.js +++ b/frontend/utils/searchField/searchField.component.js @@ -1,6 +1,17 @@ -"use strict"; - (function() { + "use strict"; + + /** + * Component used do render an input search field. + * It may receive a placeholder, but it has the default value 'Pesquisar'. + * It also receives a keyword, that is the variable that will store the user input. + * The given variable may than be user as a filter parameter in some ng-repeat directive. + * + * @class searchField + * @example + * + *
    {{item}}
    + */ angular .module('app') .component('searchField', { From 8535a87c008d7f8646118bce1b4152369f16e1f7 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 6 Mar 2019 11:03:18 -0300 Subject: [PATCH 444/606] Solving issues --- frontend/institution/removeInstController.js | 3 +++ frontend/institution/remove_inst_mobile.html | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/institution/removeInstController.js b/frontend/institution/removeInstController.js index 2e8047b6f..2d33ff7ec 100644 --- a/frontend/institution/removeInstController.js +++ b/frontend/institution/removeInstController.js @@ -42,6 +42,9 @@ removeInstCtrl.closeDialog(); }; + /** + * Select the title according to how many institutions the user is member. + */ removeInstCtrl.getTitle = () => { return removeInstCtrl.hasOneInstitution() ? "Ao remover essa instituição você perderá o acesso a plataforma. Deseja remover?" : "Deseja remover esta instituição permanentemente ?"; diff --git a/frontend/institution/remove_inst_mobile.html b/frontend/institution/remove_inst_mobile.html index 7d38f422e..ec84a78fe 100644 --- a/frontend/institution/remove_inst_mobile.html +++ b/frontend/institution/remove_inst_mobile.html @@ -2,13 +2,14 @@ + Quanto a toda a hierarquia abaixo dessa institutição, desejo:
    - Desejo remover toda a hierarquia abaixo dessa instituição + Remover - Desejo manter toda a hierarquia abaixo dessa instituição + Manter
    From 5904e16d8e004cb303e04c44a49379b7c3d52639 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 6 Mar 2019 11:17:18 -0300 Subject: [PATCH 445/606] adding missing verification --- frontend/institution/remove_inst_mobile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/remove_inst_mobile.html b/frontend/institution/remove_inst_mobile.html index ec84a78fe..d577a10b5 100644 --- a/frontend/institution/remove_inst_mobile.html +++ b/frontend/institution/remove_inst_mobile.html @@ -2,7 +2,7 @@ - Quanto a toda a hierarquia abaixo dessa institutição, desejo: + Quanto a toda a hierarquia abaixo dessa institutição, desejo:
    From a9b17c6ce57849cad6c95c80abea4f8c696f33f3 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 6 Mar 2019 12:18:02 -0300 Subject: [PATCH 446/606] moved manage institution files to manageInstitution directory --- frontend/app.js | 6 +++--- frontend/index.html | 4 ++-- .../{ => manageInstitution}/management_institution.css | 0 .../management_institution_mobile.css | 0 .../management_institution_mobile.html | 0 .../management_institution_page.html | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename frontend/institution/{ => manageInstitution}/management_institution.css (100%) rename frontend/institution/{ => manageInstitution}/management_institution_mobile.css (100%) rename frontend/institution/{ => manageInstitution}/management_institution_mobile.html (100%) rename frontend/institution/{ => manageInstitution}/management_institution_page.html (100%) diff --git a/frontend/app.js b/frontend/app.js index b1bd006f6..6378a0eae 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -235,7 +235,7 @@ url: "/institution/:institutionKey", views: { content: { - templateUrl: "app/institution/management_institution_page.html", + templateUrl: "app/institution/manageInstitution/management_institution_page.html", controller: "InstitutionController as institutionCtrl" } } @@ -266,7 +266,7 @@ url: "/links", views: { content_manage_institution: { - templateUrl: "app/institution/management_institution_mobile.html", + templateUrl: "app/institution/manageInstitution/management_institution_mobile.html", controller: "InviteInstHierarchieController as inviteInstHierCtrl" } } @@ -639,6 +639,6 @@ } (function main() { - initServiceWorker(); + // initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html index 43b0ddad6..3f629d1f4 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -41,8 +41,8 @@ - - + + diff --git a/frontend/institution/management_institution.css b/frontend/institution/manageInstitution/management_institution.css similarity index 100% rename from frontend/institution/management_institution.css rename to frontend/institution/manageInstitution/management_institution.css diff --git a/frontend/institution/management_institution_mobile.css b/frontend/institution/manageInstitution/management_institution_mobile.css similarity index 100% rename from frontend/institution/management_institution_mobile.css rename to frontend/institution/manageInstitution/management_institution_mobile.css diff --git a/frontend/institution/management_institution_mobile.html b/frontend/institution/manageInstitution/management_institution_mobile.html similarity index 100% rename from frontend/institution/management_institution_mobile.html rename to frontend/institution/manageInstitution/management_institution_mobile.html diff --git a/frontend/institution/management_institution_page.html b/frontend/institution/manageInstitution/management_institution_page.html similarity index 100% rename from frontend/institution/management_institution_page.html rename to frontend/institution/manageInstitution/management_institution_page.html From 2e9a78ca87310c9d90276db0aca3335535a8ed40 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 6 Mar 2019 14:19:50 -0300 Subject: [PATCH 447/606] started to implement the pending requests card --- .../management_institution_mobile.css | 1 + .../management_institution_mobile.html | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/frontend/institution/manageInstitution/management_institution_mobile.css b/frontend/institution/manageInstitution/management_institution_mobile.css index c6ce7d112..3d90c4aac 100644 --- a/frontend/institution/manageInstitution/management_institution_mobile.css +++ b/frontend/institution/manageInstitution/management_institution_mobile.css @@ -14,6 +14,7 @@ color: #737474; text-transform: uppercase; white-space: nowrap; + font-size: 0.9em; } .manage-institution__cards { diff --git a/frontend/institution/manageInstitution/management_institution_mobile.html b/frontend/institution/manageInstitution/management_institution_mobile.html index 8d358bcf9..3914f36cd 100644 --- a/frontend/institution/manageInstitution/management_institution_mobile.html +++ b/frontend/institution/manageInstitution/management_institution_mobile.html @@ -49,12 +49,14 @@
    - +
    From a63a8249dae26b7066c73fde31174216e7cac6dd Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 6 Mar 2019 15:22:09 -0300 Subject: [PATCH 448/606] create filterEventsByInstitution component --- frontend/event/events_mobile.html | 4 +++- .../filterEventByInstitution.component.js | 18 ++++++++++++++++++ .../event/filter_events_by_institution.html | 1 + frontend/index.html | 1 + 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 frontend/event/filterEventByInstitution.component.js create mode 100644 frontend/event/filter_events_by_institution.html diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index 349519ec8..58a135bd4 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -59,4 +59,6 @@ add - \ No newline at end of file + + + \ No newline at end of file diff --git a/frontend/event/filterEventByInstitution.component.js b/frontend/event/filterEventByInstitution.component.js new file mode 100644 index 000000000..7e2822153 --- /dev/null +++ b/frontend/event/filterEventByInstitution.component.js @@ -0,0 +1,18 @@ +(function() { + 'use strict'; + + const app = angular.module('app'); + + app.controller('FilterEventsByInstitutionController', function() { + const filterCtrl = this; + }) + + app.component("filterEventsByInstitution", { + templateUrl: 'app/event/filter_events_by_institution.html', + controller: 'FilterEventsByInstitutionController', + controllerAs: 'filterCtrl', + bindings: { + filterList: '<' + } + }); +})(); \ No newline at end of file diff --git a/frontend/event/filter_events_by_institution.html b/frontend/event/filter_events_by_institution.html new file mode 100644 index 000000000..f293d0653 --- /dev/null +++ b/frontend/event/filter_events_by_institution.html @@ -0,0 +1 @@ +

    Filtrar por institutição

    \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html index bc0d3d26e..ab41507ba 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -228,6 +228,7 @@ + From e0e3bbac835a258759dc20ca82e766dd2452bc5e Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 6 Mar 2019 15:44:19 -0300 Subject: [PATCH 449/606] Refactor css files --- .../institution/create_inst_form_mobile.css | 35 ++++--------------- .../institution/create_inst_form_mobile.html | 4 +-- frontend/institution/forms/address_form.html | 2 +- frontend/institution/forms/forms.css | 21 +++++++++++ .../institution/forms/institution_form.html | 2 +- .../institution/forms/last_info_form.html | 2 +- 6 files changed, 32 insertions(+), 34 deletions(-) diff --git a/frontend/institution/create_inst_form_mobile.css b/frontend/institution/create_inst_form_mobile.css index d384f7854..dd5af2582 100644 --- a/frontend/institution/create_inst_form_mobile.css +++ b/frontend/institution/create_inst_form_mobile.css @@ -9,7 +9,7 @@ md-content.grid-fill-screen { justify-items: center; } -#create-inst-form-steps { +#form-steps { position: fixed; top: 0; width: 100%; @@ -24,7 +24,7 @@ md-content.grid-fill-screen { box-shadow: 0px 2px 4px #00000022; } -#create-inst-form-steps > span { +#form-steps > span { display: grid; align-content: center; width: 2em; @@ -32,13 +32,13 @@ md-content.grid-fill-screen { border-radius: 50%; } -#create-inst-form-steps > span > p { +#form-steps > span > p { color: white; position: relative; text-align: center; } -#create-inst-form-steps > hr { +#form-steps > hr { align-self: center; margin-left: -1em; margin-right: -1em; @@ -57,7 +57,6 @@ md-content.grid-fill-screen { padding: 0.5em; margin-bottom: 2em; margin-top: 1em; - /* height: 100%; */ } #create-inst-card { @@ -89,33 +88,11 @@ md-content.grid-fill-screen { } #create-inst-card-content > #back-button { - /* position: relative; */ margin-bottom: -4.5em; } -#create-inst-card-content > #form-switch { - width: 100%; -} - -#form-switch md-input-container { - margin: 0.2em 0 0.2em 0; -} - -#form-switch md-input-container.md-input-focused input { - border-color: #009688; -} - -#form-switch .md-select-icon { - color: #8cbf4d; -} - -#form-switch md-input-container .md-errors-spacer { - height: 0.2em; -} - -#form-switch md-input-container label { - color: #1f6357; - font-weight: 500; +#form-switch { + width: 100%; } #create-inst-content button.md-primary { diff --git a/frontend/institution/create_inst_form_mobile.html b/frontend/institution/create_inst_form_mobile.html index be8291ffa..1d37223f2 100644 --- a/frontend/institution/create_inst_form_mobile.html +++ b/frontend/institution/create_inst_form_mobile.html @@ -1,7 +1,7 @@
    - -
    + +

    {{ 1 }}

    {{ 2 }}

     diff --git a/frontend/institution/forms/address_form.html b/frontend/institution/forms/address_form.html index 1570c539a..7a621b3d4 100644 --- a/frontend/institution/forms/address_form.html +++ b/frontend/institution/forms/address_form.html @@ -1,4 +1,4 @@ -
    + diff --git a/frontend/institution/forms/forms.css b/frontend/institution/forms/forms.css index 6c3c71bd0..274e3e3c5 100644 --- a/frontend/institution/forms/forms.css +++ b/frontend/institution/forms/forms.css @@ -73,3 +73,24 @@ last-info-form #last-info-form { height: 100% !important; border: 0 !important; } + +.ec-form md-input-container { + margin: 0.2em 0 0.2em 0; +} + +.ec-form md-input-container.md-input-focused input { + border-color: #009688; +} + +.ec-form .md-select-icon { + color: #8cbf4d; +} + +.ec-form md-input-container .md-errors-spacer { + height: 0.2em; +} + +.ec-form md-input-container label { + color: #1f6357; + font-weight: 500; +} diff --git a/frontend/institution/forms/institution_form.html b/frontend/institution/forms/institution_form.html index 2f022d70f..e780d43b2 100644 --- a/frontend/institution/forms/institution_form.html +++ b/frontend/institution/forms/institution_form.html @@ -1,4 +1,4 @@ - +
    + From 1107e91155d4252c1873549de87614cfcb72d77f Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 6 Mar 2019 16:09:30 -0300 Subject: [PATCH 450/606] Update forms.css --- frontend/institution/forms/forms.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/forms/forms.css b/frontend/institution/forms/forms.css index 278d08c2d..5b6cc9100 100644 --- a/frontend/institution/forms/forms.css +++ b/frontend/institution/forms/forms.css @@ -50,7 +50,7 @@ address-form #address-form { institution-form #institution-form { display: grid; + grid-template-rows: auto repeat(7, 1fr); height: 100%; width: 100%; - grid-template-rows: auto repeat(7, 1fr); } From 8a12046cb993db9414364a709ecb96dc99eb3040 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 6 Mar 2019 17:24:58 -0300 Subject: [PATCH 451/606] create filter events page --- frontend/event/filterEventByInstitution.component.js | 4 ++++ frontend/event/filter_events_by_institution.html | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/frontend/event/filterEventByInstitution.component.js b/frontend/event/filterEventByInstitution.component.js index 7e2822153..502110c72 100644 --- a/frontend/event/filterEventByInstitution.component.js +++ b/frontend/event/filterEventByInstitution.component.js @@ -5,6 +5,10 @@ app.controller('FilterEventsByInstitutionController', function() { const filterCtrl = this; + + filterCtrl.$onInit = function() { + console.log(filterCtrl.filterList); + }; }) app.component("filterEventsByInstitution", { diff --git a/frontend/event/filter_events_by_institution.html b/frontend/event/filter_events_by_institution.html index f293d0653..52ef69325 100644 --- a/frontend/event/filter_events_by_institution.html +++ b/frontend/event/filter_events_by_institution.html @@ -1 +1,8 @@ -

    Filtrar por institutição

    \ No newline at end of file +

    Filtrar por institutição

    +
    + + Laboratório de Avaliação e Desenvolvimento de Biomateriais do Nordeste +
    + +CANCELAR +FILTRAR \ No newline at end of file From 97430d0c67daa271db9d5d53e8d8f99cdf1c5c87 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 6 Mar 2019 17:51:22 -0300 Subject: [PATCH 452/606] Add grid layout in filter events page --- frontend/event/events_mobile.html | 6 +++--- .../event/filter_events_by_institution.html | 20 ++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index 58a135bd4..c52a39959 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -1,6 +1,6 @@ -
    +
    @@ -51,7 +51,7 @@
    - - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/event/filter_events_by_institution.html b/frontend/event/filter_events_by_institution.html index 52ef69325..dd5c7e56b 100644 --- a/frontend/event/filter_events_by_institution.html +++ b/frontend/event/filter_events_by_institution.html @@ -1,8 +1,14 @@ -

    Filtrar por institutição

    -
    - - Laboratório de Avaliação e Desenvolvimento de Biomateriais do Nordeste -
    +
    +

    Filtrar por institutição

    +
    +
    + + Laboratório de Avaliação e Desenvolvimento de Biomateriais do Nordeste +
    +
    -CANCELAR -FILTRAR \ No newline at end of file +
    + CANCELAR + FILTRAR +
    +
    \ No newline at end of file From a11fb84ee15ec6d8c78781220b6a21a26637a808 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Wed, 6 Mar 2019 17:56:37 -0300 Subject: [PATCH 453/606] centralizing no events message on desktop --- frontend/event/event.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/event/event.css b/frontend/event/event.css index b3d29c69e..1e07b577e 100644 --- a/frontend/event/event.css +++ b/frontend/event/event.css @@ -143,6 +143,10 @@ margin: 0; } +.centralized-event-content { + text-align: center; +} + #menu-button { margin-left: auto; width: 0.8em; From a2b20f1c8a252e1f58bd335a93c09c428012cc74 Mon Sep 17 00:00:00 2001 From: MaianaBt Date: Wed, 6 Mar 2019 22:42:43 -0300 Subject: [PATCH 454/606] Added jsdoc --- frontend/institution/transferAdminController.js | 3 +++ frontend/requests/request_user_dialog.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/institution/transferAdminController.js b/frontend/institution/transferAdminController.js index bd9e045fa..72400b49a 100644 --- a/frontend/institution/transferAdminController.js +++ b/frontend/institution/transferAdminController.js @@ -20,6 +20,9 @@ return false; }; + /** Get class of element HTML that show member entity. + * The class is defined according if member is selected. + */ transferAdminCtrl.getClass = function getClass(member){ return (member === transferAdminCtrl.selectedMember) ? "small-avatar": "small-avatar white-background"; } diff --git a/frontend/requests/request_user_dialog.html b/frontend/requests/request_user_dialog.html index a5a88e8e3..e0d177176 100644 --- a/frontend/requests/request_user_dialog.html +++ b/frontend/requests/request_user_dialog.html @@ -1,6 +1,6 @@ -

    Confirmar Vínculo

    +

    Confirmar Vínculo

    {{requestCtrl.isRequestUser() ? "Um usuário da plataforma" : "Uma instituição"}} solicitou vincular-se a uma das instituições que você administra. Clique em confirmar para aceitar ou rejeitar para recusar vinculo. From 8517668cc2ba5f8cc73e615a260533f7854fe11a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Mar 2019 08:30:14 -0300 Subject: [PATCH 455/606] Add EmailService and StateLinkRequestService jsdoc --- frontend/email/EmailService.js | 7 +++++++ .../email/stateLinkRequest/StateLinkRequestService.js | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/frontend/email/EmailService.js b/frontend/email/EmailService.js index 87ad53e95..efe191285 100644 --- a/frontend/email/EmailService.js +++ b/frontend/email/EmailService.js @@ -6,6 +6,13 @@ emailService.STATE_LINK_EMAIL_API_URI = "/api/email/current-state"; + /** + * Make a post request to the backend to send a state link by email. + * It receives the state link that will be sent. + * + * @param stateLink the state link that will be sent. + * @returns The post request to the backend. + */ emailService.sendStateLink = (stateLink) => { return HttpService.post(emailService.STATE_LINK_EMAIL_API_URI, { "data": { diff --git a/frontend/email/stateLinkRequest/StateLinkRequestService.js b/frontend/email/stateLinkRequest/StateLinkRequestService.js index 7a167bddc..0e97f8682 100644 --- a/frontend/email/stateLinkRequest/StateLinkRequestService.js +++ b/frontend/email/stateLinkRequest/StateLinkRequestService.js @@ -4,6 +4,14 @@ angular.module("app").service('StateLinkRequestService', ['$mdDialog', function StateLinkRequestService($mdDialog) { const StateLinkRequestService = this; + /** + * It shows a dialog that will ask the user if it wants to receive the link of the state + * by email. It is used in pages that has big forms to be filled. + * + * @param stateLink the state link that will be sent by email. + * @param previousState the state that the user will comeback if it accepts to receive + * the email. + */ StateLinkRequestService.showLinkRequestDialog = (stateLink, previousState) => { $mdDialog.show({ templateUrl: "app/email/stateLinkRequest/stateLinkRequestDialog.html", From aa631c3e1116b807052c25e6ebf7ca3e7fa13a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Mar 2019 09:47:25 -0300 Subject: [PATCH 456/606] Add showRequestLinkDialog test on inviteInstCtrl --- .../invites/inviteInstitutionControllerSpec.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/frontend/test/specs/invites/inviteInstitutionControllerSpec.js b/frontend/test/specs/invites/inviteInstitutionControllerSpec.js index 210c4c143..bcfe692eb 100644 --- a/frontend/test/specs/invites/inviteInstitutionControllerSpec.js +++ b/frontend/test/specs/invites/inviteInstitutionControllerSpec.js @@ -3,6 +3,7 @@ (describe('Test InviteInstitutionController', function() { var inviteinstitutionCtrl, httpBackend, scope, inviteService, createCtrl, state, instService, mdDialog, requestInvitationService; + let stateLinkRequestService, states, stateLinks; var institution = { name: 'institution', @@ -39,7 +40,7 @@ beforeEach(module('app')); beforeEach(inject(function($controller, $httpBackend, $rootScope, $state, $mdDialog, - InviteService, AuthService, InstitutionService, RequestInvitationService) { + InviteService, AuthService, InstitutionService, RequestInvitationService, StateLinkRequestService, STATE_LINKS, STATES) { httpBackend = $httpBackend; scope = $rootScope.$new(); state = $state; @@ -47,6 +48,9 @@ inviteService = InviteService; instService = InstitutionService; requestInvitationService = RequestInvitationService; + stateLinkRequestService = StateLinkRequestService; + stateLinks = STATE_LINKS; + states = STATES; AuthService.login(user); @@ -211,4 +215,12 @@ }); }); }); + + describe('$onInit', function () { + it('should call showLinkRequestDialog if in mobile screen', function () { + spyOn(stateLinkRequestService, 'showLinkRequestDialog'); + inviteinstitutionCtrl.$onInit(); + expect(stateLinkRequestService.showLinkRequestDialog).toHaveBeenCalledWith(stateLinks.INVITE_INSTITUTION, states.HOME); + }); + }); })); \ No newline at end of file From ab5f35a6bb5d055460394ce4f65f80f00fa1ad8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Mar 2019 09:55:07 -0300 Subject: [PATCH 457/606] Add showLinkRequestDialog test on eventDialogCtrl --- frontend/test/specs/event/eventDialogCtrlSpec.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/frontend/test/specs/event/eventDialogCtrlSpec.js b/frontend/test/specs/event/eventDialogCtrlSpec.js index fc09ad9df..c757b4c2d 100644 --- a/frontend/test/specs/event/eventDialogCtrlSpec.js +++ b/frontend/test/specs/event/eventDialogCtrlSpec.js @@ -3,7 +3,7 @@ (describe('Test EventDialogController', function() { let controller, scope, httpBackend, rootScope, imageService, eventService, - messageService, newCtrl, state, mdDialog, states, deferred; + messageService, newCtrl, state, mdDialog, states, deferred, stateLinkRequestService, stateLinks; const splab = {name: 'Splab', key: '098745'}, @@ -48,7 +48,8 @@ beforeEach(module('app')); beforeEach(inject(function($controller, $httpBackend, AuthService, - $rootScope, ImageService, EventService, MessageService, $state, $mdDialog, STATES, $q) { + $rootScope, ImageService, EventService, MessageService, $state, $mdDialog, STATES, $q, + StateLinkRequestService, STATE_LINKS) { imageService = ImageService; scope = $rootScope.$new(); httpBackend = $httpBackend; @@ -60,6 +61,8 @@ mdDialog = $mdDialog; states = STATES; deferred = $q.defer(); + stateLinkRequestService = StateLinkRequestService; + stateLinks = STATE_LINKS; AuthService.login(user); controller = newCtrl('EventDialogController', { scope: scope, @@ -628,6 +631,11 @@ country: "Brasil" }}); }); + it('should call showLinkRequestDialog', function () { + spyOn(stateLinkRequestService, 'showLinkRequestDialog'); + controller.$onInit(); + expect(stateLinkRequestService.showLinkRequestDialog).toHaveBeenCalledWith(stateLinks.CREATE_EVENT, states.EVENTS); + }); }); }); })); \ No newline at end of file From 6d940d1229fd1193e7bf332cea5b4be9649b800a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Mar 2019 10:31:05 -0300 Subject: [PATCH 458/606] Add showLinkRequestDialog test to configInstDirectiveSpec --- .../specs/institution/configInstDirectiveSpec.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/frontend/test/specs/institution/configInstDirectiveSpec.js b/frontend/test/specs/institution/configInstDirectiveSpec.js index ade9c9196..2a04be49b 100644 --- a/frontend/test/specs/institution/configInstDirectiveSpec.js +++ b/frontend/test/specs/institution/configInstDirectiveSpec.js @@ -3,7 +3,7 @@ describe('Test ConfigInstDirective', function() { var editInstCtrl, scope, institutionService, state, deferred; var mdToast, mdDialog, http, inviteService, httpBackend, imageService; - let authService, createCtrl, pdfService, messageService, states; + let authService, createCtrl, pdfService, messageService, states, stateLinkRequestService; var address = { cep: "11111-000", @@ -84,7 +84,8 @@ describe('Test ConfigInstDirective', function() { beforeEach(module('app')); beforeEach(inject(function($controller, $httpBackend, $q, $state, $mdToast, STATES, - $rootScope, $mdDialog, $http, InstitutionService, InviteService, AuthService, PdfService, ImageService, MessageService) { + $rootScope, $mdDialog, $http, InstitutionService, InviteService, AuthService, PdfService, ImageService, MessageService, + StateLinkRequestService) { httpBackend = $httpBackend; httpBackend.expectGET('app/institution/legal_nature.json').respond(legal_nature); httpBackend.expectGET('app/institution/actuation_area.json').respond(actuation_area); @@ -94,6 +95,7 @@ describe('Test ConfigInstDirective', function() { httpBackend.when('GET', 'home/home.html').respond(200); httpBackend.when('GET', 'auth/login.html').respond(200); httpBackend.when('GET', 'app/email/stateLinkRequest/stateLinkRequestDialog.html').respond(200); + httpBackend.when('GET', '/api/institutions/inst-key').respond(institution); scope = $rootScope.$new(); state = $state; deferred = $q.defer(); @@ -107,6 +109,7 @@ describe('Test ConfigInstDirective', function() { pdfService = PdfService; http = $http; states = STATES; + stateLinkRequestService = StateLinkRequestService; authService.login(userData); state.params.institutionKey = institution.key; @@ -161,6 +164,13 @@ describe('Test ConfigInstDirective', function() { expect(state.go).toHaveBeenCalledWith(states.SIGNIN); }); + it('should call showLinkRequestDialog', function () { + spyOn(stateLinkRequestService, 'showLinkRequestDialog'); + editInstCtrl.initController(); + expect(stateLinkRequestService.showLinkRequestDialog).toHaveBeenCalled(); + httpBackend.flush(); + }); + afterEach(function() { editInstCtrl.institutionKey = institution.key; editInstCtrl.user.state = 'active'; From 46daa326d4908304cad02622d7c3416a37650b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Mar 2019 10:49:36 -0300 Subject: [PATCH 459/606] Center no-events-feedback --- frontend/event/event.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/event/event.css b/frontend/event/event.css index 8b314baa2..054664efe 100644 --- a/frontend/event/event.css +++ b/frontend/event/event.css @@ -141,6 +141,8 @@ .centralized-event-content, .event-day-properties { margin: 0; + display: flex; + justify-content: center; } #menu-button { From 2a7599aa42a0b92d32339a003ba43c98636b4882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Mar 2019 11:21:59 -0300 Subject: [PATCH 460/606] Replace URL_CONSTANTS for Config --- frontend/email/EmailService.js | 4 ++-- frontend/index.html | 2 -- frontend/utils/urlConstants.js | 10 ---------- 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 frontend/utils/urlConstants.js diff --git a/frontend/email/EmailService.js b/frontend/email/EmailService.js index efe191285..e6d677733 100644 --- a/frontend/email/EmailService.js +++ b/frontend/email/EmailService.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module("app").service('EmailService', ["HttpService", "URL_CONSTANTS", function emailService(HttpService, URL_CONSTANTS) { + angular.module("app").service('EmailService', ["HttpService", function emailService(HttpService) { const emailService = this; emailService.STATE_LINK_EMAIL_API_URI = "/api/email/current-state"; @@ -16,7 +16,7 @@ emailService.sendStateLink = (stateLink) => { return HttpService.post(emailService.STATE_LINK_EMAIL_API_URI, { "data": { - "state-link": URL_CONSTANTS.FRONTEND + stateLink + "state-link": Config.FRONTEND_URL + stateLink } }); }; diff --git a/frontend/index.html b/frontend/index.html index 8b14dc376..3458d298b 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -320,7 +320,5 @@ - - diff --git a/frontend/utils/urlConstants.js b/frontend/utils/urlConstants.js deleted file mode 100644 index 6f739232f..000000000 --- a/frontend/utils/urlConstants.js +++ /dev/null @@ -1,10 +0,0 @@ -(function () { - 'use strict'; - - const MAIN_URL = "plataformacis.org"; - - angular.module("app").constant('URL_CONSTANTS', { - MAIN: MAIN_URL, - FRONTEND: "frontend." + MAIN_URL - }); -})(); \ No newline at end of file From 9c4448e50019cb31f269b8f4d61ea0f66de37c97 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Thu, 7 Mar 2019 11:23:29 -0300 Subject: [PATCH 461/606] Calling the push-not-handler from some handlers --- .../handlers/institution_children_handler.py | 1 - .../handlers/institution_members_handler.py | 10 +++- .../handlers/institution_parent_handler.py | 6 +++ backend/handlers/post_collection_handler.py | 8 ++- backend/handlers/post_handler.py | 7 +++ .../push_notification_service.py | 51 ++++++++++++++++++- 6 files changed, 79 insertions(+), 4 deletions(-) diff --git a/backend/handlers/institution_children_handler.py b/backend/handlers/institution_children_handler.py index 8bac2386c..38df1b5eb 100644 --- a/backend/handlers/institution_children_handler.py +++ b/backend/handlers/institution_children_handler.py @@ -11,7 +11,6 @@ from models import Institution -from service_messages import send_message_notification from service_entities import enqueue_task from util import get_subject diff --git a/backend/handlers/institution_members_handler.py b/backend/handlers/institution_members_handler.py index 75c3cef72..de4bec40e 100644 --- a/backend/handlers/institution_members_handler.py +++ b/backend/handlers/institution_members_handler.py @@ -10,6 +10,7 @@ from util import get_subject from service_messages import send_message_notification from send_email_hierarchy import RemoveMemberEmailSender +from service_entities import enqueue_task from . import BaseHandler @@ -69,4 +70,11 @@ def delete(self, user, url_string): 'institution_key': institution.key.urlsafe(), 'html': 'remove_member_email.html' if member.state != 'inactive' else 'inactive_user_email.html' }) - email_sender.send_email() \ No newline at end of file + email_sender.send_email() + + + enqueue_task('send-push-notification', { + 'type': 'DELETE_MEMBER', + 'receivers': [member.key.urlsafe()], + 'entity': institution.key.urlsafe() + }) \ No newline at end of file diff --git a/backend/handlers/institution_parent_handler.py b/backend/handlers/institution_parent_handler.py index 2e2aab129..2454ca341 100644 --- a/backend/handlers/institution_parent_handler.py +++ b/backend/handlers/institution_parent_handler.py @@ -101,3 +101,9 @@ def delete(self, user, institution_parent_urlsafe, institution_children_urlsafe) entity_key=institution_children.key.urlsafe(), message=notification_message ) + + enqueue_task('send-push-notification', { + 'type': notification_type, + 'receivers': [admin.urlsafe()], + 'entity': institution_children.key.urlsafe() + }) diff --git a/backend/handlers/post_collection_handler.py b/backend/handlers/post_collection_handler.py index c8f91a2e5..b67d23b57 100644 --- a/backend/handlers/post_collection_handler.py +++ b/backend/handlers/post_collection_handler.py @@ -75,9 +75,15 @@ def create_post(post_data, user, institution): 'institution_key': post.institution.urlsafe(), 'current_institution': user.current_institution.urlsafe() } - + enqueue_task('notify-followers', params) + enqueue_task('send-push-notification', { + 'type': 'CREATE_POST', + 'receivers': [follower.urlsafe() for follower in institution.followers], + 'entity': post.key.urlsafe() + }) + if(post.shared_post): shared_post = post.shared_post.get() entity_type = 'SHARED_POST' diff --git a/backend/handlers/post_handler.py b/backend/handlers/post_handler.py index 5aac6884b..bf59e19a5 100644 --- a/backend/handlers/post_handler.py +++ b/backend/handlers/post_handler.py @@ -12,6 +12,7 @@ from models import SurveyPost from models import Like from service_messages import send_message_notification +from service_entities import enqueue_task from . import BaseHandler @@ -70,6 +71,12 @@ def delete(self, user, post_urlsafe): entity=json.dumps(post.make(self.request.host)) ) + enqueue_task('send-push-notification', { + 'type': 'DELETE_POST', + 'entity': post.key.urlsafe(), + 'receivers': [post.author.urlsafe()] + }) + @json_response @login_required def patch(self, user, post_urlsafe): diff --git a/backend/push_notification/push_notification_service.py b/backend/push_notification/push_notification_service.py index bf035b1f8..0a8af0c92 100644 --- a/backend/push_notification/push_notification_service.py +++ b/backend/push_notification/push_notification_service.py @@ -28,6 +28,10 @@ class NotificationType(Enum): invite_user = 'USER' invite_user_adm = 'USER_ADM' link = 'LINK' + delete_member = 'DELETE_MEMBER' + remove_institution_link = 'REMOVE_INSTITUTION_LINK' + create_post = 'CREATE_POST', + delete_post = 'DELETE_POST' class NotificationProperties(object): """This class has several private @@ -53,7 +57,11 @@ def __init__(self, _type, entity): NotificationType.comment: self.__get_comment_props, NotificationType.invite_user: self.__get_invite_user_props, NotificationType.invite_user_adm: self.__get_invite_user_adm_props, - NotificationType.link: self.__get_link_props + NotificationType.link: self.__get_link_props, + NotificationType.delete_member: self.__get_delete_member_props, + NotificationType.remove_institution_link: self.__get_remove_inst_link_props, + NotificationType.create_post: self.__get_create_post_props, + NotificationType.delete_post: self.__get_delete_post_props } self.entity = entity self.notification_method = types[_type] @@ -134,3 +142,44 @@ def __get_link_props(self): 'body': 'Uma instituição que você administra recebeu uma nova solicitação de vínculo', 'click_action': url } + + def __get_delete_member_props(self): + """.""" + url = '/institution/%s/home' %self.entity.key.urlsafe() + + return { + 'title': 'Remoção de vínculo', + 'body': 'Você foi removido da instituição %s' %self.entity.name, + 'click_action': url + } + + def __get_remove_inst_link_props(self): + """.""" + url = '/institution/%s/inviteInstitution' %self.entity.key.urlsafe() + + return { + 'title': 'Remoção de vínculo', + 'body': 'A instituição %s teve um de seus vínculos removidos' %self.entity.name, + 'click_action': url + } + + def __get_create_post_props(self): + """.""" + url = '/posts/%s' %self.entity.key.urlsafe() + + return { + 'title': 'Novo post criado', + 'body': '%s criou um novo post' %self.entity.author.urlsafe(), + 'click_action': url + } + + def __get_delete_post_props(self): + """.""" + url = '/' + admin_name = self.entity.institution.get().admin.get().name + + return { + 'title': 'Post deletado', + 'body': '%s deletou seu post' %admin_name, + 'click_action': url + } \ No newline at end of file From 32786097ba9fa0bd1b85c1823335ccc922fdf684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Mar 2019 11:25:41 -0300 Subject: [PATCH 462/606] Apply modification to only .centralized-event-content --- frontend/event/event.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/event/event.css b/frontend/event/event.css index 054664efe..3b4d2fb18 100644 --- a/frontend/event/event.css +++ b/frontend/event/event.css @@ -141,6 +141,9 @@ .centralized-event-content, .event-day-properties { margin: 0; +} + +.centralized-event-content { display: flex; justify-content: center; } From c938dadce9a97279352b0151be5a802edc7e78e2 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Thu, 7 Mar 2019 11:27:45 -0300 Subject: [PATCH 463/606] removing comma --- backend/push_notification/push_notification_service.py | 2 +- frontend/sw.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/push_notification/push_notification_service.py b/backend/push_notification/push_notification_service.py index 0a8af0c92..78dc9469a 100644 --- a/backend/push_notification/push_notification_service.py +++ b/backend/push_notification/push_notification_service.py @@ -30,7 +30,7 @@ class NotificationType(Enum): link = 'LINK' delete_member = 'DELETE_MEMBER' remove_institution_link = 'REMOVE_INSTITUTION_LINK' - create_post = 'CREATE_POST', + create_post = 'CREATE_POST' delete_post = 'DELETE_POST' class NotificationProperties(object): diff --git a/frontend/sw.js b/frontend/sw.js index 4bca0fe8a..0dd35bd4b 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'master'; + const CACHE_SUFIX = 'spread-push-notifications-throughout-app'; let messaging; From febe1b7c442759b725478df0ed1d021015bb5cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Mar 2019 11:58:58 -0300 Subject: [PATCH 464/606] Change ministerio photo_url to firebase image --- backend/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/admin.py b/backend/admin.py index ed235961c..f4492b833 100644 --- a/backend/admin.py +++ b/backend/admin.py @@ -330,7 +330,7 @@ def get(self): 'address': address_key, 'actuation_area': 'GOVERNMENT_AGENCIES', 'description': 'Ministério da Saúde', - 'photo_url': 'https://i1.wp.com/notta.news/wp-content/uploads/2017/08/tbg_20170713080909_62787.jpg?w=1024', + 'photo_url': 'https://firebasestorage.googleapis.com/v0/b/development-cis.appspot.com/o/images%2Fministerio_da_saude_logo-1551970633722?alt=media&token=a658e366-a3b6-4699-aa98-95dc79eff3b5', 'email': 'deciis@saude.gov.br', 'phone_number': '61 3315-2425', 'state': 'active', From 2a3ee1ed9dcac47f726b73ae2f6cf124d0c4752a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Mar 2019 12:25:40 -0300 Subject: [PATCH 465/606] Add simple share_post_dialog on mobile --- frontend/post/postDetailsDirective.js | 5 ++++- frontend/post/share_post_dialog_mobile.html | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 frontend/post/share_post_dialog_mobile.html diff --git a/frontend/post/postDetailsDirective.js b/frontend/post/postDetailsDirective.js index aae0f96bd..17a684e58 100644 --- a/frontend/post/postDetailsDirective.js +++ b/frontend/post/postDetailsDirective.js @@ -230,7 +230,10 @@ $mdDialog.show({ controller: "SharePostController", controllerAs: "sharePostCtrl", - templateUrl: 'app/post/share_post_dialog.html', + templateUrl: Utils.selectFieldBasedOnScreenSize( + 'app/post/share_post_dialog.html', + 'app/post/share_post_dialog_mobile.html' + ), parent: angular.element(document.body), targetEvent: event, clickOutsideToClose:true, diff --git a/frontend/post/share_post_dialog_mobile.html b/frontend/post/share_post_dialog_mobile.html new file mode 100644 index 000000000..1ea77fee0 --- /dev/null +++ b/frontend/post/share_post_dialog_mobile.html @@ -0,0 +1,7 @@ + + + + \ No newline at end of file From 1c06f404f12ea4d45e7b6f015ee16722381b4a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Thu, 7 Mar 2019 13:14:04 -0300 Subject: [PATCH 466/606] Fix all-day checkbox to not change when having an end date --- frontend/event/eventDialogController.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/event/eventDialogController.js b/frontend/event/eventDialogController.js index 50c8e6f51..fd4f7bab1 100644 --- a/frontend/event/eventDialogController.js +++ b/frontend/event/eventDialogController.js @@ -365,7 +365,8 @@ dialogCtrl.startHour = new Date(dialogCtrl.event.start_time); dialogCtrl.startHour.setHours(8, 0, 0); dialogCtrl.addStartHour(); - dialogCtrl.event.end_time = new Date(dialogCtrl.event.start_time); + dialogCtrl.event.end_time = _.isNil(dialogCtrl.event.end_time) ? + new Date(dialogCtrl.event.start_time) : dialogCtrl.event.end_time; dialogCtrl.endHour = new Date(dialogCtrl.event.start_time); dialogCtrl.endHour.setHours(18, 0, 0); dialogCtrl.addEndHour(); From ec22e9e500c78451557e7ab9836dae8da884912d Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 7 Mar 2019 14:06:12 -0300 Subject: [PATCH 467/606] Create filter by institution in event controller --- frontend/event/eventController.js | 29 ++++++++++++++++--- frontend/event/events_mobile.html | 6 ++-- .../filterEventByInstitution.component.js | 3 +- .../event/filter_events_by_institution.html | 13 ++++++--- 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/frontend/event/eventController.js b/frontend/event/eventController.js index 5665516d7..4dd681ee7 100644 --- a/frontend/event/eventController.js +++ b/frontend/event/eventController.js @@ -17,6 +17,8 @@ eventCtrl.selectedYear = null; eventCtrl.user = AuthService.getCurrentUser(); eventCtrl.isLoadingEvents = true; + eventCtrl.isFiltering = false; + eventCtrl.institutionsFilter = []; eventCtrl.loadMoreEvents = function loadMoreEvents() { @@ -54,7 +56,11 @@ }); } - eventCtrl.events = $filter('filter')(eventCtrl.events, eventCtrl.institutionKey); + eventCtrl.events = $filter('filter')(eventCtrl.events, eventCtrl.institutionKey) + .filter(event => { + const institution = _.find(eventCtrl.institutionsFilter, institution => institution.name === event.institution_name); + return institution && institution.enable; + }); eventCtrl.isLoadingEvents = false; eventCtrl._getEventsByDay(); }, function error() { @@ -172,8 +178,8 @@ * @private */ eventCtrl._getEventsByDay = () => { + eventCtrl.eventsByDay = []; if(eventCtrl.events.length > 0 && eventCtrl.selectedMonth) { - eventCtrl.eventsByDay = []; let eventsByDay = {}; _.forEach(eventCtrl.events, function(event) { eventCtrl._distributeEvents(event, eventsByDay); @@ -253,9 +259,9 @@ eventCtrl._actualPage = 0; eventCtrl.events = []; eventCtrl.loadMoreEvents()} }, { - title: 'Filtrar por instituição', action: () => {} + title: 'Filtrar por instituição', action: () => {eventCtrl.isFiltering = true;} } - ] + ]; return toolbarMenuGeneralOptions; }; @@ -268,6 +274,14 @@ eventCtrl.toolbarItems = eventCtrl._getToolbarMobileMenuItems(); }; + eventCtrl.closeFilter = function closeFilter() { + eventCtrl.isFiltering = false; + eventCtrl._actualPage = 0; + eventCtrl._moreEvents = true; + eventCtrl.isLoadingEvents = true; + return eventCtrl.loadMoreEvents(); + }; + eventCtrl.$onInit = () => { eventCtrl.institutionKey = $state.params.institutionKey; getCurrentInstitution(); @@ -276,6 +290,13 @@ eventCtrl._getMonths().then(() => { eventCtrl.setupToolbarFields(); }); + + eventCtrl.institutionsFilter = eventCtrl.user.follows.map(institution => { + return { + name: institution.name, + enable: true + }; + }); } else { eventCtrl.loadMoreEvents(); } diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index c52a39959..aa06375ae 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -1,6 +1,6 @@ -

    +
    @@ -51,7 +51,7 @@
    - - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/event/filterEventByInstitution.component.js b/frontend/event/filterEventByInstitution.component.js index 502110c72..123a3ccb2 100644 --- a/frontend/event/filterEventByInstitution.component.js +++ b/frontend/event/filterEventByInstitution.component.js @@ -16,7 +16,8 @@ controller: 'FilterEventsByInstitutionController', controllerAs: 'filterCtrl', bindings: { - filterList: '<' + filterList: '<', + actionButton: '<' } }); })(); \ No newline at end of file diff --git a/frontend/event/filter_events_by_institution.html b/frontend/event/filter_events_by_institution.html index dd5c7e56b..131f6a025 100644 --- a/frontend/event/filter_events_by_institution.html +++ b/frontend/event/filter_events_by_institution.html @@ -1,14 +1,19 @@

    Filtrar por institutição

    -
    - - Laboratório de Avaliação e Desenvolvimento de Biomateriais do Nordeste +
    + + {{institution.name}} +
    +
    + + Todos os eventos
    CANCELAR - FILTRAR + FILTRAR
    \ No newline at end of file From 5df8e8ff2df41df9364eeda0d0d5950abb7883cd Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Thu, 7 Mar 2019 15:52:53 -0300 Subject: [PATCH 468/606] Fixing icon and adding test --- frontend/event/event.css | 28 ++++++++++++++++--- .../test/specs/event/eventControllerSpec.js | 8 ++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/frontend/event/event.css b/frontend/event/event.css index 1e07b577e..982eac312 100644 --- a/frontend/event/event.css +++ b/frontend/event/event.css @@ -529,13 +529,21 @@ .event-canceled-tag, .event-canceled-icon { color: white; + } + .event-canceled-icon { + width: 1.5em; + height: 2em; + font-size: 2.5em; + margin-top: 0.4em; + margin-left: 0.3em; } .event-canceled-tag { margin-right: 2em; margin-left: -1em; - font-size: 0.95em; + margin-top: 1.4em; + font-size: 0.9em; } .event-canceled-subtitle { @@ -546,19 +554,31 @@ @media screen and (max-width: 400px) { .event-canceled-tag { - font-size: 0.85em; + font-size: 0.8em; } } - @media screen and (max-width: 350px) { + @media screen and (max-width: 360px) { .event-canceled-tag { - margin-right: 1em; + margin-top: 1.7em; font-size: 0.75em; } + } + + @media screen and (max-width: 330px) { + .event-canceled-tag { + margin-right: 1em; + margin-top: 2.1em; + font-size: 0.69em; + } .event-canceled-subtitle { font-size: 0.55em; } + + .event-canceled-icon { + margin-left: 0.2em; + } } @media screen and (min-height: 600px) { diff --git a/frontend/test/specs/event/eventControllerSpec.js b/frontend/test/specs/event/eventControllerSpec.js index ec8f6c0f2..8dceb6a65 100644 --- a/frontend/test/specs/event/eventControllerSpec.js +++ b/frontend/test/specs/event/eventControllerSpec.js @@ -39,6 +39,7 @@ 'start_time': startDate, 'end_time': endDate, 'institution_key': institution.key, + 'last_modified_by': 'User Test', 'key': '12345' }, other_event = { @@ -414,6 +415,13 @@ }); }); + describe('getNameOfLastModified()', () => { + it('Should return the first name of who modified the event by last', () => { + expect(event.last_modified_by).toEqual('User Test'); + expect(eventCtrl.getNameOfLastModified(event)).toEqual('User'); + }); + }); + describe('getToolbarMobileGeneralOptions()', () => { it('tests the first object', () => { spyOn(eventCtrl, 'loadMoreEvents'); From 202203175af97d1f5a46f281d4f40d650eb3234a Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 7 Mar 2019 16:05:00 -0300 Subject: [PATCH 469/606] create function to enable or desable all institution filters --- frontend/event/eventController.js | 7 ++++- frontend/event/events_mobile.html | 2 +- .../filterEventByInstitution.component.js | 26 ++++++++++++++++--- .../event/filter_events_by_institution.html | 8 +++--- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/frontend/event/eventController.js b/frontend/event/eventController.js index 4dd681ee7..3daca0977 100644 --- a/frontend/event/eventController.js +++ b/frontend/event/eventController.js @@ -274,7 +274,8 @@ eventCtrl.toolbarItems = eventCtrl._getToolbarMobileMenuItems(); }; - eventCtrl.closeFilter = function closeFilter() { + eventCtrl.confirmFilter = function confirmFilter() { + eventCtrl.events = []; eventCtrl.isFiltering = false; eventCtrl._actualPage = 0; eventCtrl._moreEvents = true; @@ -282,6 +283,10 @@ return eventCtrl.loadMoreEvents(); }; + eventCtrl.cancelFilter = function cancelFilter() { + eventCtrl.isFiltering = false; + }; + eventCtrl.$onInit = () => { eventCtrl.institutionKey = $state.params.institutionKey; getCurrentInstitution(); diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index aa06375ae..c0167ab04 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -61,4 +61,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/event/filterEventByInstitution.component.js b/frontend/event/filterEventByInstitution.component.js index 123a3ccb2..6b375ed79 100644 --- a/frontend/event/filterEventByInstitution.component.js +++ b/frontend/event/filterEventByInstitution.component.js @@ -5,11 +5,30 @@ app.controller('FilterEventsByInstitutionController', function() { const filterCtrl = this; + filterCtrl.originalList = []; + filterCtrl.enableAll = true; + + + filterCtrl.checkChange = function checkChange() { + filterCtrl.enableAll = (_.find(filterCtrl.filterList, institution => !institution.enable)) ? false : true; + }; + + filterCtrl.enableOrDisableAll = function enableOrDisableAll() { + filterCtrl.filterList.map(institution => institution.enable = filterCtrl.enableAll); + }; + + filterCtrl.cancel = function cancel() { + filterCtrl.filterList.map((institution, index) => { + institution.enable = filterCtrl.originalList[index].enable; + }); + filterCtrl.cancelAction(); + }; filterCtrl.$onInit = function() { - console.log(filterCtrl.filterList); + filterCtrl.originalList = _.cloneDeep(filterCtrl.filterList); + filterCtrl.checkChange(); }; - }) + }); app.component("filterEventsByInstitution", { templateUrl: 'app/event/filter_events_by_institution.html', @@ -17,7 +36,8 @@ controllerAs: 'filterCtrl', bindings: { filterList: '<', - actionButton: '<' + confirmAction: '<', + cancelAction: '<' } }); })(); \ No newline at end of file diff --git a/frontend/event/filter_events_by_institution.html b/frontend/event/filter_events_by_institution.html index 131f6a025..dd66b566a 100644 --- a/frontend/event/filter_events_by_institution.html +++ b/frontend/event/filter_events_by_institution.html @@ -3,17 +3,17 @@

    Filtrar por institutição

    - + {{institution.name}}
    - + Todos os eventos
    - CANCELAR - FILTRAR + CANCELAR + FILTRAR
    \ No newline at end of file From 552069bfd41eae003e53e69ff5d8754d9edafa19 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 7 Mar 2019 16:09:46 -0300 Subject: [PATCH 470/606] Remove reworked new invite page --- frontend/app.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index a617f6c02..db48f1788 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -296,9 +296,8 @@ url: "/:key/new_invite", views: { main: { - templateUrl: Utils.selectFieldBasedOnScreenSize("app/invites/new_invite_page.html", - "app/invites/new_invite_page_mobile.html"), - controller: "NewInviteController as newInviteCtrl" + templateUrl: "app/invites/new_invite_page.html", + controller: "NewInviteController as newInviteCtrl" } } }) From 358cc01690eeb09921c971046c1d25aac5932078 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 7 Mar 2019 16:51:31 -0300 Subject: [PATCH 471/606] Use new entityshowcase component --- .../institution/forms/institution_form.html | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/frontend/institution/forms/institution_form.html b/frontend/institution/forms/institution_form.html index e780d43b2..ba6ef747f 100644 --- a/frontend/institution/forms/institution_form.html +++ b/frontend/institution/forms/institution_form.html @@ -1,16 +1,17 @@ -
    - - - - {{ ctrl.institution.name }} -
    + + + Date: Thu, 7 Mar 2019 17:11:33 -0300 Subject: [PATCH 472/606] create css file to save styles --- frontend/event/events_mobile.html | 9 +++-- .../filter_events_by_institution.css | 35 +++++++++++++++++++ .../event/filter_events_by_institution.html | 17 +++++---- frontend/index.html | 1 + 4 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 frontend/event/filterEvents/filter_events_by_institution.css diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index c0167ab04..effccd323 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -1,3 +1,4 @@ +
    @@ -12,7 +13,7 @@ subtitle="eventCtrl.institution.address.city"> + text="Nenhum evento a ser exibido">
    @@ -51,6 +52,7 @@
    + @@ -61,4 +63,7 @@ - \ No newline at end of file + + diff --git a/frontend/event/filterEvents/filter_events_by_institution.css b/frontend/event/filterEvents/filter_events_by_institution.css new file mode 100644 index 000000000..f2b21c56c --- /dev/null +++ b/frontend/event/filterEvents/filter_events_by_institution.css @@ -0,0 +1,35 @@ +.filter-container { + display: grid; + grid-template-rows: 1fr min-content; + height: 100%; + max-height: 100%; +} + +.filter-items-container { + max-height: 100%; + overflow-y: scroll; +} + +.filter-items-container > h3 { + text-align: center; +} + +.filter-item { + display: grid; + grid-template-columns: 20px auto; + grid-column-gap: 10px; + padding: 0 16px; + margin: 8px 0; +} + +.filter-item > md-checkbox { + margin: 0; + text-align: center; +} + +.filter-buttons-container { + display: grid; + grid-template-columns: auto auto; + justify-content: end; + margin-bottom: 10px; +} \ No newline at end of file diff --git a/frontend/event/filter_events_by_institution.html b/frontend/event/filter_events_by_institution.html index dd66b566a..8d67d1886 100644 --- a/frontend/event/filter_events_by_institution.html +++ b/frontend/event/filter_events_by_institution.html @@ -1,18 +1,17 @@ -
    -

    Filtrar por institutição

    -
    -
    - +
    +
    +

    Filtrar por institutição

    +
    + {{institution.name}}
    -
    - +
    + Todos os eventos
    -
    +
    CANCELAR FILTRAR
    diff --git a/frontend/index.html b/frontend/index.html index ab41507ba..24bcf4c9a 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -78,6 +78,7 @@ + From 98ec1bbfb9b185b3b068d346b62c4fbbce3dda75 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 7 Mar 2019 17:16:31 -0300 Subject: [PATCH 473/606] move file to correct folder --- .../{ => filterEvents}/filterEventByInstitution.component.js | 2 +- .../{ => filterEvents}/filter_events_by_institution.html | 4 ++-- frontend/index.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename frontend/event/{ => filterEvents}/filterEventByInstitution.component.js (94%) rename frontend/event/{ => filterEvents}/filter_events_by_institution.html (83%) diff --git a/frontend/event/filterEventByInstitution.component.js b/frontend/event/filterEvents/filterEventByInstitution.component.js similarity index 94% rename from frontend/event/filterEventByInstitution.component.js rename to frontend/event/filterEvents/filterEventByInstitution.component.js index 6b375ed79..b28f935ba 100644 --- a/frontend/event/filterEventByInstitution.component.js +++ b/frontend/event/filterEvents/filterEventByInstitution.component.js @@ -31,7 +31,7 @@ }); app.component("filterEventsByInstitution", { - templateUrl: 'app/event/filter_events_by_institution.html', + templateUrl: 'app/event/filterEvents/filter_events_by_institution.html', controller: 'FilterEventsByInstitutionController', controllerAs: 'filterCtrl', bindings: { diff --git a/frontend/event/filter_events_by_institution.html b/frontend/event/filterEvents/filter_events_by_institution.html similarity index 83% rename from frontend/event/filter_events_by_institution.html rename to frontend/event/filterEvents/filter_events_by_institution.html index 8d67d1886..bbbd0ac53 100644 --- a/frontend/event/filter_events_by_institution.html +++ b/frontend/event/filterEvents/filter_events_by_institution.html @@ -2,11 +2,11 @@

    Filtrar por institutição

    - + {{institution.name}}
    - + Todos os eventos
    diff --git a/frontend/index.html b/frontend/index.html index 24bcf4c9a..62b4abe70 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -229,7 +229,7 @@ - + From 05018d77fe9a44eeae9ca5e66d0cf11a2f1136aa Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 7 Mar 2019 17:39:15 -0300 Subject: [PATCH 474/606] fix height distance on filter events page --- .../filter_events_by_institution.css | 6 ++++++ .../filter_events_by_institution.html | 16 +++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/frontend/event/filterEvents/filter_events_by_institution.css b/frontend/event/filterEvents/filter_events_by_institution.css index f2b21c56c..e737947a1 100644 --- a/frontend/event/filterEvents/filter_events_by_institution.css +++ b/frontend/event/filterEvents/filter_events_by_institution.css @@ -14,12 +14,18 @@ text-align: center; } +.filter-items-container > div { + display: grid; + grid-auto-rows: 1fr; +} + .filter-item { display: grid; grid-template-columns: 20px auto; grid-column-gap: 10px; padding: 0 16px; margin: 8px 0; + align-items: center; } .filter-item > md-checkbox { diff --git a/frontend/event/filterEvents/filter_events_by_institution.html b/frontend/event/filterEvents/filter_events_by_institution.html index bbbd0ac53..1eb0b3fef 100644 --- a/frontend/event/filterEvents/filter_events_by_institution.html +++ b/frontend/event/filterEvents/filter_events_by_institution.html @@ -1,13 +1,15 @@

    Filtrar por institutição

    -
    - - {{institution.name}} -
    -
    - - Todos os eventos +
    +
    + + {{institution.name}} +
    +
    + + Todos os eventos +
    From ab086cd614e9f27dbd629386d283764db9ffc7ca Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Thu, 7 Mar 2019 17:49:14 -0300 Subject: [PATCH 475/606] Creating components to event card and canceled header --- .../event/canceledEventHeader.component.js | 27 ++++++++++ frontend/event/canceled_event_header.html | 8 +++ frontend/event/eventCard.component.js | 31 +++++++++++ frontend/event/eventController.js | 21 +------- frontend/event/event_card.html | 23 +++++++++ frontend/event/events_mobile.html | 31 +---------- frontend/index.html | 2 + .../event/canceledEventHeaderComponentSpec.js | 29 +++++++++++ .../specs/event/eventCardComponentSpec.js | 51 +++++++++++++++++++ .../test/specs/event/eventControllerSpec.js | 20 -------- 10 files changed, 173 insertions(+), 70 deletions(-) create mode 100644 frontend/event/canceledEventHeader.component.js create mode 100644 frontend/event/canceled_event_header.html create mode 100644 frontend/event/eventCard.component.js create mode 100644 frontend/event/event_card.html create mode 100644 frontend/test/specs/event/canceledEventHeaderComponentSpec.js create mode 100644 frontend/test/specs/event/eventCardComponentSpec.js diff --git a/frontend/event/canceledEventHeader.component.js b/frontend/event/canceledEventHeader.component.js new file mode 100644 index 000000000..8ae316bc6 --- /dev/null +++ b/frontend/event/canceledEventHeader.component.js @@ -0,0 +1,27 @@ +"use strict"; + +(function() { + + function CanceledEventController() { + const canceledEventCtrl = this; + + /** + * Get the first name of who modified the event by last + */ + canceledEventCtrl.getNameOfLastModified = () => { + return _.first(canceledEventCtrl.event.last_modified_by.split(" ")); + }; + + }; + + angular + .module("app") + .component("canceledEventHeader", { + templateUrl: 'app/event/canceled_event_header.html', + controller: [CanceledEventController], + controllerAs: 'canceledEventCtrl', + bindings: { + event: '<', + } + }); +})(); \ No newline at end of file diff --git a/frontend/event/canceled_event_header.html b/frontend/event/canceled_event_header.html new file mode 100644 index 000000000..3dbb824cc --- /dev/null +++ b/frontend/event/canceled_event_header.html @@ -0,0 +1,8 @@ + + highlight_off +
    +
    ESTE EVENTO FOI CANCELADO
    +
    por {{canceledEventCtrl.getNameOfLastModified()}} • + {{canceledEventCtrl.event.last_modified_date | amUtc | amLocal | amCalendar:referenceTime:formats}}
    +
    +     \ No newline at end of file diff --git a/frontend/event/eventCard.component.js b/frontend/event/eventCard.component.js new file mode 100644 index 000000000..a7f5669c5 --- /dev/null +++ b/frontend/event/eventCard.component.js @@ -0,0 +1,31 @@ +"use strict"; + +(function() { + + function EventCardController(AuthService) { + const eventCardCtrl = this; + + eventCardCtrl.user = AuthService.getCurrentUser(); + + /** + * Get the color of institutional profile of the user + */ + eventCardCtrl.getProfileColor = () => { + const profile = _.filter(eventCardCtrl.user.institution_profiles, function(prof) { + return prof.institution_key === eventCardCtrl.event.institution_key; + }); + return _.get(_.first(profile), 'color', 'teal'); + }; + }; + + angular + .module("app") + .component("eventCard", { + templateUrl: 'app/event/event_card.html', + controller: ['AuthService', EventCardController], + controllerAs: 'eventCardCtrl', + bindings: { + event: '<', + } + }); +})(); \ No newline at end of file diff --git a/frontend/event/eventController.js b/frontend/event/eventController.js index b79daa90b..4731ea28f 100644 --- a/frontend/event/eventController.js +++ b/frontend/event/eventController.js @@ -110,17 +110,6 @@ event.state !== 'deleted' && $state.go(STATES.EVENT_DETAILS, { eventKey: event.key }); }; - /** - * Get the color of institutional profile of the user - * @param {object} event - The current event - */ - eventCtrl.getProfileColor = (event) => { - const profile = _.filter(eventCtrl.user.institution_profiles, function(prof) { - return prof.institution_key === event.institution_key; - }); - return _.get(_.first(profile), 'color', 'teal'); - }; - /** * Loads the events when the filters of month and/or year is changed */ @@ -214,15 +203,7 @@ eventCtrl.loadMoreEvents(); }); }; - - /** - * Get the first name of who modified the event by last - * @param {object} event - */ - eventCtrl.getNameOfLastModified = (event) => { - return _.first(event.last_modified_by.split(" ")); - }; - + /** * Generate the menuItems that will live in the middle of the toolbar. */ diff --git a/frontend/event/event_card.html b/frontend/event/event_card.html new file mode 100644 index 000000000..21b1bbe7e --- /dev/null +++ b/frontend/event/event_card.html @@ -0,0 +1,23 @@ + +
    + +
    + +
    +
    +
    + {{ eventCardCtrl.event.title | uppercase}} +
    +
    + {{ eventCardCtrl.event.start_time | amUtc | amLocal | amDateFormat:'HH:mm' }} + {{ eventCardCtrl.event.address.city ? ' | ' + eventCardCtrl.event.address.city : ''}} +

    + {{eventCardCtrl.event.institution_name || uppercase}} +

    +
    +
    +
    +     \ No newline at end of file diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index b677ffd33..c44c60b6d 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -27,36 +27,7 @@
    - -
    - -
    - - highlight_off -
    -
    ESTE EVENTO FOI CANCELADO
    -
    por {{eventCtrl.getNameOfLastModified(event)}} • - {{event.last_modified_date | amUtc | amLocal | amCalendar:referenceTime:formats}}
    -
    -     -
    -
    -
    - {{ event.title | uppercase}} -
    -
    - {{ event.start_time | amUtc | amLocal | amDateFormat:'HH:mm' }} - {{ event.address.city ? ' | ' + event.address.city : ''}} -

    - {{event.institution_name || uppercase}} -

    -
    -
    -
    -     +
    diff --git a/frontend/index.html b/frontend/index.html index 5c31459a4..798268192 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -233,6 +233,8 @@ + + diff --git a/frontend/test/specs/event/canceledEventHeaderComponentSpec.js b/frontend/test/specs/event/canceledEventHeaderComponentSpec.js new file mode 100644 index 000000000..16a17fb83 --- /dev/null +++ b/frontend/test/specs/event/canceledEventHeaderComponentSpec.js @@ -0,0 +1,29 @@ +"use strict"; + +(describe("CanceledEventHeaderComponent", () => { + + let componentController, rootScope, + scope, event, canceledEventCtrl; + + event = { + last_modified_by: 'User Test', + }; + + beforeEach(module('app')); + + beforeEach(inject(($componentController, $rootScope) => { + + componentController = $componentController; + rootScope = $rootScope; + scope = rootScope.$new(); + canceledEventCtrl = componentController("canceledEventHeader", scope, + {event: event}); + })); + + describe('getNameOfLastModified()', () => { + it('Should return the first name of who modified the event by last', () => { + expect(canceledEventCtrl.event.last_modified_by).toEqual('User Test'); + expect(canceledEventCtrl.getNameOfLastModified()).toEqual('User'); + }); + }); +})); \ No newline at end of file diff --git a/frontend/test/specs/event/eventCardComponentSpec.js b/frontend/test/specs/event/eventCardComponentSpec.js new file mode 100644 index 000000000..df24f8417 --- /dev/null +++ b/frontend/test/specs/event/eventCardComponentSpec.js @@ -0,0 +1,51 @@ +"use strict"; + +(describe("EventCardComponent", () => { + + let componentController, authService, rootScope, + scope, institution, user, event, eventCardCtrl; + + institution = { + key: 'inst-key', + }; + + user = { + institution_profiles: [ + { + institution_key: institution.key, + color: 'pink' + } + ] + }; + + event = { + 'institution_key': institution.key, + }; + + beforeEach(module('app')); + + beforeEach(inject(($componentController, AuthService, $rootScope) => { + + componentController = $componentController; + authService = AuthService; + rootScope = $rootScope; + scope = rootScope.$new(); + authService.login(user); + eventCardCtrl = componentController("eventCard", scope, + {event: event, user: user}); + eventCardCtrl.user = user; + eventCardCtrl.event = event; + })); + + describe('getProfileColor()', () => { + + it('Should return the color if user is member of institution of event', () => { + expect(eventCardCtrl.getProfileColor()).toEqual(_.first(user.institution_profiles).color); + }); + + it('Should return a default color "teal" if user is not a member of institution of event', () => { + eventCardCtrl.user = {institution_profiles: []}; + expect(eventCardCtrl.getProfileColor()).toEqual('teal'); + }); + }); +})); \ No newline at end of file diff --git a/frontend/test/specs/event/eventControllerSpec.js b/frontend/test/specs/event/eventControllerSpec.js index 8dceb6a65..533b2ea6a 100644 --- a/frontend/test/specs/event/eventControllerSpec.js +++ b/frontend/test/specs/event/eventControllerSpec.js @@ -269,19 +269,6 @@ }); }); - describe('getProfileColor()', () => { - - it('Should return the color if user is member of institution of event', () => { - eventCtrl.user = user; - expect(eventCtrl.getProfileColor(event)).toEqual(_.first(user.institution_profiles).color); - }); - - it('Should return a default color "teal" if user is not a member of institution of event', () => { - eventCtrl.user = {institution_profiles: []}; - expect(eventCtrl.getProfileColor(event)).toEqual('teal'); - }); - }); - describe('loadFilteredEvents()', () => { it('Should reset moreEvents, actualPage and isAnotherMonth', () => { @@ -415,13 +402,6 @@ }); }); - describe('getNameOfLastModified()', () => { - it('Should return the first name of who modified the event by last', () => { - expect(event.last_modified_by).toEqual('User Test'); - expect(eventCtrl.getNameOfLastModified(event)).toEqual('User'); - }); - }); - describe('getToolbarMobileGeneralOptions()', () => { it('tests the first object', () => { spyOn(eventCtrl, 'loadMoreEvents'); From e6074399fc406232cf2a7101bda8382bc7a4ca84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Esp=C3=ADndula?= Date: Fri, 8 Mar 2019 09:20:23 -0300 Subject: [PATCH 476/606] Add new sharePost on mobile to event sharing --- frontend/event/eventDetailsDirective.js | 5 ++++- frontend/post/sharePostController.js | 6 ++++++ frontend/post/share_post_dialog_mobile.html | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index ad5fbfd44..98a901014 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -16,7 +16,10 @@ $mdDialog.show({ controller: "SharePostController", controllerAs: "sharePostCtrl", - templateUrl: 'app/post/share_post_dialog.html', + templateUrl: Utils.selectFieldBasedOnScreenSize( + 'app/post/share_post_dialog.html', + 'app/post/share_post_dialog_mobile.html' + ), parent: angular.element(document.body), targetEvent: ev, clickOutsideToClose: true, diff --git a/frontend/post/sharePostController.js b/frontend/post/sharePostController.js index dce0a6459..ef58942a1 100644 --- a/frontend/post/sharePostController.js +++ b/frontend/post/sharePostController.js @@ -93,5 +93,11 @@ } return text && text.replace(URL_PATTERN, REPLACE_URL); }; + + shareCtrl.$onInit = () => { + const type = shareCtrl.isEvent() ? 'evento' : 'post'; + shareCtrl.title = `Compartilhar ${type}`; + shareCtrl.subtitle = `Você deseja compartilhar esse ${type}?`; + }; }); })(); \ No newline at end of file diff --git a/frontend/post/share_post_dialog_mobile.html b/frontend/post/share_post_dialog_mobile.html index 1ea77fee0..7fcf5b21a 100644 --- a/frontend/post/share_post_dialog_mobile.html +++ b/frontend/post/share_post_dialog_mobile.html @@ -1,7 +1,7 @@ \ No newline at end of file From 0fc0d484d9eb55eb86ae9535d472afadbc3494ca Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 8 Mar 2019 09:49:39 -0300 Subject: [PATCH 477/606] fix tests --- frontend/event/eventController.js | 7 +++-- .../test/specs/event/eventControllerSpec.js | 30 ++++++++++++------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/frontend/event/eventController.js b/frontend/event/eventController.js index 3daca0977..a552a6fd8 100644 --- a/frontend/event/eventController.js +++ b/frontend/event/eventController.js @@ -56,8 +56,9 @@ }); } - eventCtrl.events = $filter('filter')(eventCtrl.events, eventCtrl.institutionKey) - .filter(event => { + eventCtrl.events = $filter('filter')(eventCtrl.events, eventCtrl.institutionKey); + + eventCtrl.events = !eventCtrl.institutionKey && eventCtrl.events.filter(event => { const institution = _.find(eventCtrl.institutionsFilter, institution => institution.name === event.institution_name); return institution && institution.enable; }); @@ -66,7 +67,7 @@ }, function error() { $state.go(STATES.HOME); }); - } + }; eventCtrl.newEvent = function newEvent(event) { if(Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE)) { diff --git a/frontend/test/specs/event/eventControllerSpec.js b/frontend/test/specs/event/eventControllerSpec.js index ec8f6c0f2..d3641aef3 100644 --- a/frontend/test/specs/event/eventControllerSpec.js +++ b/frontend/test/specs/event/eventControllerSpec.js @@ -39,6 +39,7 @@ 'start_time': startDate, 'end_time': endDate, 'institution_key': institution.key, + 'institution_name': institution.name, 'key': '12345' }, other_event = { @@ -49,6 +50,7 @@ 'start_time': startDate, 'end_time': endDate, 'institution_key': other_institution.key, + 'institution_name': institution.name, 'key': '54321' }, requestEvent = { @@ -367,19 +369,27 @@ }); it('Should to increase the events of controller if not is another month', () => { - eventCtrl._isAnotherMonth = false; - eventCtrl.events = requestEvent.events; - expect(eventCtrl.events.length).toEqual(2); - eventCtrl._loadEvents(eventService.getEvents, december, testYear); - expect(eventCtrl.events.length).toEqual(4); + spyOn(Utils, 'isMobileScreen').and.callFake(() => true); + const ctrl = createCtrl(); + ctrl.showImage = true; + ctrl.$onInit(); + ctrl._isAnotherMonth = false; + ctrl.events = requestEvent.events; + expect(ctrl.events.length).toEqual(2); + ctrl._loadEvents(eventService.getEvents, december, testYear); + expect(ctrl.events.length).toEqual(4); }); it('Should update the events of controller if is another month', () => { - eventCtrl._isAnotherMonth = true; - eventCtrl.events = []; - eventCtrl._loadEvents(eventService.getEvents, december, testYear); - expect(eventCtrl.events).toEqual(requestEvent.events); - expect(eventCtrl._isAnotherMonth).toBeFalsy(); + spyOn(Utils, 'isMobileScreen').and.callFake(() => true); + const ctrl = createCtrl(); + ctrl.showImage = true; + ctrl.$onInit(); + ctrl._isAnotherMonth = true; + ctrl.events = []; + ctrl._loadEvents(eventService.getEvents, december, testYear); + expect(ctrl.events).toEqual(requestEvent.events); + expect(ctrl._isAnotherMonth).toBeFalsy(); }); }); From 95bdb03f9862a558eeb49c34cd3651bf1fcb6b56 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Fri, 8 Mar 2019 11:16:13 -0300 Subject: [PATCH 478/606] Push not are now being sent from everywhere it should --- backend/handlers/event_handler.py | 12 +++ backend/handlers/institution_handler.py | 6 ++ backend/handlers/reply_comment_handler.py | 7 ++ backend/handlers/user_handler.py | 7 ++ backend/handlers/user_institutions_handler.py | 9 ++- backend/models/invite.py | 9 ++- .../push_notification_service.py | 77 ++++++++++++++++++- 7 files changed, 123 insertions(+), 4 deletions(-) diff --git a/backend/handlers/event_handler.py b/backend/handlers/event_handler.py index 100bbe491..99202e237 100644 --- a/backend/handlers/event_handler.py +++ b/backend/handlers/event_handler.py @@ -70,6 +70,12 @@ def delete(self, user, event_urlsafe): enqueue_task('multiple-notification', params) + enqueue_task('send-push-notification', { + 'type': 'DELETED_EVENT', + 'receivers': [follower.urlsafe() for follower in event.followers], + 'entity': event.key.urlsafe() + }) + @json_response @login_required def patch(self, user, event_urlsafe): @@ -112,3 +118,9 @@ def patch(self, user, event_urlsafe): } enqueue_task('multiple-notification', params) + + enqueue_task('send-push-notification', { + 'type': 'UPDATED_EVENT', + 'receivers': [follower.urlsafe() for follower in event.followers], + 'entity': event.key.urlsafe() + }) diff --git a/backend/handlers/institution_handler.py b/backend/handlers/institution_handler.py index 88500a976..ce7eb52c4 100644 --- a/backend/handlers/institution_handler.py +++ b/backend/handlers/institution_handler.py @@ -242,3 +242,9 @@ def delete(self, user, institution_key): "entity": json.dumps(notification_entity) } enqueue_task('notify-followers', notification_params) + + enqueue_task('send-push-notification', { + 'type': 'DELETED_INSTITUTION', + 'receivers': [follower.urlsafe() for follower in institution.followers], + 'entity': institution.key.urlsafe() + }) diff --git a/backend/handlers/reply_comment_handler.py b/backend/handlers/reply_comment_handler.py index 7801fdd26..d2ff345b7 100644 --- a/backend/handlers/reply_comment_handler.py +++ b/backend/handlers/reply_comment_handler.py @@ -11,6 +11,7 @@ from service_messages import send_message_notification from custom_exceptions import NotAuthorizedException from custom_exceptions import EntityException +from service_entities import enqueue_task from . import BaseHandler from models import Comment @@ -82,6 +83,12 @@ def post(self, user, post_key, comment_id): message=notification_message ) + enqueue_task('send-push-notification', { + 'type': notification_type, + 'entity': post.key.urlsafe(), + 'receivers': [comment.get('author_key')] + }) + self.response.write(json.dumps(Utils.toJson(reply))) @json_response diff --git a/backend/handlers/user_handler.py b/backend/handlers/user_handler.py index 67f950666..59bbcbc6b 100644 --- a/backend/handlers/user_handler.py +++ b/backend/handlers/user_handler.py @@ -11,6 +11,7 @@ from models import InstitutionProfile from service_messages import send_message_notification from util import JsonPatch +from service_entities import enqueue_task from . import BaseHandler @@ -61,6 +62,12 @@ def notify_admins(user): message=notification_message ) + enqueue_task('send-push-notification', { + 'receivers': [admin_key.urlsafe()], + 'type': 'DELETED_USER', + 'entity': user.key.urlsafe() + }) + class UserHandler(BaseHandler): """User Handler.""" diff --git a/backend/handlers/user_institutions_handler.py b/backend/handlers/user_institutions_handler.py index 6c3991f3a..0d6b86b86 100644 --- a/backend/handlers/user_institutions_handler.py +++ b/backend/handlers/user_institutions_handler.py @@ -10,6 +10,7 @@ from send_email_hierarchy import LeaveInstitutionEmailSender from service_messages import send_message_notification from util import get_subject +from service_entities import enqueue_task from . import BaseHandler @@ -58,4 +59,10 @@ def delete(self, user, institution_key): notification_type='LEFT_INSTITUTION', entity_key=institution.key.urlsafe(), message=notification_message - ) \ No newline at end of file + ) + + enqueue_task('send-push-notification', { + 'type': 'LEFT_INSTITUTION', + 'receivers': [admin.key.urlsafe()], + 'entity': user.key.urlsafe() + }) \ No newline at end of file diff --git a/backend/models/invite.py b/backend/models/invite.py index 7632fa341..702533433 100644 --- a/backend/models/invite.py +++ b/backend/models/invite.py @@ -6,7 +6,8 @@ from service_messages import create_message from send_email_hierarchy import EmailSender from . import User -from util import get_subject +from util import get_subject +from service_entities import enqueue_task __all__ = ['Invite'] @@ -125,6 +126,12 @@ def send_notification(self, current_institution, sender_key=None, receiver_key=N message=notification_message ) + enqueue_task('send-push-notification', { + 'receivers': [receiver_key.urlsafe()], + 'type': 'INVITE', + 'entity': entity_key + }) + def make(self): """Create personalized json of invite.""" institution_admin = self.institution_key.get() diff --git a/backend/push_notification/push_notification_service.py b/backend/push_notification/push_notification_service.py index 78dc9469a..002994917 100644 --- a/backend/push_notification/push_notification_service.py +++ b/backend/push_notification/push_notification_service.py @@ -32,6 +32,13 @@ class NotificationType(Enum): remove_institution_link = 'REMOVE_INSTITUTION_LINK' create_post = 'CREATE_POST' delete_post = 'DELETE_POST' + reply_comment = 'REPLY_COMMENT' + deleted_user = 'DELETED_USER' + left_institution = 'LEFT_INSTITUTION' + invite = 'INVITE' + deleted_institution = 'DELETED_INSTITUTION' + deleted_event = 'DELETED_EVENT' + updated_event = 'UPDATED_EVENT' class NotificationProperties(object): """This class has several private @@ -61,7 +68,14 @@ def __init__(self, _type, entity): NotificationType.delete_member: self.__get_delete_member_props, NotificationType.remove_institution_link: self.__get_remove_inst_link_props, NotificationType.create_post: self.__get_create_post_props, - NotificationType.delete_post: self.__get_delete_post_props + NotificationType.delete_post: self.__get_delete_post_props, + NotificationType.reply_comment: self.__get_reply_comment_props, + NotificationType.deleted_user: self.__get_deleted_user_props, + NotificationType.left_institution: self.__get_left_institution_props, + NotificationType.invite: self.__get_invite_props, + NotificationType.deleted_institution: self.__get_deleted_institution_props, + NotificationType.deleted_event: self.__get_deleted_event_props, + NotificationType.updated_event: self.__get_updated_event_props } self.entity = entity self.notification_method = types[_type] @@ -182,4 +196,63 @@ def __get_delete_post_props(self): 'title': 'Post deletado', 'body': '%s deletou seu post' %admin_name, 'click_action': url - } \ No newline at end of file + } + + def __get_reply_comment_props(self): + """.""" + url = '/posts/%s' %self.entity.key.urlsafe() + + return { + 'title': 'Novo comentário', + 'body': 'Seu comentário tem uma nova resposta', + 'click_action': url + } + + def __get_deleted_user_props(self): + """.""" + return { + 'title': 'Usuário inativo', + 'body': '%s não está mais ativo na plataforma' %self.entity.name, + 'click_action': '/' + } + + def __get_left_institution_props(self): + """.""" + return { + 'title': 'Remoção de vínculo de membro', + 'body': '%s removeu o vínculo com uma das instituições que você administra' %self.entity.name, + 'click_action': '/' + } + + def __get_invite_props(self): + """.""" + url = '%s/new_invite' %self.entity.key.urlsafe() + return { + 'title': 'Novo convite', + 'body': 'Você tem um novo convite', + 'click_action': url + } + + def __get_deleted_institution_props(self): + """.""" + return { + 'title': 'Instituição removida', + 'body': 'A instituição %s foi removida' %self.entity.name, + 'click_action': '/' + } + + def __get_deleted_event_props(self): + """.""" + return { + 'title': 'Evento removido', + 'body': 'O evento %s foi removido' %self.entity.title, + 'click_action': '/' + } + + def __get_updated_event_props(self): + """.""" + return { + 'title': 'Evento editado', + 'body': 'O evento %s foi editado' %self.entity.title, + 'click_action': '/event/%s/details' %self.entity.key.urlsafe() + } From 7fd8fd00d006c3f2c0c0b6731cc6921d4f4ae7ba Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 8 Mar 2019 13:43:28 -0300 Subject: [PATCH 479/606] Add save new institution --- .../createInvitedInstitutionController.js | 87 ++++++++++++++++++- .../institution/create_inst_form_mobile.html | 2 +- 2 files changed, 85 insertions(+), 4 deletions(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index a4090c382..4136c6d83 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -2,12 +2,14 @@ (function() { angular.module('app') .controller('CreateInvitedInstitutionController', - ['STATES', '$state', 'AuthService', 'InstitutionService', 'MessageService', - function (STATES, $state, AuthService, InstitutionService, MessageService) { + ['STATES', '$state', 'AuthService', 'InstitutionService', 'MessageService', '$mdDialog', 'ObserverRecorderService', + function (STATES, $state, AuthService, InstitutionService, MessageService, $mdDialog, ObserverRecorderService) { const ctrl = this; + let observer; ctrl.loading = true; ctrl.currentStep = 0; ctrl.newInstitution = {}; + ctrl.user = {}; ctrl.stepColor = (step) => { return ctrl.currentStep === step ? 'light-green-500' : 'grey-500'; @@ -22,6 +24,7 @@ InstitutionService.getInstitution(ctrl.institutionKey).then(res => { ctrl.newInstitution = res; ctrl.suggestedName = res.name; + observer = ObserverRecorderService.register(ctrl.newInstitution); // Set default values ctrl.newInstitution.address = new Address(res.address); @@ -75,7 +78,7 @@ // nextStep ctrl.nextStep = () => { - if (true) { + if (ctrl.isCurrentStepValid()) { ctrl.currentStep += 1; } else { MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); @@ -103,10 +106,88 @@ ctrl.photoSrc = photoSrc; } + ctrl.submit = (event) => { + const newInstitution = new Institution(ctrl.newInstitution); + let promise; + + if (ctrl.isCurrentStepValid() && newInstitution.isValid()) { + const parent = angular.element('#create-inst-content'); + const confirm = $mdDialog.confirm(event) + .parent(parent) + .clickOutsideToClose(true) + .title('FINALIZAR') + .textContent('Você deseja finalizar e salvar os dados da instituição?') + .ariaLabel('Finalizar') + .targetEvent(event) + .ok('Sim') + .cancel('Não'); + promise = $mdDialog.show(confirm); + promise.then(() => { + ctrl.loadingSaveInstitution = true; + ctrl.completeInstitutionCreation().then((r) => { + AuthService.reload().then(() => { + $state.go(STATES.HOME).then(() => { + const alert = $mdDialog.alert({ + title: 'INSTITUIÇÃO CRIADA', + textContent: 'Estamos processando suas permissões hierárquicas. Em breve você receberá uma notificação e ficará habilitado para administrar a instituição e toda sua hierarquia na Plataforma Virtual CIS.', + ok: 'Fechar' + }); + $mdDialog.show(alert); + }); + }); + }); + }).catch(e => { + MessageService.showToast('Cancelado'); + }) + } else { + MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); + } + return promise; + } + + ctrl.completeInstitutionCreation = () => { + const inviteKey = $state.params.inviteKey; + const institutionKey = ctrl.institutionKey; + const patch = ObserverRecorderService.generate(observer); + const body = { sender_name: $state.params.senderName } + + return InstitutionService.save(body, institutionKey, inviteKey).then((savedInst)=> { + return InstitutionService.update(institutionKey, patch).then((r) => { + updateUser(inviteKey, r); + return r; + }); + }); + } + + function updateUser(key, inst) { + ctrl.user.removeInvite(key); + ctrl.user.institutions.push(inst); + ctrl.user.institutions_admin.push(inst.key); + ctrl.user.follow(inst); + ctrl.user.addProfile(createProfile(inst)); + ctrl.user.changeInstitution(inst); + AuthService.save(); + } + + function createProfile(inst) { + return { + email: null, + institution_key: inst.key, + institution: { + name: inst.name, + photo_url: inst.photo_url, + }, + office: 'Administrador', + phone: null, + color: 'teal' + }; + } + // main() // initController() // setDefaultPhotoUrl ctrl.$onInit = () => { + ctrl.user = AuthService.getCurrentUser(); ctrl.institutionKey = $state.params.institutionKey; if (ctrl.institutionKey) { ctrl.loadInstitution(ctrl.institutionKey) diff --git a/frontend/institution/create_inst_form_mobile.html b/frontend/institution/create_inst_form_mobile.html index 1d37223f2..226ef9587 100644 --- a/frontend/institution/create_inst_form_mobile.html +++ b/frontend/institution/create_inst_form_mobile.html @@ -38,7 +38,7 @@

    {{ ctrl.currentStepLabel }}

    + ng-click='ctrl.submit($event)'> Finalizar From 19bd4302ececa2a962e0914b4026a9d7af2ca784 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Fri, 8 Mar 2019 14:50:44 -0300 Subject: [PATCH 480/606] Moving the create event button --- frontend/event/event.css | 5 ----- frontend/event/events_mobile.html | 18 +++++++++--------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/frontend/event/event.css b/frontend/event/event.css index 982eac312..89d30b9bd 100644 --- a/frontend/event/event.css +++ b/frontend/event/event.css @@ -267,11 +267,6 @@ border-left: 0.55em solid; } - .event-button-margin { - position: fixed !important; - margin-bottom: 3.5em; - } - .highlight { background:rgba(0,0,0,0.65); position: absolute; diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index c44c60b6d..635b3a135 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -33,13 +33,13 @@
    - - - - add - - -
    + + + + add + + + \ No newline at end of file From ecb2db57649fc22893cc3c033f2a20cd1a80748a Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 8 Mar 2019 15:09:52 -0300 Subject: [PATCH 481/606] Add loading indicator and rework functions --- .../createInvitedInstitutionController.js | 84 +++++++++++-------- .../institution/create_inst_form_mobile.css | 11 +++ .../institution/create_inst_form_mobile.html | 5 +- 3 files changed, 62 insertions(+), 38 deletions(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index 4136c6d83..527e6eb5e 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -108,53 +108,63 @@ ctrl.submit = (event) => { const newInstitution = new Institution(ctrl.newInstitution); - let promise; if (ctrl.isCurrentStepValid() && newInstitution.isValid()) { - const parent = angular.element('#create-inst-content'); - const confirm = $mdDialog.confirm(event) - .parent(parent) - .clickOutsideToClose(true) - .title('FINALIZAR') - .textContent('Você deseja finalizar e salvar os dados da instituição?') - .ariaLabel('Finalizar') - .targetEvent(event) - .ok('Sim') - .cancel('Não'); - promise = $mdDialog.show(confirm); - promise.then(() => { - ctrl.loadingSaveInstitution = true; - ctrl.completeInstitutionCreation().then((r) => { - AuthService.reload().then(() => { - $state.go(STATES.HOME).then(() => { - const alert = $mdDialog.alert({ - title: 'INSTITUIÇÃO CRIADA', - textContent: 'Estamos processando suas permissões hierárquicas. Em breve você receberá uma notificação e ficará habilitado para administrar a instituição e toda sua hierarquia na Plataforma Virtual CIS.', - ok: 'Fechar' - }); - $mdDialog.show(alert); + const inviteKey = $state.params.inviteKey; + const instKey = ctrl.institutionKey; + const senderName = $state.params.senderName; + const dialogParent = angular.element('#create-inst-content'); + showConfirmationDialog(event, dialogParent) + .then(() => { + ctrl.loading = true; + saveAndUpdateInst(inviteKey, instKey, senderName) + .then(() => { + reloadAndRedirectHome(); }); - }); - }); - }).catch(e => { - MessageService.showToast('Cancelado'); - }) + }).catch(e => { + ctrl.loading = false; + MessageService.showToast(e); + }) } else { MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); } - return promise; } - ctrl.completeInstitutionCreation = () => { - const inviteKey = $state.params.inviteKey; - const institutionKey = ctrl.institutionKey; + function reloadAndRedirectHome() { + AuthService.reload().then(() => { + $state.go(STATES.HOME).then(() => { + ctrl.loading = false; + const alert = $mdDialog.alert({ + title: 'INSTITUIÇÃO CRIADA', + textContent: 'Estamos processando suas permissões hierárquicas. Em breve você receberá uma notificação e ficará habilitado para administrar a instituição e toda sua hierarquia na Plataforma Virtual CIS.', + ok: 'Fechar' + }); + $mdDialog.show(alert); + }); + }); + } + + function showConfirmationDialog(event, parent) { + const confirm = $mdDialog.confirm(event) + .parent(parent) + .clickOutsideToClose(true) + .title('FINALIZAR') + .textContent('Você deseja finalizar e salvar os dados da instituição?') + .ariaLabel('Finalizar') + .targetEvent(event) + .ok('Sim') + .cancel('Não'); + return $mdDialog.show(confirm); + } + + function saveAndUpdateInst(inviteKey, instKey, senderName) { const patch = ObserverRecorderService.generate(observer); - const body = { sender_name: $state.params.senderName } + const body = { sender_name: senderName } - return InstitutionService.save(body, institutionKey, inviteKey).then((savedInst)=> { - return InstitutionService.update(institutionKey, patch).then((r) => { - updateUser(inviteKey, r); - return r; + return InstitutionService.save(body, instKey, inviteKey).then((savedInst)=> { + console.log(patch); + return InstitutionService.update(instKey, patch).then((updatedInst) => { + updateUser(inviteKey, updatedInst); }); }); } diff --git a/frontend/institution/create_inst_form_mobile.css b/frontend/institution/create_inst_form_mobile.css index dd5af2582..d19071479 100644 --- a/frontend/institution/create_inst_form_mobile.css +++ b/frontend/institution/create_inst_form_mobile.css @@ -98,3 +98,14 @@ md-content.grid-fill-screen { #create-inst-content button.md-primary { color: #009688 !important; } + +.loading-container { + display: grid; + height: 10em; + align-content: center; + justify-content: center; +} + +.loading-container load-circle svg path { + stroke: #009688 !important; +} diff --git a/frontend/institution/create_inst_form_mobile.html b/frontend/institution/create_inst_form_mobile.html index 226ef9587..8c04cb2bf 100644 --- a/frontend/institution/create_inst_form_mobile.html +++ b/frontend/institution/create_inst_form_mobile.html @@ -10,7 +10,10 @@
    -
    +
    + +
    +

    {{ ctrl.currentStepLabel }}

    From 02bc719c0a509645fd73b96637a6a78c57f9387a Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 8 Mar 2019 15:35:17 -0300 Subject: [PATCH 482/606] Create FilterEventsByInstitutionControllerSpec --- frontend/event/eventController.js | 11 +- frontend/event/events_mobile.html | 1 - ...filterEventsByInstitutionControllerSpec.js | 131 ++++++++++++++++++ 3 files changed, 138 insertions(+), 5 deletions(-) create mode 100644 frontend/test/specs/event/filterEvents/filterEventsByInstitutionControllerSpec.js diff --git a/frontend/event/eventController.js b/frontend/event/eventController.js index a552a6fd8..81d353f27 100644 --- a/frontend/event/eventController.js +++ b/frontend/event/eventController.js @@ -58,10 +58,13 @@ eventCtrl.events = $filter('filter')(eventCtrl.events, eventCtrl.institutionKey); - eventCtrl.events = !eventCtrl.institutionKey && eventCtrl.events.filter(event => { - const institution = _.find(eventCtrl.institutionsFilter, institution => institution.name === event.institution_name); - return institution && institution.enable; - }); + if (Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE) && !eventCtrl.institutionKey) { + eventCtrl.events = eventCtrl.events.filter(event => { + const institution = _.find(eventCtrl.institutionsFilter, institution => institution.name === event.institution_name); + return institution && institution.enable; + }); + } + eventCtrl.isLoadingEvents = false; eventCtrl._getEventsByDay(); }, function error() { diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index effccd323..ff211d2d9 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -1,4 +1,3 @@ -
    diff --git a/frontend/test/specs/event/filterEvents/filterEventsByInstitutionControllerSpec.js b/frontend/test/specs/event/filterEvents/filterEventsByInstitutionControllerSpec.js new file mode 100644 index 000000000..e832decf7 --- /dev/null +++ b/frontend/test/specs/event/filterEvents/filterEventsByInstitutionControllerSpec.js @@ -0,0 +1,131 @@ +'use strict'; + +(describe('Test FilterEventsByInstitutionController', function() { + beforeEach(module('app')); + + let filterCtrl, inst, other_inst, filterList; + + beforeEach(inject(function($controller) { + inst = { + name: 'institution', + enable: true + }; + + other_inst = { + name: 'institution', + enable: true + }; + + filterList = [inst, other_inst]; + + filterCtrl = $controller('FilterEventsByInstitutionController'); + filterCtrl.filterList = filterList; + filterCtrl.$onInit(); + })); + + + describe('test checkChange()', function() { + it('Should be change filterCtrl.enableAll to false', function() { + inst.enable = false; + other_inst.enable = true; + filterCtrl.checkChange(); + expect(filterCtrl.enableAll).toBeFalsy(); + + inst.enable = true; + other_inst.enable = false; + filterCtrl.checkChange(); + expect(filterCtrl.enableAll).toBeFalsy(); + + inst.enable = false; + other_inst.enable = false; + filterCtrl.checkChange(); + expect(filterCtrl.enableAll).toBeFalsy(); + }); + + it('Should be change filterCtrl.enableAll to true', function() { + inst.enable = true; + other_inst.enable = true; + filterCtrl.checkChange(); + expect(filterCtrl.enableAll).toBeTruthy(); + }); + }); + + describe('test enableOrDisableAll', function() { + it('Should be enable all filters', function() { + inst.enable = false; + other_inst.enable = false; + filterCtrl.enableAll = true; + + filterCtrl.enableOrDisableAll(); + expect(inst.enable).toBeTruthy(); + expect(other_inst.enable).toBeTruthy(); + + inst.enable = false; + other_inst.enable = true; + filterCtrl.enableAll = true; + + filterCtrl.enableOrDisableAll(); + expect(inst.enable).toBeTruthy(); + expect(other_inst.enable).toBeTruthy(); + }); + + it('Should be disable all filters', function() { + inst.enable = true; + other_inst.enable = true; + filterCtrl.enableAll = false; + + filterCtrl.enableOrDisableAll(); + expect(inst.enable).toBeFalsy(); + expect(other_inst.enable).toBeFalsy(); + + inst.enable = true; + other_inst.enable = false; + filterCtrl.enableAll = false; + + filterCtrl.enableOrDisableAll(); + expect(inst.enable).toBeFalsy(); + expect(other_inst.enable).toBeFalsy(); + }); + }); + + describe('test cancel()', function() { + it('Should be return to original configs', function() { + filterCtrl.cancelAction = () => {}; + spyOn(filterCtrl, 'cancelAction'); + + const originalList = [ + { + name: 'institution', + enable: true + }, + { + name: 'institution', + enable: true + } + ]; + + inst.enable = false; + other_inst.enable = false; + + expect(originalList).toEqual(filterCtrl.originalList); + expect(originalList).not.toEqual(filterCtrl.filterList); + + filterCtrl.cancel(); + + expect(originalList).toEqual(filterCtrl.filterList); + expect(filterCtrl.cancelAction).toHaveBeenCalled(); + }); + }); + + describe('test $onInit', function() { + it('Should be clone the original filterList', function() { + spyOn(filterCtrl, 'checkChange'); + + filterCtrl.originalList = []; + filterCtrl.$onInit(); + + expect(filterCtrl.originalList).toEqual(filterList); + expect(filterCtrl.checkChange).toHaveBeenCalled(); + }); + }); +})); \ No newline at end of file From c4982259dc0435feccdce2fdb7224338cba5ca3e Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 8 Mar 2019 15:48:48 -0300 Subject: [PATCH 483/606] Fix image uploading --- .../createInvitedInstitutionController.js | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index 527e6eb5e..44915548d 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -2,8 +2,8 @@ (function() { angular.module('app') .controller('CreateInvitedInstitutionController', - ['STATES', '$state', 'AuthService', 'InstitutionService', 'MessageService', '$mdDialog', 'ObserverRecorderService', - function (STATES, $state, AuthService, InstitutionService, MessageService, $mdDialog, ObserverRecorderService) { + ['STATES', '$state', 'AuthService', 'InstitutionService', 'MessageService', '$mdDialog', 'ObserverRecorderService', 'ImageService', + function (STATES, $state, AuthService, InstitutionService, MessageService, $mdDialog, ObserverRecorderService, ImageService) { const ctrl = this; let observer; ctrl.loading = true; @@ -117,10 +117,12 @@ showConfirmationDialog(event, dialogParent) .then(() => { ctrl.loading = true; - saveAndUpdateInst(inviteKey, instKey, senderName) - .then(() => { - reloadAndRedirectHome(); - }); + saveProfileImage(ctrl.photoSrc).then(() => { + saveAndUpdateInst(inviteKey, instKey, senderName) + .then(() => { + reloadAndRedirectHome(); + }) + }) }).catch(e => { ctrl.loading = false; MessageService.showToast(e); @@ -130,6 +132,17 @@ } } + function saveProfileImage(src) { + if (!src) { + return Promise.resolve() + } + + return ImageService.saveImage(src).then(data => { + ctrl.newInstitution.photo_url = data.url; + return Promise.resolve(); + }); + } + function reloadAndRedirectHome() { AuthService.reload().then(() => { $state.go(STATES.HOME).then(() => { @@ -162,7 +175,6 @@ const body = { sender_name: senderName } return InstitutionService.save(body, instKey, inviteKey).then((savedInst)=> { - console.log(patch); return InstitutionService.update(instKey, patch).then((updatedInst) => { updateUser(inviteKey, updatedInst); }); @@ -201,7 +213,6 @@ ctrl.institutionKey = $state.params.institutionKey; if (ctrl.institutionKey) { ctrl.loadInstitution(ctrl.institutionKey) - // handle if its not a institution invite } else { $state.go(STATES.HOME); } From f84f8bb3340df29e0ba03cbe4a4dd19be59c82fa Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 8 Mar 2019 16:00:19 -0300 Subject: [PATCH 484/606] Add jsdoc --- frontend/event/eventController.js | 10 +++++++++- .../filterEventByInstitution.component.js | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/frontend/event/eventController.js b/frontend/event/eventController.js index 81d353f27..cda1f890c 100644 --- a/frontend/event/eventController.js +++ b/frontend/event/eventController.js @@ -278,15 +278,23 @@ eventCtrl.toolbarItems = eventCtrl._getToolbarMobileMenuItems(); }; + /** + * This function applies the modifications made + * to the event filter by institution, + * reloading events and filtering. + */ eventCtrl.confirmFilter = function confirmFilter() { eventCtrl.events = []; - eventCtrl.isFiltering = false; eventCtrl._actualPage = 0; eventCtrl._moreEvents = true; eventCtrl.isLoadingEvents = true; + eventCtrl.cancelFilter(); return eventCtrl.loadMoreEvents(); }; + /** + * This function cancels the filter run. + */ eventCtrl.cancelFilter = function cancelFilter() { eventCtrl.isFiltering = false; }; diff --git a/frontend/event/filterEvents/filterEventByInstitution.component.js b/frontend/event/filterEvents/filterEventByInstitution.component.js index b28f935ba..c208702b5 100644 --- a/frontend/event/filterEvents/filterEventByInstitution.component.js +++ b/frontend/event/filterEvents/filterEventByInstitution.component.js @@ -9,14 +9,27 @@ filterCtrl.enableAll = true; + /** + * This function checks if all filters are enabled + * and changes the enableAll variable to true, + * if there is at least one disabled, switch to false. + */ filterCtrl.checkChange = function checkChange() { filterCtrl.enableAll = (_.find(filterCtrl.filterList, institution => !institution.enable)) ? false : true; }; + /** + * This function enables or disables all filters, + * according to the enableAll variable + */ filterCtrl.enableOrDisableAll = function enableOrDisableAll() { filterCtrl.filterList.map(institution => institution.enable = filterCtrl.enableAll); }; + /** + * This function cancels the filter modification + * and returns it to the original state. + */ filterCtrl.cancel = function cancel() { filterCtrl.filterList.map((institution, index) => { institution.enable = filterCtrl.originalList[index].enable; @@ -30,6 +43,12 @@ }; }); + /** + * Filter events by institution component + * @example + * + * + */ app.component("filterEventsByInstitution", { templateUrl: 'app/event/filterEvents/filter_events_by_institution.html', controller: 'FilterEventsByInstitutionController', From e6dd616d6d7a6d976aaea5b899ec2d56d0b1ced8 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 8 Mar 2019 16:02:15 -0300 Subject: [PATCH 485/606] Move style to css file --- frontend/event/filterEvents/filter_events_by_institution.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/event/filterEvents/filter_events_by_institution.html b/frontend/event/filterEvents/filter_events_by_institution.html index 1eb0b3fef..8a5986c49 100644 --- a/frontend/event/filterEvents/filter_events_by_institution.html +++ b/frontend/event/filterEvents/filter_events_by_institution.html @@ -14,7 +14,7 @@

    Filtrar por institutição

    - CANCELAR + CANCELAR FILTRAR
    \ No newline at end of file From 2dd09d0a5548799bf8349ce00e6ae7b172f2e30b Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 8 Mar 2019 16:10:19 -0300 Subject: [PATCH 486/606] Create filter-cancel-button class --- frontend/event/filterEvents/filter_events_by_institution.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/event/filterEvents/filter_events_by_institution.css b/frontend/event/filterEvents/filter_events_by_institution.css index e737947a1..dfb062a6f 100644 --- a/frontend/event/filterEvents/filter_events_by_institution.css +++ b/frontend/event/filterEvents/filter_events_by_institution.css @@ -38,4 +38,9 @@ grid-template-columns: auto auto; justify-content: end; margin-bottom: 10px; +} + +.filter-cancel-button { + color: white; + background-color: #7F7F7F; } \ No newline at end of file From 6a533bb1d3c840df2dd48bc1dd4d10a63fac4c27 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 8 Mar 2019 16:16:29 -0300 Subject: [PATCH 487/606] Remove filter option if list instituion events --- frontend/event/eventController.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/event/eventController.js b/frontend/event/eventController.js index cda1f890c..d4eca9bd9 100644 --- a/frontend/event/eventController.js +++ b/frontend/event/eventController.js @@ -262,10 +262,13 @@ title: 'Atualizar', action: () => { eventCtrl._moreEvents = true; eventCtrl._actualPage = 0; eventCtrl.events = []; eventCtrl.loadMoreEvents()} }, - { - title: 'Filtrar por instituição', action: () => {eventCtrl.isFiltering = true;} - } ]; + + if (!eventCtrl.institutionKey) { + toolbarMenuGeneralOptions.options.push({ + title: 'Filtrar por instituição', action: () => {eventCtrl.isFiltering = true;} + }); + } return toolbarMenuGeneralOptions; }; From 44b8d5b6ac9681bee7ecb150b05ffbac0ab18681 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 8 Mar 2019 16:23:31 -0300 Subject: [PATCH 488/606] Move filter to else block --- frontend/event/eventController.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/event/eventController.js b/frontend/event/eventController.js index d4eca9bd9..4af70b3b2 100644 --- a/frontend/event/eventController.js +++ b/frontend/event/eventController.js @@ -55,14 +55,14 @@ eventCtrl.events.push(event); }); } - - eventCtrl.events = $filter('filter')(eventCtrl.events, eventCtrl.institutionKey); if (Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE) && !eventCtrl.institutionKey) { eventCtrl.events = eventCtrl.events.filter(event => { const institution = _.find(eventCtrl.institutionsFilter, institution => institution.name === event.institution_name); return institution && institution.enable; }); + } else { + eventCtrl.events = $filter('filter')(eventCtrl.events, eventCtrl.institutionKey); } eventCtrl.isLoadingEvents = false; From b02cef595a7eb1b820c1f6493ae6c6dbbd94856f Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 8 Mar 2019 15:58:58 -0300 Subject: [PATCH 489/606] Remove wrong css file --- frontend/index.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index ec9b69910..89c952b9a 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -6,7 +6,7 @@ Plataforma CIS - + @@ -29,7 +29,7 @@ - + @@ -60,7 +60,6 @@ - @@ -89,11 +88,11 @@
    - - + From 767e4d6dd3a2ee0b070de8ec3794f0b6c292078b Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 8 Mar 2019 16:21:18 -0300 Subject: [PATCH 490/606] Add some jsDoc --- .../createInvitedInstitutionController.js | 74 ++++++++++++++++--- 1 file changed, 65 insertions(+), 9 deletions(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index 44915548d..52529cd75 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -19,7 +19,6 @@ ctrl.currentStep === 0 ? window.history.back() : ctrl.previousStep(); } - // loadInstitution ctrl.loadInstitution = () => { InstitutionService.getInstitution(ctrl.institutionKey).then(res => { ctrl.newInstitution = res; @@ -36,9 +35,6 @@ }) } - // isCurrentStepValid - // isValidAddress - // getFields ctrl.isCurrentStepValid = () => { const step = ctrl.currentStep; const institution = ctrl.newInstitution; @@ -76,7 +72,6 @@ return stepValidation[step]; }; - // nextStep ctrl.nextStep = () => { if (ctrl.isCurrentStepValid()) { ctrl.currentStep += 1; @@ -85,7 +80,6 @@ } } - // previousStep ctrl.previousStep = () => { if (ctrl.currentStep === 0) return; ctrl.currentStep -= 1; @@ -102,10 +96,22 @@ } }) + /** + * Callback when the photo is changed on institutionInfo.component + * + * ctrl.photoSrc is needed to save the image later (when the Institution is finally saved). + */ ctrl.onNewPhoto = (photoSrc) => { ctrl.photoSrc = photoSrc; } + /** + * Submits current institution info and tries to save it. + * Calls a chain of promises to deal with Institution saving, updating, + * and User updating. + * + * @params {Event} event - current click event + */ ctrl.submit = (event) => { const newInstitution = new Institution(ctrl.newInstitution); @@ -132,6 +138,13 @@ } } + /** + * Saves a image file as profile for the current institution. + * If src is non existant (meaning user has not chosen a new profile picture), + * this method bails out and resolves a Promise with nothing. + * Otherwise, sets the Image through ImageService and resolves it. + * @param {Image} src - current institutions image file (resized) + */ function saveProfileImage(src) { if (!src) { return Promise.resolve() @@ -143,6 +156,11 @@ }); } + /** + * Reloads the current user through AuthService, as needed to set this new Institution + * as the User's current institution and update this info through the app and local storage. + * Then, sends the user back to STATE.HOME with a confirmation message. + */ function reloadAndRedirectHome() { AuthService.reload().then(() => { $state.go(STATES.HOME).then(() => { @@ -157,6 +175,13 @@ }); } + /** + * Shows a confirmation dialog asking the user about saving this new institution. + * @param {Event} event - click event from DOM + * @param {DOMElement} parent - parent element for the modal + * + * @returns {Promise} $mdDialog Promise + */ function showConfirmationDialog(event, parent) { const confirm = $mdDialog.confirm(event) .parent(parent) @@ -170,6 +195,15 @@ return $mdDialog.show(confirm); } + /** + * Saves a (stub) institution, then promptly update it with info from the previous forms. + * Calls #updateUser at the end. + * @param {string} inviteKey - of current institution + * @param {String} instKey - of current institution + * @param {String} senderName - name of the current user + * + * @return {Promise} - InstitutionService#update promise. + */ function saveAndUpdateInst(inviteKey, instKey, senderName) { const patch = ObserverRecorderService.generate(observer); const body = { sender_name: senderName } @@ -181,6 +215,15 @@ }); } + /** + * Updates the current User, setting up the created institution (and it as user's current), + * removing its invite key and saving it through AuthService. + * @param {String} key - invite key + * @param {Institution} inst - created institution + * + * Replaces: + * #updateUser + */ function updateUser(key, inst) { ctrl.user.removeInvite(key); ctrl.user.institutions.push(inst); @@ -191,6 +234,13 @@ AuthService.save(); } + /** + * Creates a new "empty" profile for the institution. + * @param {Institution} inst - Institution to generate profile + * + * Replaces: + * #createProfile + */ function createProfile(inst) { return { email: null, @@ -205,9 +255,15 @@ }; } - // main() - // initController() - // setDefaultPhotoUrl + /** + * Initializes the controller, setting current user and institution key. + * Redirects if there's no institution key. + * + * Replaces: + * #main + * #initController + * #setDefaultPhotoUrl + */ ctrl.$onInit = () => { ctrl.user = AuthService.getCurrentUser(); ctrl.institutionKey = $state.params.institutionKey; From 916c7057572e6c9d2b8a82e2168203d66b427939 Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 8 Mar 2019 16:50:49 -0300 Subject: [PATCH 491/606] Remove wrong whitespace changes --- frontend/index.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index 89c952b9a..8d8a13427 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -6,7 +6,7 @@ Plataforma CIS - + @@ -29,7 +29,7 @@ - + @@ -88,11 +88,11 @@
    - - + From 9b76849d084d440a404cc7d50803c7c11f719087 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 8 Mar 2019 16:51:25 -0300 Subject: [PATCH 492/606] Add max-height --- frontend/event/events.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/event/events.html b/frontend/event/events.html index 0029c440d..b0fedfba0 100644 --- a/frontend/event/events.html +++ b/frontend/event/events.html @@ -1,6 +1,6 @@
    + md-colors="{background: 'grey-50'}" style="max-height: 100%;">
    From 047f51732937a4c9440f286df8f602cac21d1277 Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 8 Mar 2019 16:56:18 -0300 Subject: [PATCH 493/606] Remove fdescribe on spec --- frontend/test/specs/institution/createInvitedInstitutionSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/test/specs/institution/createInvitedInstitutionSpec.js b/frontend/test/specs/institution/createInvitedInstitutionSpec.js index 6f4ba84cb..dce7a6c75 100644 --- a/frontend/test/specs/institution/createInvitedInstitutionSpec.js +++ b/frontend/test/specs/institution/createInvitedInstitutionSpec.js @@ -1,6 +1,6 @@ 'use strict'; -fdescribe('Test CreateInvitedInstitutionController', function() { +describe('Test CreateInvitedInstitutionController', function() { let state, statesConst, scope, institutionService, inviteService, httpBackend, authService, ctrl, imageService; From db4c5e012693bb4b9ccf5af9642fb428fa7de2ab Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 8 Mar 2019 17:14:58 -0300 Subject: [PATCH 494/606] Fix wrong expected parameter --- frontend/test/specs/institution/institutionControllerSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/test/specs/institution/institutionControllerSpec.js b/frontend/test/specs/institution/institutionControllerSpec.js index e2117ddb0..2257256d9 100644 --- a/frontend/test/specs/institution/institutionControllerSpec.js +++ b/frontend/test/specs/institution/institutionControllerSpec.js @@ -260,7 +260,7 @@ spyOn(utilsService, 'selectNavOption'); institutionCtrl.goToEvents(first_institution.key); expect(utilsService.selectNavOption).toHaveBeenCalledWith( - states.EVENTS, + states.INST_EVENTS, { institutionKey: first_institution.key, } From a073f68fc057e10a98a91dc04d3566e07d657b7d Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Fri, 8 Mar 2019 17:16:15 -0300 Subject: [PATCH 495/606] Fix event card width --- frontend/event/events.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/event/events.html b/frontend/event/events.html index b0fedfba0..940e5a702 100644 --- a/frontend/event/events.html +++ b/frontend/event/events.html @@ -41,7 +41,7 @@

    Nenhum evento a ser exibido.

    - +
    From e7a701252e75baec057953c03e8e23d64eedc7e7 Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 11 Mar 2019 09:47:18 -0300 Subject: [PATCH 496/606] Fix loading on institution fetching failure --- frontend/institution/createInvitedInstitutionController.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index 52529cd75..755a1452c 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -31,7 +31,8 @@ ctrl.newInstitution.photo_url = ctrl.newInstitution.photo_url || 'app/images/institution.png'; ctrl.loading = false; }, e => { - ctrl.loading = true; + ctrl.loading = false; + MessageService.showToast(e); }) } From dab00e6a063872c3d0c54863e9cb018e9b8f32c1 Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 11 Mar 2019 09:47:56 -0300 Subject: [PATCH 497/606] Remove unecessary promise --- frontend/institution/createInvitedInstitutionController.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index 755a1452c..ae4f53e2f 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -153,7 +153,6 @@ return ImageService.saveImage(src).then(data => { ctrl.newInstitution.photo_url = data.url; - return Promise.resolve(); }); } From 458e1236f55d4444118c45baca9cdedaa09792bb Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 11 Mar 2019 09:48:18 -0300 Subject: [PATCH 498/606] Fix message on inst creation based on hierarchy --- .../institution/createInvitedInstitutionController.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index ae4f53e2f..071a47e9f 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -162,12 +162,18 @@ * Then, sends the user back to STATE.HOME with a confirmation message. */ function reloadAndRedirectHome() { + // Check if institution is currently a superior + const message = ctrl.newInstitution.children_institutions.length > 0 ? + 'Estamos processando suas permissões hierárquicas. Em breve você receberá uma notificação e ficará habilitado para administrar a instituição e toda sua hierarquia na Plataforma Virtual CIS.' + : + 'A instituição foi criada e ja se encontra habilitada na Plataforma Virtual CIS.' + AuthService.reload().then(() => { $state.go(STATES.HOME).then(() => { ctrl.loading = false; const alert = $mdDialog.alert({ title: 'INSTITUIÇÃO CRIADA', - textContent: 'Estamos processando suas permissões hierárquicas. Em breve você receberá uma notificação e ficará habilitado para administrar a instituição e toda sua hierarquia na Plataforma Virtual CIS.', + textContent: message, ok: 'Fechar' }); $mdDialog.show(alert); From 264bdc56cb8ec293f146d1afb33fbc5e39a42a02 Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 11 Mar 2019 09:48:37 -0300 Subject: [PATCH 499/606] Remove unused http flush on spec --- frontend/test/specs/institution/createInvitedInstitutionSpec.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/test/specs/institution/createInvitedInstitutionSpec.js b/frontend/test/specs/institution/createInvitedInstitutionSpec.js index dce7a6c75..7bdd8a66a 100644 --- a/frontend/test/specs/institution/createInvitedInstitutionSpec.js +++ b/frontend/test/specs/institution/createInvitedInstitutionSpec.js @@ -83,8 +83,6 @@ describe('Test CreateInvitedInstitutionController', function() { institutionService, imageService }); - - // httpBackend.flush(); })); describe('$onInit', () => { From 8283583807372c2951499217ded56be34afa3e8a Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 11 Mar 2019 10:12:07 -0300 Subject: [PATCH 500/606] Fix goToEvents spec by mocking #isMobileScreen --- .../institution/institutionControllerSpec.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/frontend/test/specs/institution/institutionControllerSpec.js b/frontend/test/specs/institution/institutionControllerSpec.js index 2257256d9..d6e5efeec 100644 --- a/frontend/test/specs/institution/institutionControllerSpec.js +++ b/frontend/test/specs/institution/institutionControllerSpec.js @@ -255,9 +255,11 @@ expect(institutionService.update).toHaveBeenCalled(); }); }); + describe('goToEvents', function() { - it('should call state.go with the right params', function(){ + it('should call state.go with the INST_EVENTS on desktop', function(){ spyOn(utilsService, 'selectNavOption'); + spyOn(Utils, 'isMobileScreen').and.returnValue(false); institutionCtrl.goToEvents(first_institution.key); expect(utilsService.selectNavOption).toHaveBeenCalledWith( states.INST_EVENTS, @@ -266,7 +268,20 @@ } ); }); + + it('should call state.go with the EVENTS on mobile', function(){ + spyOn(utilsService, 'selectNavOption'); + spyOn(Utils, 'isMobileScreen').and.returnValue(true); + institutionCtrl.goToEvents(first_institution.key); + expect(utilsService.selectNavOption).toHaveBeenCalledWith( + states.EVENTS, + { + institutionKey: first_institution.key, + } + ); + }); }); + describe('goToLinks()', function() { it('should call state.go', function() { spyOn(state, 'go'); From 5e60a475e018ab8079ee5c382f9c3a94b240ea91 Mon Sep 17 00:00:00 2001 From: MaianaBt Date: Mon, 11 Mar 2019 10:19:49 -0300 Subject: [PATCH 501/606] create css file --- frontend/app.js | 2 +- frontend/index.html | 1 + .../analyseHierarchyRequestController.js | 1 + .../requests/analyse_hierarchy_request.css | 3 + .../analyse_hierarchy_request_dialog.html | 106 +++++++++--------- 5 files changed, 56 insertions(+), 57 deletions(-) create mode 100644 frontend/requests/analyse_hierarchy_request.css diff --git a/frontend/app.js b/frontend/app.js index 63d507caa..8c90e7dab 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -625,6 +625,6 @@ } (function main() { - initServiceWorker(); + //initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html index bc0d3d26e..2572e7e69 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -73,6 +73,7 @@ + diff --git a/frontend/requests/analyseHierarchyRequestController.js b/frontend/requests/analyseHierarchyRequestController.js index 8acf8cc09..187c25c68 100644 --- a/frontend/requests/analyseHierarchyRequestController.js +++ b/frontend/requests/analyseHierarchyRequestController.js @@ -6,6 +6,7 @@ app.controller('AnalyseHierarchyRequestController', function AnalyseHierarchyRequestController(request, RequestInvitationService, InstitutionService, MessageService, $mdDialog) { const analyseHierReqCtrl = this; + analyseHierReqCtrl.analyseInstitutions = false; const REQUEST_PARENT = "REQUEST_INSTITUTION_PARENT"; const REQUEST_CHILDREN = "REQUEST_INSTITUTION_CHILDREN"; diff --git a/frontend/requests/analyse_hierarchy_request.css b/frontend/requests/analyse_hierarchy_request.css new file mode 100644 index 000000000..9b662f5b4 --- /dev/null +++ b/frontend/requests/analyse_hierarchy_request.css @@ -0,0 +1,3 @@ +.analyse_request__description{ + color: #707070; +} \ No newline at end of file diff --git a/frontend/requests/analyse_hierarchy_request_dialog.html b/frontend/requests/analyse_hierarchy_request_dialog.html index cdb4a93b3..e81341f30 100644 --- a/frontend/requests/analyse_hierarchy_request_dialog.html +++ b/frontend/requests/analyse_hierarchy_request_dialog.html @@ -1,88 +1,82 @@ - +

    Confirmar vínculo

    -

    +

    Para aceitar o vínculo e tornar {{ analyseHierReqCtrl.child.name }} uma subornadinada de - {{ analyseHierReqCtrl.parent.name }}, clique em Confirmar. Caso queira rejeitar, clique em cancelar. + {{ analyseHierReqCtrl.parent.name }}. Clique em aceitar, caso não queira se vincular a esta instituição clique em rejeitar.

    Confirmar remoção de vínculo existente

    -

    +

    Para aceitar o vínculo e tornar {{ analyseHierReqCtrl.child.name }} uma subornadinada de {{ analyseHierReqCtrl.parent.name }} - é necessário que o vínculo com {{ analyseHierReqCtrl.child.parent_institution.name }} seja desfeito. Clique em Confirmar, - para prosseguir, ou em Cancelar, para rejeitar o pedido. + é necessário que o vínculo com {{ analyseHierReqCtrl.child.parent_institution.name }} seja desfeito. Clique em aceitar, + para visualizar a alteração de vínculo, caso não queira se vincular a esta instituição clique em rejeitar.

    +
    +

    Vínculo Atual

    -
    -
    - {{analyseHierReqCtrl.child.parent_institution.name}} -
    -
    - {{ analyseHierReqCtrl.child.parent_institution.name }} - {{ analyseHierReqCtrl.child.parent_institution.institutional_email }} -
    -
    + +
    -
    -
    -
    -
    -
    - {{ analyseHierReqCtrl.child.name }} +
    +
    -
    - {{ analyseHierReqCtrl.child.name || analyseHierReqCtrl.child.sender_name}} - {{ analyseHierReqCtrl.child.institutional_email }} - {{ analyseHierReqCtrl.child.office }} +
    + +
    -

    Vínculo Futuro

    -
    -
    -
    -
    - {{analyseHierReqCtrl.parent.name}} -
    -
    - {{ analyseHierReqCtrl.parent.name }} - {{ analyseHierReqCtrl.parent.institutional_email }} -
    -
    -
    -
    -
    -
    -
    -
    - {{ analyseHierReqCtrl.child.name }} -
    -
    - {{ analyseHierReqCtrl.child.name || analyseHierReqCtrl.child.sender_name}} - {{ analyseHierReqCtrl.child.institutional_email }} - {{ analyseHierReqCtrl.child.office }} +
    + + +
    +
    +
    +
    +
    + + +
    -
    Cancelar + md-colors="{color: 'default-teal-500'}"> Rejeitar Confirmar + md-colors="{color: 'default-teal-500'}" + ng-if="analyseHierReqCtrl.hasToRemoveLink"> Aceitar + Avançar + From b2b5b42159a188d1e12eba731d0061162de1693b Mon Sep 17 00:00:00 2001 From: MaianaB Date: Mon, 11 Mar 2019 11:10:08 -0300 Subject: [PATCH 502/606] remove comment --- frontend/app.js | 2 +- .../analyseHierarchyRequestController.js | 9 +++++++++ .../requests/analyse_hierarchy_request.css | 8 ++++++++ .../analyse_hierarchy_request_dialog.html | 18 +++++++++--------- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/frontend/app.js b/frontend/app.js index 8c90e7dab..63d507caa 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -625,6 +625,6 @@ } (function main() { - //initServiceWorker(); + initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/requests/analyseHierarchyRequestController.js b/frontend/requests/analyseHierarchyRequestController.js index 187c25c68..24a446da5 100644 --- a/frontend/requests/analyseHierarchyRequestController.js +++ b/frontend/requests/analyseHierarchyRequestController.js @@ -28,6 +28,15 @@ analyseHierReqCtrl.child = child; })(); + analyseHierReqCtrl.showButtonAccept = function(){ + return !analyseHierReqCtrl.hasToRemoveLink || + analyseHierReqCtrl.hasToRemoveLink && analyseHierReqCtrl.analyseInstitutions; + } + + analyseHierReqCtrl.isDescriptionRemoveLink = function(){ + return analyseHierReqCtrl.hasToRemoveLink && !analyseHierReqCtrl.analyseInstitutions; + } + analyseHierReqCtrl.confirmRequest = function confirmRequest() { analyseHierReqCtrl.hasToRemoveLink ? confirmLinkRemoval() : acceptRequest(); }; diff --git a/frontend/requests/analyse_hierarchy_request.css b/frontend/requests/analyse_hierarchy_request.css index 9b662f5b4..be3651fc7 100644 --- a/frontend/requests/analyse_hierarchy_request.css +++ b/frontend/requests/analyse_hierarchy_request.css @@ -1,3 +1,11 @@ .analyse_request__description{ color: #707070; +} + +.analyse_request__dialog{ + max-height: 90%; +} + +.analyse_request__margin_bottom{ + margin:0 0 8px 0; } \ No newline at end of file diff --git a/frontend/requests/analyse_hierarchy_request_dialog.html b/frontend/requests/analyse_hierarchy_request_dialog.html index e81341f30..45fb727f0 100644 --- a/frontend/requests/analyse_hierarchy_request_dialog.html +++ b/frontend/requests/analyse_hierarchy_request_dialog.html @@ -1,4 +1,4 @@ - +
    @@ -8,7 +8,7 @@

    Confirmar vínculo

    {{ analyseHierReqCtrl.parent.name }}. Clique em aceitar, caso não queira se vincular a esta instituição clique em rejeitar.

    -
    +

    Confirmar remoção de vínculo existente

    Para aceitar o vínculo e tornar {{ analyseHierReqCtrl.child.name }} uma subornadinada de {{ analyseHierReqCtrl.parent.name }} @@ -20,8 +20,7 @@

    Confirmar remoção de vínculo existente

    Vínculo Atual

    @@ -44,8 +43,8 @@

    Vínculo Atual

    Vínculo Futuro

    - @@ -72,10 +71,11 @@

    Vínculo Futuro

    md-colors="{color: 'default-teal-500'}"> Rejeitar Aceitar - Aceitar + Avançar + ng-if="analyseHierReqCtrl.isDescriptionRemoveLink()"> Avançar From d05a3eada1d4e275e897afc39d9054ec300d3642 Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 11 Mar 2019 11:35:56 -0300 Subject: [PATCH 503/606] Fix way of indentifying type of invite --- frontend/institution/createInvitedInstitutionController.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index 071a47e9f..d7acde5a4 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -10,6 +10,7 @@ ctrl.currentStep = 0; ctrl.newInstitution = {}; ctrl.user = {}; + ctrl.invite = {}; ctrl.stepColor = (step) => { return ctrl.currentStep === step ? 'light-green-500' : 'grey-500'; @@ -163,7 +164,7 @@ */ function reloadAndRedirectHome() { // Check if institution is currently a superior - const message = ctrl.newInstitution.children_institutions.length > 0 ? + const message = _.isEqual(ctrl.invite.type_of_invite, 'INSTITUTION_PARENT') ? 'Estamos processando suas permissões hierárquicas. Em breve você receberá uma notificação e ficará habilitado para administrar a instituição e toda sua hierarquia na Plataforma Virtual CIS.' : 'A instituição foi criada e ja se encontra habilitada na Plataforma Virtual CIS.' @@ -273,6 +274,8 @@ ctrl.$onInit = () => { ctrl.user = AuthService.getCurrentUser(); ctrl.institutionKey = $state.params.institutionKey; + const inviteKey = $state.params.inviteKey; + ctrl.invite = _.find(ctrl.user.invites, i => _.isEqual(i.key, inviteKey)); if (ctrl.institutionKey) { ctrl.loadInstitution(ctrl.institutionKey) } else { From 35544790496d44c41ead82689c9066c99e84fe7d Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 11 Mar 2019 14:16:36 -0300 Subject: [PATCH 504/606] fixing the tests --- .../event_handler_test.py | 28 +++++++++++++++++-- .../institution_parent_handler_test.py | 20 +++++++++---- .../post_collection_handler_test.py | 5 ++++ 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/backend/test/event_handlers_tests/event_handler_test.py b/backend/test/event_handlers_tests/event_handler_test.py index e95431539..2055a211a 100644 --- a/backend/test/event_handlers_tests/event_handler_test.py +++ b/backend/test/event_handlers_tests/event_handler_test.py @@ -6,7 +6,7 @@ from models import Institution from models import Event from handlers.event_handler import EventHandler -from mock import patch +from mock import patch, call import datetime import json @@ -69,7 +69,18 @@ def test_delete_by_author(self, verify_token, enqueue_task): 'title': self.event.title } - enqueue_task.assert_called_with('multiple-notification', not_params) + push_not_queue_call_params = { + 'type': 'DELETED_EVENT', + 'receivers': [follower.urlsafe() for follower in self.event.followers], + 'entity': self.event.key.urlsafe() + } + + calls = [ + call('multiple-notification', not_params), + call('send-push-notification', push_not_queue_call_params) + ] + + enqueue_task.assert_has_calls(calls) # Refresh event self.event = self.event.key.get() @@ -208,7 +219,18 @@ def test_pacth_datetime(self, verify_token, enqueue_task): 'title': self.event.title } - enqueue_task.assert_called_with('multiple-notification', not_params) + push_not_queue_call_params = { + 'type': 'UPDATED_EVENT', + 'receivers': [follower.urlsafe() for follower in self.event.followers], + 'entity': self.event.key.urlsafe() + } + + calls = [ + call('multiple-notification', not_params), + call('send-push-notification', push_not_queue_call_params) + ] + + enqueue_task.assert_has_calls(calls) @patch('util.login_service.verify_token', return_value={'email': 'user@gmail.com'}) def test_patch_on_event_outdated(self, verify_token): diff --git a/backend/test/institution_handlers_tests/institution_parent_handler_test.py b/backend/test/institution_handlers_tests/institution_parent_handler_test.py index df2bdd8bc..f3d731b96 100644 --- a/backend/test/institution_handlers_tests/institution_parent_handler_test.py +++ b/backend/test/institution_handlers_tests/institution_parent_handler_test.py @@ -3,7 +3,7 @@ from ..test_base_handler import TestBaseHandler from handlers import InstitutionParentHandler -from mock import patch +from mock import patch, call from .. import mocks import json @@ -78,14 +78,24 @@ def test_delete_child_connection(self, verify_token, send_message_notification, message=json.dumps(message) ) - enqueue_task.assert_called_with( - 'remove-admin-permissions', + calls = [ + call('remove-admin-permissions', { 'institution_key': otherinst.key.urlsafe(), 'parent_key': institution.key.urlsafe(), 'notification_id': '01-938483948393' - } - ) + }), + call( + 'send-push-notification', { + 'type': 'REMOVE_INSTITUTION_LINK', + 'receivers': [otherinst.admin.urlsafe()], + 'entity': otherinst.key.urlsafe() + + } + ) + ] + + enqueue_task.assert_has_calls(calls) @patch('util.login_service.verify_token') def test_delete_without_permission(self, verify_token): diff --git a/backend/test/post_handlers_tests/post_collection_handler_test.py b/backend/test/post_handlers_tests/post_collection_handler_test.py index e540b692a..6c6af9608 100644 --- a/backend/test/post_handlers_tests/post_collection_handler_test.py +++ b/backend/test/post_handlers_tests/post_collection_handler_test.py @@ -193,6 +193,11 @@ def test_post_sharing(self, verify_token, enqueue_task): 'current_institution': self.institution.key.urlsafe() } ), + call('send-push-notification', { + 'type': 'CREATE_POST', + 'entity': post.get('key'), + 'receivers': [follower.urlsafe() for follower in self.post.institution.get().followers] + }), call( 'multiple-notification', { From 3ada919fc68b8aa4aafdfd8407df072f4ac8f060 Mon Sep 17 00:00:00 2001 From: ruanres Date: Mon, 11 Mar 2019 15:18:55 -0300 Subject: [PATCH 505/606] implemanted the invite institutions form --- .../management_institution_mobile.css | 18 ++++------ .../management_institution_mobile.html | 33 +++++++++++++++++-- frontend/styles/custom.css | 10 +++++- 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/frontend/institution/manageInstitution/management_institution_mobile.css b/frontend/institution/manageInstitution/management_institution_mobile.css index 3d90c4aac..d94d2ba36 100644 --- a/frontend/institution/manageInstitution/management_institution_mobile.css +++ b/frontend/institution/manageInstitution/management_institution_mobile.css @@ -28,23 +28,17 @@ grid-row-gap: 1em; } -/* Send invites section */ -.manage-institution__send__invites > h3, -.manage-institution__send__invites > p { - margin: 0; -} - -.manage-institution__send__invites > .description { - font-size: 0.9em; +.manage-institution__form { color: grey; + font-size: 0.9em; } -.manage-institution__send__invites > .subtitle { - font-size: 0.8em; - font-weight: 500; +.manage-institution__form__btns { + text-align: end; + margin-bottom: 1em; } -.manage-institution__send__invites md-input-container { +.manage-institution__form md-input-container { padding-right: 0; margin: 0; color: #9E9E9E; diff --git a/frontend/institution/manageInstitution/management_institution_mobile.html b/frontend/institution/manageInstitution/management_institution_mobile.html index 3914f36cd..470423917 100644 --- a/frontend/institution/manageInstitution/management_institution_mobile.html +++ b/frontend/institution/manageInstitution/management_institution_mobile.html @@ -7,8 +7,37 @@
    - -
    + +
    + + + + + + + +

    Qual a conexão da instituição {{inviteInstHierCtrl.invite.suggestion_institution_name}} + com {{inviteInstHierCtrl.institution.name}} ? +

    + + É uma instituição superior + É uma instituição subordinada + + +
    + + CANCELAR + + + ENVIAR + +
    +
    diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index 3a72edea3..e582b3960 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -954,11 +954,19 @@ md-radio-button.md-default-theme.md-checked .md-off, md-radio-button.md-checked } md-input-container:not(.md-input-invalid).md-input-focused .green-input, - md-input-container:not(.md-input-invalid).md-input-has-value.md-input-focused .green-input { +md-input-container:not(.md-input-invalid).md-input-has-value.md-input-focused .green-input { border-color:#009688; border-width: 0 0 2px; } +md-radio-button:not([disabled]).md-primary .md-on { + background-color: teal; +} + +md-radio-group:not([disabled]) .md-primary.md-checked .md-off { + border-color: teal; +} + .shared-survey{ padding-top :0px; margin-top : -25px; From 76b95c57fa7d28c0857d6fd89501143b1df5e2fe Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 11 Mar 2019 15:24:20 -0300 Subject: [PATCH 506/606] Making tests --- .../institution_member_handler_test.py | 21 +++++++++++++++---- .../post_handlers_tests/post_handler_test.py | 9 +++++++- .../reply_comment_handler_test.py | 11 ++++++++-- .../user_handlers_tests/user_handler_test.py | 7 +++++-- .../user_institutions_handler_test.py | 11 ++++++++-- 5 files changed, 48 insertions(+), 11 deletions(-) diff --git a/backend/test/institution_handlers_tests/institution_member_handler_test.py b/backend/test/institution_handlers_tests/institution_member_handler_test.py index e4825a0ce..8415e8af6 100644 --- a/backend/test/institution_handlers_tests/institution_member_handler_test.py +++ b/backend/test/institution_handlers_tests/institution_member_handler_test.py @@ -55,11 +55,12 @@ def setUp(cls): cls.second_user.put() # create headers cls.headers = {'Institution-Authorization': cls.institution.key.urlsafe()} - + + @patch('handlers.institution_members_handler.enqueue_task') @patch('handlers.institution_members_handler.send_message_notification') @patch('handlers.institution_members_handler.RemoveMemberEmailSender.send_email') @patch('util.login_service.verify_token', return_value={'email': 'user@gmail.com'}) - def test_delete_with_notification(self, verify_token, send_email, send_message_notification): + def test_delete_with_notification(self, verify_token, send_email, send_message_notification, enqueue_task): """Test if a notification is sent when the member is deleted.""" # Set up the second_user self.second_user.institutions = [self.institution.key, self.other_institution.key] @@ -98,11 +99,17 @@ def test_delete_with_notification(self, verify_token, send_email, send_message_n ) # Assert that send_email has been called send_email.assert_called() - + enqueue_task.assert_called_with('send-push-notification', { + 'type': 'DELETE_MEMBER', + 'receivers': [self.second_user.key.urlsafe()], + 'entity': self.institution.key.urlsafe() + }) + + @patch('handlers.institution_members_handler.enqueue_task') @patch('handlers.institution_members_handler.send_message_notification') @patch('handlers.institution_members_handler.RemoveMemberEmailSender.send_email') @patch('util.login_service.verify_token', return_value={'email': 'user@gmail.com'}) - def test_delete_member_with_one_institution(self, verify_token, send_email, send_message_notification): + def test_delete_member_with_one_institution(self, verify_token, send_email, send_message_notification, enqueue_task): """Test delete a member that belongs to only one institution.""" # new user third_user = mocks.create_user() @@ -124,6 +131,12 @@ def test_delete_member_with_one_institution(self, verify_token, send_email, send # Assert that send_email has been called send_email.assert_called() + send_email.assert_called() + enqueue_task.assert_called_with('send-push-notification', { + 'type': 'DELETE_MEMBER', + 'receivers': [third_user.key.urlsafe()], + 'entity': self.institution.key.urlsafe() + }) @patch('util.login_service.verify_token', return_value={'email': 'user@gmail.com'}) def test_delete(self, verify_token): diff --git a/backend/test/post_handlers_tests/post_handler_test.py b/backend/test/post_handlers_tests/post_handler_test.py index 040dc2e04..1af51bb50 100644 --- a/backend/test/post_handlers_tests/post_handler_test.py +++ b/backend/test/post_handlers_tests/post_handler_test.py @@ -242,9 +242,10 @@ def test_patch(self, verify_token): exception_message, expected_alert + raises_context_message) + @patch('handlers.post_handler.enqueue_task') @patch('handlers.post_handler.send_message_notification') @patch('util.login_service.verify_token', return_value={'email': 'first_user@gmail.com'}) - def test_delete_with_admin(self, verify_token, mock_method): + def test_delete_with_admin(self, verify_token, mock_method, enqueue_task): """Test delete a post with admin.""" self.first_user.add_permission( "remove_posts", self.institution.key.urlsafe()) @@ -261,6 +262,12 @@ def test_delete_with_admin(self, verify_token, mock_method): mock_method.assert_called() + enqueue_task.assert_called_with('send-push-notification', { + 'type': 'DELETE_POST', + 'entity': self.second_user_post.key.urlsafe(), + 'receivers': [self.second_user_post.author.urlsafe()] + }) + @patch('util.login_service.verify_token', return_value={'email': 'second_user@ccc.ufcg.edu.br'}) def test_delete_without_admin(self, verify_token): """Test delete a post with admin.""" diff --git a/backend/test/post_handlers_tests/reply_comment_handler_test.py b/backend/test/post_handlers_tests/reply_comment_handler_test.py index 3e900aad6..344ec30f4 100644 --- a/backend/test/post_handlers_tests/reply_comment_handler_test.py +++ b/backend/test/post_handlers_tests/reply_comment_handler_test.py @@ -58,10 +58,11 @@ def setUp(cls): cls.user_post = cls.user_post.key.get() cls.user_post.put() - + + @patch('handlers.reply_comment_handler.enqueue_task') @patch('handlers.reply_comment_handler.send_message_notification') @patch('util.login_service.verify_token', return_value={'email': THIRD_USER_EMAIL}) - def test_post(self, verify_token, send_message_notification): + def test_post(self, verify_token, send_message_notification, enqueue_task): """Reply a comment of post""" # Verify size of list other_user_comment = self.user_post.get_comment(self.other_user_comment.id) @@ -123,6 +124,12 @@ def test_post(self, verify_token, send_message_notification): ) ] send_message_notification.assert_has_calls(calls) + + enqueue_task.assert_called_with('send-push-notification', { + 'type': 'REPLY_COMMENT', + 'receivers': [self.other_user.key.urlsafe()], + 'entity': self.user_post.key.urlsafe() + }) @patch('handlers.reply_comment_handler.send_message_notification') @patch('util.login_service.verify_token', return_value={'email': THIRD_USER_EMAIL}) diff --git a/backend/test/user_handlers_tests/user_handler_test.py b/backend/test/user_handlers_tests/user_handler_test.py index 84854bc08..e981c0d07 100644 --- a/backend/test/user_handlers_tests/user_handler_test.py +++ b/backend/test/user_handlers_tests/user_handler_test.py @@ -94,10 +94,11 @@ def test_get(self, verify_token): user['institutions_admin'], [inst_admin_url], "The institutions_admin is different from the expected one" ) - + + @patch('handlers.user_handler.enqueue_task') @patch('handlers.user_handler.send_message_notification') @patch('util.login_service.verify_token') - def test_delete(self, verify_token, send_notification): + def test_delete(self, verify_token, send_notification, enqueue_task): """Test the user_handler's delete method.""" verify_token._mock_return_value = {'email': self.other_user.email[0]} # check the user properties before delete it @@ -144,6 +145,8 @@ def test_delete(self, verify_token, send_notification): send_notification.assert_called() + enqueue_task.assert_called() + @patch('util.login_service.verify_token') def test_patch(self, verify_token): diff --git a/backend/test/user_handlers_tests/user_institutions_handler_test.py b/backend/test/user_handlers_tests/user_institutions_handler_test.py index 9a4b872ca..c61d51b20 100644 --- a/backend/test/user_handlers_tests/user_institutions_handler_test.py +++ b/backend/test/user_handlers_tests/user_institutions_handler_test.py @@ -20,10 +20,11 @@ def setUp(cls): ], debug=True) cls.testapp = cls.webtest.TestApp(app) initModels(cls) - + + @patch('handlers.user_institutions_handler.enqueue_task') @patch('handlers.user_institutions_handler.LeaveInstitutionEmailSender.send_email') @patch('util.login_service.verify_token', return_value={'email': 'second_user@gmail.com'}) - def test_delete(self, verify_token, send_email): + def test_delete(self, verify_token, send_email, enqueue_task): """Test delete.""" # Assert the initial conditions self.assertTrue(self.second_user.key in self.institution.members) @@ -47,6 +48,12 @@ def test_delete(self, verify_token, send_email): # Assert that send_email has been called send_email.assert_called() + enqueue_task.assert_called_with('send-push-notification', { + 'type': 'LEFT_INSTITUTION', + 'receivers': [self.institution.admin.urlsafe()], + 'entity': self.second_user.key.urlsafe() + }) + def initModels(cls): """Init the tests' common models.""" From dab1696ae2e456b0684a146ce648526f579f8d27 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 11 Mar 2019 15:27:49 -0300 Subject: [PATCH 507/606] undo sw.js changes --- frontend/sw.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/sw.js b/frontend/sw.js index 0dd35bd4b..4bca0fe8a 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'spread-push-notifications-throughout-app'; + const CACHE_SUFIX = 'master'; let messaging; From 7483e198cab182e2132f70623cde6e1c618b3526 Mon Sep 17 00:00:00 2001 From: ruanres Date: Mon, 11 Mar 2019 15:48:59 -0300 Subject: [PATCH 508/606] added btn to pending request item --- .../manageInstitution/management_institution_mobile.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/institution/manageInstitution/management_institution_mobile.html b/frontend/institution/manageInstitution/management_institution_mobile.html index 470423917..26efb33a7 100644 --- a/frontend/institution/manageInstitution/management_institution_mobile.html +++ b/frontend/institution/manageInstitution/management_institution_mobile.html @@ -84,7 +84,9 @@ icon="account_balance" title="inviteInstHierCtrl.getReqInstName(instRequest)" subtitle="inviteInstHierCtrl.showMessage(instRequest)" - right-icon-btns="[]"> + right-icon-btns="[ + inviteInstHierCtrl.createIconBtn('error', inviteInstHierCtrl.analyseRequest, [$event, instRequest]), + ]">
    From e2813ba9db29a0bdff5b900f7581f1c75ad9e239 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Mon, 11 Mar 2019 16:46:13 -0300 Subject: [PATCH 509/606] create shared post component --- frontend/index.html | 1 + frontend/post/post_details.html | 3 +- frontend/post/sharedPost.component.js | 13 +++++++++ frontend/post/shared_post_mobile.html | 40 +++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 frontend/post/sharedPost.component.js create mode 100644 frontend/post/shared_post_mobile.html diff --git a/frontend/index.html b/frontend/index.html index 22d01fdac..5ae2c477f 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -219,6 +219,7 @@ + diff --git a/frontend/post/post_details.html b/frontend/post/post_details.html index 4a05f04bb..44632a593 100644 --- a/frontend/post/post_details.html +++ b/frontend/post/post_details.html @@ -108,7 +108,7 @@ - +
    ENQUETE FINALIZADA | {{postDetailsCtrl.post.shared_post.deadline | amUtc | amLocal | amCalendar:referenceTime:formats}}
    @@ -150,6 +150,7 @@ user="postDetailsCtrl.user" reload-post="postDetailsCtrl.reloadPost" isdialog="false">     + +
    + ENQUETE FINALIZADA | {{postDetailsCtrl.post.shared_post.deadline | amUtc | amLocal | amCalendar:referenceTime:formats}} +
    +
    + +
    + + {{ postDetailsCtrl.post.shared_post.institution_name }} + por {{ postDetailsCtrl.post.shared_post.author }} +
    +
    + + +
    From 1a958ec9ee6bf2c1c3ab9d9ad7a275889c462489 Mon Sep 17 00:00:00 2001 From: ruanres Date: Mon, 11 Mar 2019 16:48:17 -0300 Subject: [PATCH 510/606] removed the is-open component param --- .../manageInstitution/management_institution_mobile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/manageInstitution/management_institution_mobile.html b/frontend/institution/manageInstitution/management_institution_mobile.html index 26efb33a7..26f6e52a3 100644 --- a/frontend/institution/manageInstitution/management_institution_mobile.html +++ b/frontend/institution/manageInstitution/management_institution_mobile.html @@ -7,7 +7,7 @@
    - +
    From c62d96eab1304d2b2c20bbf76ef55367d2fdb9ce Mon Sep 17 00:00:00 2001 From: MaianaB Date: Mon, 11 Mar 2019 16:49:21 -0300 Subject: [PATCH 511/606] added images on analyse requests --- .../analyseHierarchyRequestController.js | 14 +++++-- .../requests/analyse_hierarchy_request.css | 11 +++-- .../analyse_hierarchy_request_dialog.html | 42 ++++++++++++++----- 3 files changed, 51 insertions(+), 16 deletions(-) diff --git a/frontend/requests/analyseHierarchyRequestController.js b/frontend/requests/analyseHierarchyRequestController.js index 24a446da5..9b7a92aeb 100644 --- a/frontend/requests/analyseHierarchyRequestController.js +++ b/frontend/requests/analyseHierarchyRequestController.js @@ -28,14 +28,22 @@ analyseHierReqCtrl.child = child; })(); + /** Show button accept if hasn't link to remove or + * if user in display on analyse institution hierarchie. + * + */ analyseHierReqCtrl.showButtonAccept = function(){ + console.log(); return !analyseHierReqCtrl.hasToRemoveLink || analyseHierReqCtrl.hasToRemoveLink && analyseHierReqCtrl.analyseInstitutions; - } + }; - analyseHierReqCtrl.isDescriptionRemoveLink = function(){ + /** Show description that informes to user that + * he's need remove old link before accept new link; + */ + analyseHierReqCtrl.showDescToRemoveLink = function(){ return analyseHierReqCtrl.hasToRemoveLink && !analyseHierReqCtrl.analyseInstitutions; - } + }; analyseHierReqCtrl.confirmRequest = function confirmRequest() { analyseHierReqCtrl.hasToRemoveLink ? confirmLinkRemoval() : acceptRequest(); diff --git a/frontend/requests/analyse_hierarchy_request.css b/frontend/requests/analyse_hierarchy_request.css index be3651fc7..609f0a7ef 100644 --- a/frontend/requests/analyse_hierarchy_request.css +++ b/frontend/requests/analyse_hierarchy_request.css @@ -1,11 +1,16 @@ -.analyse_request__description{ +.analyse-request__description{ color: #707070; } -.analyse_request__dialog{ +.analyse-request__dialog{ max-height: 90%; } -.analyse_request__margin_bottom{ +.analyse-request__green-bar{ + width: 8px; + background-color: #009688; +} + +.analyse-request__margin-bottom{ margin:0 0 8px 0; } \ No newline at end of file diff --git a/frontend/requests/analyse_hierarchy_request_dialog.html b/frontend/requests/analyse_hierarchy_request_dialog.html index 45fb727f0..4899ee828 100644 --- a/frontend/requests/analyse_hierarchy_request_dialog.html +++ b/frontend/requests/analyse_hierarchy_request_dialog.html @@ -1,16 +1,38 @@ - +

    Confirmar vínculo

    -

    +

    Para aceitar o vínculo e tornar {{ analyseHierReqCtrl.child.name }} uma subornadinada de - {{ analyseHierReqCtrl.parent.name }}. Clique em aceitar, caso não queira se vincular a esta instituição clique em rejeitar. + {{ analyseHierReqCtrl.parent.name }}, clique em aceitar. Caso não queira se vincular a esta instituição clique em rejeitar.

    + +
    + + +
    +
    +
    +
    +
    + + +
    +
    +
    -
    +

    Confirmar remoção de vínculo existente

    -

    +

    Para aceitar o vínculo e tornar {{ analyseHierReqCtrl.child.name }} uma subornadinada de {{ analyseHierReqCtrl.parent.name }} é necessário que o vínculo com {{ analyseHierReqCtrl.child.parent_institution.name }} seja desfeito. Clique em aceitar, para visualizar a alteração de vínculo, caso não queira se vincular a esta instituição clique em rejeitar. @@ -20,14 +42,14 @@

    Confirmar remoção de vínculo existente

    Vínculo Atual

    -
    +
    Vínculo Futuro
    -
    +
    Vínculo Futuro

    Avançar + ng-if="analyseHierReqCtrl.showDescToRemoveLink()"> Avançar From 42e12f398c907f52bb7d641415821f26dc20362f Mon Sep 17 00:00:00 2001 From: MaianaB Date: Mon, 11 Mar 2019 16:57:54 -0300 Subject: [PATCH 512/606] remove console --- frontend/requests/analyseHierarchyRequestController.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/requests/analyseHierarchyRequestController.js b/frontend/requests/analyseHierarchyRequestController.js index 9b7a92aeb..941582898 100644 --- a/frontend/requests/analyseHierarchyRequestController.js +++ b/frontend/requests/analyseHierarchyRequestController.js @@ -33,7 +33,6 @@ * */ analyseHierReqCtrl.showButtonAccept = function(){ - console.log(); return !analyseHierReqCtrl.hasToRemoveLink || analyseHierReqCtrl.hasToRemoveLink && analyseHierReqCtrl.analyseInstitutions; }; From eda6acf231bf242d0a2bfee9cc1998f9ece2003f Mon Sep 17 00:00:00 2001 From: MaianaB Date: Mon, 11 Mar 2019 17:52:53 -0300 Subject: [PATCH 513/606] added layout grid --- .../requests/analyse_hierarchy_request.css | 11 ++++ .../analyse_hierarchy_request_dialog.html | 60 ++++++++----------- 2 files changed, 35 insertions(+), 36 deletions(-) diff --git a/frontend/requests/analyse_hierarchy_request.css b/frontend/requests/analyse_hierarchy_request.css index 609f0a7ef..51f2ed1bc 100644 --- a/frontend/requests/analyse_hierarchy_request.css +++ b/frontend/requests/analyse_hierarchy_request.css @@ -13,4 +13,15 @@ .analyse-request__margin-bottom{ margin:0 0 8px 0; +} + +.analyse-request__children-inst{ + display: grid; + grid-template-columns: 25px auto; +} + +@media screen and (max-width: 420px){ + .analyse-request__children-inst{ + grid-template-columns: 15px auto; + } } \ No newline at end of file diff --git a/frontend/requests/analyse_hierarchy_request_dialog.html b/frontend/requests/analyse_hierarchy_request_dialog.html index 4899ee828..24c9a86f1 100644 --- a/frontend/requests/analyse_hierarchy_request_dialog.html +++ b/frontend/requests/analyse_hierarchy_request_dialog.html @@ -15,18 +15,14 @@

    Confirmar vínculo

    title="analyseHierReqCtrl.parent.name" subtitle="analyseHierReqCtrl.parent.institutional_email"> -
    -
    -
    -
    -
    - - -
    +
    +
    + +
    @@ -47,18 +43,14 @@

    Vínculo Atual

    title="analyseHierReqCtrl.child.parent_institution.name" subtitle="analyseHierReqCtrl.child.parent_institution.institutional_email"> -
    -
    -
    -
    -
    - - -
    +
    +
    + +
    @@ -71,18 +63,14 @@

    Vínculo Futuro

    title="analyseHierReqCtrl.parent.name" subtitle="analyseHierReqCtrl.parent.institutional_email"> -
    -
    -
    -
    -
    - - -
    +
    +
    + +

    From fa5e3233400044aad5ad212d1e64cc90b849ce61 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 11 Mar 2019 22:24:51 -0300 Subject: [PATCH 514/606] solving requested issues --- .../push_notification/push_notification_service.py | 11 ----------- .../institution_member_handler_test.py | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/backend/push_notification/push_notification_service.py b/backend/push_notification/push_notification_service.py index 002994917..1eca35de4 100644 --- a/backend/push_notification/push_notification_service.py +++ b/backend/push_notification/push_notification_service.py @@ -158,7 +158,6 @@ def __get_link_props(self): } def __get_delete_member_props(self): - """.""" url = '/institution/%s/home' %self.entity.key.urlsafe() return { @@ -168,7 +167,6 @@ def __get_delete_member_props(self): } def __get_remove_inst_link_props(self): - """.""" url = '/institution/%s/inviteInstitution' %self.entity.key.urlsafe() return { @@ -178,7 +176,6 @@ def __get_remove_inst_link_props(self): } def __get_create_post_props(self): - """.""" url = '/posts/%s' %self.entity.key.urlsafe() return { @@ -188,7 +185,6 @@ def __get_create_post_props(self): } def __get_delete_post_props(self): - """.""" url = '/' admin_name = self.entity.institution.get().admin.get().name @@ -199,7 +195,6 @@ def __get_delete_post_props(self): } def __get_reply_comment_props(self): - """.""" url = '/posts/%s' %self.entity.key.urlsafe() return { @@ -209,7 +204,6 @@ def __get_reply_comment_props(self): } def __get_deleted_user_props(self): - """.""" return { 'title': 'Usuário inativo', 'body': '%s não está mais ativo na plataforma' %self.entity.name, @@ -217,7 +211,6 @@ def __get_deleted_user_props(self): } def __get_left_institution_props(self): - """.""" return { 'title': 'Remoção de vínculo de membro', 'body': '%s removeu o vínculo com uma das instituições que você administra' %self.entity.name, @@ -225,7 +218,6 @@ def __get_left_institution_props(self): } def __get_invite_props(self): - """.""" url = '%s/new_invite' %self.entity.key.urlsafe() return { 'title': 'Novo convite', @@ -234,7 +226,6 @@ def __get_invite_props(self): } def __get_deleted_institution_props(self): - """.""" return { 'title': 'Instituição removida', 'body': 'A instituição %s foi removida' %self.entity.name, @@ -242,7 +233,6 @@ def __get_deleted_institution_props(self): } def __get_deleted_event_props(self): - """.""" return { 'title': 'Evento removido', 'body': 'O evento %s foi removido' %self.entity.title, @@ -250,7 +240,6 @@ def __get_deleted_event_props(self): } def __get_updated_event_props(self): - """.""" return { 'title': 'Evento editado', 'body': 'O evento %s foi editado' %self.entity.title, diff --git a/backend/test/institution_handlers_tests/institution_member_handler_test.py b/backend/test/institution_handlers_tests/institution_member_handler_test.py index 8415e8af6..1f085fc91 100644 --- a/backend/test/institution_handlers_tests/institution_member_handler_test.py +++ b/backend/test/institution_handlers_tests/institution_member_handler_test.py @@ -131,7 +131,7 @@ def test_delete_member_with_one_institution(self, verify_token, send_email, send # Assert that send_email has been called send_email.assert_called() - send_email.assert_called() + enqueue_task.assert_called_with('send-push-notification', { 'type': 'DELETE_MEMBER', 'receivers': [third_user.key.urlsafe()], From 17be4ceba6e611298c8d0f604eb9b2684b0bd2da Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 11 Mar 2019 23:32:11 -0300 Subject: [PATCH 515/606] hiding showtoast for mobile in success cases --- frontend/utils/messageService.js | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/frontend/utils/messageService.js b/frontend/utils/messageService.js index a72f30893..3a13f53cd 100644 --- a/frontend/utils/messageService.js +++ b/frontend/utils/messageService.js @@ -44,17 +44,23 @@ }; service.showToast = function showToast(message) { - message = customMessage(message); - $mdToast.show( - $mdToast.simple() - .textContent(message) - .action('FECHAR') - .highlightAction(true) - .hideDelay(5000) - .position('bottom right') - ); + if(! hideToast(message)) { + message = customMessage(message); + $mdToast.show( + $mdToast.simple() + .textContent(message) + .action('FECHAR') + .highlightAction(true) + .hideDelay(5000) + .position('bottom right') + ); + } }; + function hideToast (message) { + return Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE) && message.includes('sucesso'); + } + function customMessage(message) { return (message && msg[message.code]) || msg[message] || message; } From 49f9b118e8a7f05241e72bcee7d889ac4035cb9b Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Mon, 11 Mar 2019 23:36:27 -0300 Subject: [PATCH 516/606] adding missing dependecy --- frontend/utils/messageService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/utils/messageService.js b/frontend/utils/messageService.js index 3a13f53cd..5859a0580 100644 --- a/frontend/utils/messageService.js +++ b/frontend/utils/messageService.js @@ -3,7 +3,7 @@ (function() { var app = angular.module("app"); - app.service("MessageService", function MessageService($mdToast, $mdDialog) { + app.service("MessageService", function MessageService($mdToast, $mdDialog, SCREEN_SIZES) { var service = this; var msg = { From 50d6bb058938035a33f6052825a28f605fcf2c7f Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 12 Mar 2019 08:20:45 -0300 Subject: [PATCH 517/606] Create shared_post_desktop.html --- frontend/post/post_details.html | 42 -------------------------- frontend/post/sharedPost.component.js | 2 +- frontend/post/shared_post_desktop.html | 42 ++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 frontend/post/shared_post_desktop.html diff --git a/frontend/post/post_details.html b/frontend/post/post_details.html index 44632a593..ebed0b301 100644 --- a/frontend/post/post_details.html +++ b/frontend/post/post_details.html @@ -108,48 +108,6 @@ - -
    - ENQUETE FINALIZADA | {{postDetailsCtrl.post.shared_post.deadline | amUtc | amLocal | amCalendar:referenceTime:formats}} -
    - - - - - -     - {{ postDetailsCtrl.post.shared_post.institution_name }} - por {{ postDetailsCtrl.post.shared_post.author }} - - - - - -
    - -
    -

    -     - {{ postDetailsCtrl.post.shared_post.title }} - -

    - - - - - diff --git a/frontend/post/sharedPost.component.js b/frontend/post/sharedPost.component.js index c784711fe..6eebc0d24 100644 --- a/frontend/post/sharedPost.component.js +++ b/frontend/post/sharedPost.component.js @@ -3,7 +3,7 @@ const app = angular.module('app'); app.component('sharedPost', { - templateUrl: 'app/post/shared_post_mobile.html', + templateUrl: Utils.selectFieldBasedOnScreenSize('app/post/shared_post_desktop.html', 'app/post/shared_post_mobile.html', 600), controller: 'PostDetailsController', controllerAs: 'postDetailsCtrl', bindings: { diff --git a/frontend/post/shared_post_desktop.html b/frontend/post/shared_post_desktop.html new file mode 100644 index 000000000..4368b13a0 --- /dev/null +++ b/frontend/post/shared_post_desktop.html @@ -0,0 +1,42 @@ + +
    + ENQUETE FINALIZADA | {{postDetailsCtrl.post.shared_post.deadline | amUtc | amLocal | amCalendar:referenceTime:formats}} +
    + + + + + + + {{ postDetailsCtrl.post.shared_post.institution_name }} + por {{ postDetailsCtrl.post.shared_post.author }} + + + + + +
    + +
    +

    + + {{ postDetailsCtrl.post.shared_post.title }} + +

    + + + +     +     \ No newline at end of file From f86689662f3b7e5eb4eab17fc5eb3e206924017a Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 12 Mar 2019 08:40:17 -0300 Subject: [PATCH 518/606] Create shared_post.css --- frontend/index.html | 1 + frontend/post/shared_post.css | 21 +++++++++++++++++++++ frontend/post/shared_post_mobile.html | 10 +++++----- 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 frontend/post/shared_post.css diff --git a/frontend/index.html b/frontend/index.html index 5ae2c477f..eaef04a1f 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -81,6 +81,7 @@ + diff --git a/frontend/post/shared_post.css b/frontend/post/shared_post.css new file mode 100644 index 000000000..478760b3f --- /dev/null +++ b/frontend/post/shared_post.css @@ -0,0 +1,21 @@ +.shared-post__header { + display: grid; + grid-template-columns: min-content 1fr; + padding: 8px 8px 0 8px; + grid-column-gap: 10px; +} + +.shared-post__img { + border-radius: 50%; +} + +.shared-post__title { + display: grid; + grid-template-rows: auto auto; + font-size: 14px; + color: rgb(117, 117, 117); +} + +.shared-post__body { + padding: 16px; +} \ No newline at end of file diff --git a/frontend/post/shared_post_mobile.html b/frontend/post/shared_post_mobile.html index 2cd83859e..1236f8e8f 100644 --- a/frontend/post/shared_post_mobile.html +++ b/frontend/post/shared_post_mobile.html @@ -2,16 +2,16 @@
    ENQUETE FINALIZADA | {{postDetailsCtrl.post.shared_post.deadline | amUtc | amLocal | amCalendar:referenceTime:formats}}
    -
    - -
    +
    + +
    {{ postDetailsCtrl.post.shared_post.institution_name }} - por {{ postDetailsCtrl.post.shared_post.author }} + por {{ postDetailsCtrl.post.shared_post.author }}
    -
    +
    From b3281c8cb15c6cec981c451f67c0827c5a47e2f6 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 12 Mar 2019 08:47:51 -0300 Subject: [PATCH 519/606] fixed test and created jsDoc to functions --- frontend/app.js | 2 +- .../invites/inviteInstHierarchieController.js | 16 ++++++++++++++++ .../inviteInstHierarchieControllerSpec.js | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/frontend/app.js b/frontend/app.js index 6378a0eae..7259269aa 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -639,6 +639,6 @@ } (function main() { - // initServiceWorker(); + initServiceWorker(); })(); })(); \ No newline at end of file diff --git a/frontend/invites/inviteInstHierarchieController.js b/frontend/invites/inviteInstHierarchieController.js index 5aacb0634..3f90955a8 100644 --- a/frontend/invites/inviteInstHierarchieController.js +++ b/frontend/invites/inviteInstHierarchieController.js @@ -357,6 +357,14 @@ return institution.parent_institution && institution.parent_institution === inviteInstHierCtrl.institution.key ? "confirmado" : "não confirmado"; }; + /** + * Gets the correspondent link status message depending on the + * the link status itself and on whether the given institution + * is active or not + * @param {object} - institution that is linked with the user's current institution + * @param {boolean} - isParent flag, if true indicates that the given institution is parent + * of the user's current institution + */ inviteInstHierCtrl.getStatusMsg = (institution, isParent) => { const status = isParent ? inviteInstHierCtrl.linkParentStatus() : inviteInstHierCtrl.linkChildrenStatus(institution); if(inviteInstHierCtrl.isActive(institution)) { @@ -417,6 +425,14 @@ return Utils.limitString(string, size); }; + /** + * Generates an object with the properties used to create an rightIconBtn + * in the EntityShowCase component + * @param {string} - icon tho be showed as a button + * @param {function} - action function to be called when the button is clicked + * @param {array} - params that will be necessary to action function to be called + * @param {boolean} - hideBtn flag used to hide the button if true + */ inviteInstHierCtrl.createIconBtn = (icon, action, params, hideBtn) => { return { icon: icon, diff --git a/frontend/test/specs/invites/inviteInstHierarchieControllerSpec.js b/frontend/test/specs/invites/inviteInstHierarchieControllerSpec.js index ca3b47245..e4bf3ba46 100644 --- a/frontend/test/specs/invites/inviteInstHierarchieControllerSpec.js +++ b/frontend/test/specs/invites/inviteInstHierarchieControllerSpec.js @@ -104,6 +104,7 @@ state.params.institutionKey = institution.key; inviteInstHierarchieCtrl = createCtrl(); + inviteInstHierarchieCtrl.$onInit(); expect(requestInvitationService.getParentRequests).toHaveBeenCalled(); expect(requestInvitationService.getChildrenRequests).toHaveBeenCalled(); From 85af342014894eb4d096c360f459c5b2e83f0e18 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 12 Mar 2019 08:52:15 -0300 Subject: [PATCH 520/606] Merge with responsive --- frontend/index.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index ca4827c2b..6218da443 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -82,11 +82,8 @@ -<<<<<<< HEAD -======= ->>>>>>> responsive From 1b66400717ee22b73af3dc1cbf031caa92d729e3 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Mar 2019 09:10:32 -0300 Subject: [PATCH 521/606] Change loadInstitution to return a promise --- frontend/institution/createInvitedInstitutionController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index d7acde5a4..c3f46d704 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -21,7 +21,7 @@ } ctrl.loadInstitution = () => { - InstitutionService.getInstitution(ctrl.institutionKey).then(res => { + return InstitutionService.getInstitution(ctrl.institutionKey).then(res => { ctrl.newInstitution = res; ctrl.suggestedName = res.name; observer = ObserverRecorderService.register(ctrl.newInstitution); From b12aa9d6a32bdbc2c8795e083e93adc6cf0fdd63 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 12 Mar 2019 09:12:19 -0300 Subject: [PATCH 522/606] created template for the invite institution mobile page --- frontend/app.js | 5 ++++- frontend/invites/invite_institution_mobile.html | 0 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 frontend/invites/invite_institution_mobile.html diff --git a/frontend/app.js b/frontend/app.js index c588aa15e..b0309bb27 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -108,7 +108,10 @@ url: "/inviteInstitution", views: { user_content: { - templateUrl: "app/invites/invite_institution.html", + templateUrl: Utils.selectFieldBasedOnScreenSize( + "app/invites/invite_institution.html", + "app/invites/invite_institution_mobile.html", + SCREEN_SIZES.SMARTPHONE), controller: "InviteInstitutionController as inviteInstCtrl" } } diff --git a/frontend/invites/invite_institution_mobile.html b/frontend/invites/invite_institution_mobile.html new file mode 100644 index 000000000..e69de29bb From 8e292dd3a95b7eea40d94baf4141f36bc36b7aab Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Mar 2019 09:11:03 -0300 Subject: [PATCH 523/606] Fix $onInit test and add loadInstitution test --- .../createInvitedInstitutionSpec.js | 111 +++++++++++++----- 1 file changed, 82 insertions(+), 29 deletions(-) diff --git a/frontend/test/specs/institution/createInvitedInstitutionSpec.js b/frontend/test/specs/institution/createInvitedInstitutionSpec.js index 7bdd8a66a..ab5ac07e5 100644 --- a/frontend/test/specs/institution/createInvitedInstitutionSpec.js +++ b/frontend/test/specs/institution/createInvitedInstitutionSpec.js @@ -67,8 +67,9 @@ describe('Test CreateInvitedInstitutionController', function() { beforeEach(module('app')); - beforeEach(inject(($controller, $httpBackend, $state, STATES, InviteService, InstitutionService, AuthService, ImageService) => { + beforeEach(inject(($controller, $httpBackend, $state, STATES, InviteService, InstitutionService, AuthService, ImageService, $rootScope) => { state = $state; + scope = $rootScope.$new(); statesConst = STATES; authService = AuthService; imageService = ImageService; @@ -86,27 +87,13 @@ describe('Test CreateInvitedInstitutionController', function() { })); describe('$onInit', () => { - it('should load the institution default data', () => { - spyOn(institutionService, 'getInstitution').and.callFake(() => { - return { - then: callback => { - return callback(emptyInstitution); - }, - } - }) + it('should call initialization methods when theres a inst key', () => { + spyOn(ctrl, 'loadInstitution').and.callFake(() => Promise.resolve()); + spyOn(authService, 'getCurrentUser').and.callFake(() => Promise.resolve()); ctrl.$onInit(); - expect(ctrl.newInstitution).toEqual(emptyInstitution); - expect(ctrl.suggestedName).toEqual(emptyInstitution.name); - expect(ctrl.newInstitution.photo_url).toEqual('app/images/institution.png'); - const newAddress = ctrl.newInstitution.address; - _.mapKeys(newAddress, (value, key) => { - if (key === 'country') { - expect(value).toEqual('Brasil'); - } else { - expect(value).toEqual(''); - } - }); + expect(authService.getCurrentUser).toHaveBeenCalled(); + expect(ctrl.loadInstitution).toHaveBeenCalled(); }); it('should redirect to STATES.HOME when theres no institution key', () => { @@ -117,17 +104,83 @@ describe('Test CreateInvitedInstitutionController', function() { }); }); + describe('loadInstitution', () => { + it('should load default institution data', (done) => { + spyOn(institutionService, 'getInstitution').and.callFake(() => Promise.resolve(emptyInstitution)); + ctrl.institutionKey = 'inst-key'; + + ctrl.loadInstitution().then(() => { + expect(institutionService.getInstitution).toHaveBeenCalledWith(institution.key); + expect(ctrl.newInstitution).toBe(emptyInstitution); + expect(ctrl.suggestedName).toEqual(emptyInstitution.name); + expect(ctrl.newInstitution.photo_url).toEqual('app/images/institution.png'); + const newAddress = ctrl.newInstitution.address; + _.mapKeys(newAddress, (value, key) => { + if (key === 'country') { + expect(value).toEqual('Brasil'); + } else { + expect(value).toEqual(''); + } + }); + + done(); + }); + }); + }); + describe('nextStep', () => { + beforeEach(() => { + // Assign a valid institution, + // so we can both test acceptance, + // and strip values to test for rejections + ctrl.newInstitution = institution; + }); + describe('rejections', () => { - beforeEach(() => { - spyOn(institutionService, 'getInstitution').and.callFake(() => { - return { - then: callback => { - return callback(emptyInstitution); - }, - } - }) - ctrl.$onInit(); + + describe('first step', () => { + describe('when country is Brasil', () => { + beforeEach(() => { + ctrl.newInstitution.address = { + country: 'Brasil', + street: 'Street', + federal_state: 'State', + neighbourhood: 'Neighbourhood', + city: 'City', + cep: '12345-768' + } + }); + + it('should reject empty street', () => { + ctrl.newInstitution.address.street = ''; + ctrl.nextStep(); + expect(ctrl.currentStep).toEqual(0); + }); + + it('should reject empty city', () => { + ctrl.newInstitution.address.city = ''; + ctrl.nextStep(); + expect(ctrl.currentStep).toEqual(0); + }); + + it('should reject empty state', () => { + ctrl.newInstitution.address.federal_state = ''; + ctrl.nextStep(); + expect(ctrl.currentStep).toEqual(0); + }); + + it('should reject empty neighbourhood', () => { + ctrl.newInstitution.address.cep = ''; + ctrl.nextStep(); + expect(ctrl.currentStep).toEqual(0); + }); + + it('should reject empty cep', () => { + ctrl.newInstitution.address.cep = ''; + ctrl.nextStep(); + expect(ctrl.currentStep).toEqual(0); + }); + }); }); it('should reject invalid first step', () => { From 36c31409f221bfafdda9661a3b92b75f95bd2bc7 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 12 Mar 2019 09:38:15 -0300 Subject: [PATCH 524/606] added cards --- frontend/index.html | 1 + .../invites/invite_institution_mobile.css | 42 +++++++++++++++++++ .../invites/invite_institution_mobile.html | 14 +++++++ 3 files changed, 57 insertions(+) create mode 100644 frontend/invites/invite_institution_mobile.css diff --git a/frontend/index.html b/frontend/index.html index b3f9bdb3b..8fa517926 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -58,6 +58,7 @@ + diff --git a/frontend/invites/invite_institution_mobile.css b/frontend/invites/invite_institution_mobile.css new file mode 100644 index 000000000..c769a55e8 --- /dev/null +++ b/frontend/invites/invite_institution_mobile.css @@ -0,0 +1,42 @@ +.invite-inst { + display: grid; + padding: 1em 0; + margin-top: 15%; +} + +.invite-inst__toolbar__title { + color: #737474; + text-transform: uppercase; + white-space: nowrap; +} + +.invite-inst__cards { + grid-row-start: 2; + display: grid; + grid-row-gap: 1em; +} + +.invite-inst__card__content { + display: grid; + grid-row-gap: 1em; +} + +.invite-inst__send__invites md-input-container { + padding-right: 0; + margin: 0; + color: #9E9E9E; +} + +.invite-inst__btn { + width: min-content; + justify-self: end; + background-color: #009688; + color: white; + margin-right: 0; +} + +.invite-inst__list { + display: grid; + grid-row-gap: 0.5em; + max-height: 18em; +} diff --git a/frontend/invites/invite_institution_mobile.html b/frontend/invites/invite_institution_mobile.html index e69de29bb..8ed7b865f 100644 --- a/frontend/invites/invite_institution_mobile.html +++ b/frontend/invites/invite_institution_mobile.html @@ -0,0 +1,14 @@ + + + + +
    + + + + +
    +     \ No newline at end of file From fbdcaf8dd23684a97ddba1af1ada9601df3266ba Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 12 Mar 2019 09:47:02 -0300 Subject: [PATCH 525/606] fix shared post dialog mobile --- frontend/post/share_post_dialog_mobile.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/post/share_post_dialog_mobile.html b/frontend/post/share_post_dialog_mobile.html index 7fcf5b21a..5da90ebe6 100644 --- a/frontend/post/share_post_dialog_mobile.html +++ b/frontend/post/share_post_dialog_mobile.html @@ -1,7 +1,7 @@ \ No newline at end of file From 86070b80e2d5efda122a54941272422ac281394a Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 12 Mar 2019 12:47:25 -0300 Subject: [PATCH 526/606] created form to invite institution --- .../invites/invite_institution_mobile.css | 7 ++++- .../invites/invite_institution_mobile.html | 27 ++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/frontend/invites/invite_institution_mobile.css b/frontend/invites/invite_institution_mobile.css index c769a55e8..5fd2cfafd 100644 --- a/frontend/invites/invite_institution_mobile.css +++ b/frontend/invites/invite_institution_mobile.css @@ -21,12 +21,17 @@ grid-row-gap: 1em; } -.invite-inst__send__invites md-input-container { +.invite-inst__card__content md-input-container { padding-right: 0; margin: 0; color: #9E9E9E; } +.invite-inst__btns { + text-align: end; + margin-bottom: 0.5em; +} + .invite-inst__btn { width: min-content; justify-self: end; diff --git a/frontend/invites/invite_institution_mobile.html b/frontend/invites/invite_institution_mobile.html index 8ed7b865f..afeee04c2 100644 --- a/frontend/invites/invite_institution_mobile.html +++ b/frontend/invites/invite_institution_mobile.html @@ -6,7 +6,32 @@
    - + +
    + + + + + + + + +
    + + CANCELAR + + + ENVIAR + +
    +
    +     From 4a510443c6f653049a8c7c0104e9c69a43da61f5 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 12 Mar 2019 13:40:33 -0300 Subject: [PATCH 527/606] Add check if is current page --- frontend/institution/allInstitutionsController.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/institution/allInstitutionsController.js b/frontend/institution/allInstitutionsController.js index 7f056b9f8..6ea2eab87 100644 --- a/frontend/institution/allInstitutionsController.js +++ b/frontend/institution/allInstitutionsController.js @@ -24,11 +24,13 @@ * {string} nextTab */ allInstitutionsCtrl.changeTab = function changeTab(nextTab) { - allInstitutionsCtrl.currentTab = ( - possibleTabs.includes(nextTab) ? nextTab : allInstitutionsCtrl.currentTab); - - currentPage = 0; - loadInstitutions(); + if (nextTab !== allInstitutionsCtrl.currentTab) { + allInstitutionsCtrl.currentTab = ( + possibleTabs.includes(nextTab) ? nextTab : allInstitutionsCtrl.currentTab); + + currentPage = 0; + loadInstitutions(); + } }; /** From f9aae6ec2205f9303d78cea424a33284a996a528 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Mar 2019 14:08:32 -0300 Subject: [PATCH 528/606] Add first step validation spec --- .../createInvitedInstitutionSpec.js | 150 ++++++++---------- 1 file changed, 66 insertions(+), 84 deletions(-) diff --git a/frontend/test/specs/institution/createInvitedInstitutionSpec.js b/frontend/test/specs/institution/createInvitedInstitutionSpec.js index ab5ac07e5..17680b1f7 100644 --- a/frontend/test/specs/institution/createInvitedInstitutionSpec.js +++ b/frontend/test/specs/institution/createInvitedInstitutionSpec.js @@ -128,7 +128,7 @@ describe('Test CreateInvitedInstitutionController', function() { }); }); - describe('nextStep', () => { + describe('isCurrentStepValid', () => { beforeEach(() => { // Assign a valid institution, // so we can both test acceptance, @@ -136,100 +136,82 @@ describe('Test CreateInvitedInstitutionController', function() { ctrl.newInstitution = institution; }); - describe('rejections', () => { - - describe('first step', () => { - describe('when country is Brasil', () => { - beforeEach(() => { - ctrl.newInstitution.address = { - country: 'Brasil', - street: 'Street', - federal_state: 'State', - neighbourhood: 'Neighbourhood', - city: 'City', - cep: '12345-768' - } - }); - - it('should reject empty street', () => { - ctrl.newInstitution.address.street = ''; - ctrl.nextStep(); - expect(ctrl.currentStep).toEqual(0); - }); - - it('should reject empty city', () => { - ctrl.newInstitution.address.city = ''; - ctrl.nextStep(); - expect(ctrl.currentStep).toEqual(0); - }); - - it('should reject empty state', () => { - ctrl.newInstitution.address.federal_state = ''; - ctrl.nextStep(); - expect(ctrl.currentStep).toEqual(0); - }); - - it('should reject empty neighbourhood', () => { - ctrl.newInstitution.address.cep = ''; - ctrl.nextStep(); - expect(ctrl.currentStep).toEqual(0); - }); - - it('should reject empty cep', () => { - ctrl.newInstitution.address.cep = ''; - ctrl.nextStep(); - expect(ctrl.currentStep).toEqual(0); - }); + describe('first step', () => { + describe('when country is Brasil', () => { + beforeEach(() => { + ctrl.newInstitution.address = { + country: 'Brasil', + street: 'Street', + federal_state: 'State', + neighbourhood: 'Neighbourhood', + city: 'City', + cep: '12345-768' + } + + ctrl.currentStep = 0; }); - }); - it('should reject invalid first step', () => { - expect(ctrl.currentStep).toEqual(0); - ctrl.nextStep(); - expect(ctrl.currentStep).toEqual(0); - }); + it('should reject empty street', () => { + ctrl.newInstitution.address.street = ''; + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeFalsy(); + }); - it('should reject invalid second step', () => { - ctrl.currentStep = 1; - expect(ctrl.currentStep).toEqual(1); - ctrl.nextStep(); - expect(ctrl.currentStep).toEqual(1); - }); + it('should reject empty city', () => { + ctrl.newInstitution.address.city = ''; + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeFalsy(); + }); - it('should reject invalid third step', () => { - ctrl.currentStep = 2; - expect(ctrl.currentStep).toEqual(2); - ctrl.nextStep(); - expect(ctrl.currentStep).toEqual(2); - }); - }); + it('should reject empty state', () => { + ctrl.newInstitution.address.federal_state = ''; + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeFalsy(); + }); - describe('acceptations', () => { - beforeEach(() => { - ctrl.newInstitution = institution; - }); + it('should reject empty neighbourhood', () => { + ctrl.newInstitution.address.cep = ''; + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeFalsy(); + }); - it('should accept valid first step', () => { - expect(ctrl.currentStep).toEqual(0); - ctrl.nextStep(); - expect(ctrl.currentStep).toEqual(1); - }); + it('should reject empty cep', () => { + ctrl.newInstitution.address.cep = ''; + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeFalsy(); + }); - it('should accept valid second step', () => { - ctrl.currentStep = 1; - expect(ctrl.currentStep).toEqual(1); - ctrl.nextStep(); - expect(ctrl.currentStep).toEqual(2); + it('should accept a complete address', () => { + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeTruthy(); + }); }); - it('should accept valid third step', () => { - ctrl.currentStep = 2; - expect(ctrl.currentStep).toEqual(2); - ctrl.nextStep(); - expect(ctrl.currentStep).toEqual(3); + describe('when its a foreign country', () => { + beforeEach(() => { + ctrl.newInstitution.address = { + country: 'Argentina', + street: '', + federal_state: '', + neighbourhood: '', + city: '', + cep: '' + }; + ctrl.currentStep = 0; + }); + + it('should reject a empty country', () => { + ctrl.newInstitution.address.country = ''; + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeFalsy(); + }); + + it('should accept an address with only its country present', () => { + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeTruthy(); + }); }); }); }); - }); From 43548f6cf54a9599c5a5cfc1d84d62fcceba40af Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Tue, 12 Mar 2019 14:24:36 -0300 Subject: [PATCH 529/606] Showing the result of event search --- backend/search_module/search_event.py | 16 +++-- frontend/event/event_card.html | 2 +- frontend/event/events_mobile.html | 1 - frontend/search/searchController.js | 5 +- frontend/search/search_event.html | 96 ++++++++++++--------------- 5 files changed, 58 insertions(+), 62 deletions(-) diff --git a/backend/search_module/search_event.py b/backend/search_module/search_event.py index 3024198f3..2832fda38 100644 --- a/backend/search_module/search_event.py +++ b/backend/search_module/search_event.py @@ -44,8 +44,12 @@ def createDocument(self, event): content = { 'id': event.key.urlsafe(), 'state': event.state, + 'title': event.title, 'institution_name': event.institution_name, + 'institution_key': event.institution_key.urlsafe(), + 'photo_url': event.photo_url, 'institution_acronym': event.institution_acronym, + 'start_time': event.start_time.isoformat(), 'country': event.address and event.address.country, 'federal_state': event.address and event.address.federal_state, 'city': event.address and event.address.city @@ -57,8 +61,12 @@ def createDocument(self, event): doc_id=content['id'], fields=[ search.TextField(name='state', value=content['state']), + search.TextField(name='title', value=content['title']), search.TextField(name='institution_name', value=content['institution_name']), + search.TextField(name='institution_key', value=content['institution_key']), + search.TextField(name='photo_url', value=content['photo_url']), search.TextField(name='institution_acronym', value=content['institution_acronym']), + search.TextField(name='start_time', value=content['start_time']), search.TextField(name='country', value=content['country']), search.TextField(name='federal_state', value=content['federal_state']), search.TextField(name='city', value=content['city']) @@ -73,8 +81,8 @@ def getDocuments(self, value, state): query_string = self.makeQueryStr(value, state) index = search.Index(self.index_name) query_options = search.QueryOptions( - returned_fields=['institution_name', 'institution_acronym', - 'country', 'federal_state', 'city'] + returned_fields=['state', 'title', 'institution_key', 'photo_url', 'institution_name', + 'institution_acronym', 'start_time', 'country', 'federal_state', 'city'] ) query = search.Query( query_string=query_string, options=query_options) @@ -115,8 +123,8 @@ def create_field_values_string(self, value): and the fields won't be considered. """ # add a new field here - fields = ['institution_name', 'institution_acronym', - 'country', 'federal_state', 'city'] + fields = ['state', 'institution_name', 'start_time', + 'institution_acronym', 'country', 'federal_state', 'city'] fields_values = [] if value: diff --git a/frontend/event/event_card.html b/frontend/event/event_card.html index 21b1bbe7e..fa368f813 100644 --- a/frontend/event/event_card.html +++ b/frontend/event/event_card.html @@ -11,7 +11,7 @@ {{ eventCardCtrl.event.title | uppercase}}
    - {{ eventCardCtrl.event.start_time | amUtc | amLocal | amDateFormat:'HH:mm' }} + {{ eventCardCtrl.event.start_time | amUtc | amLocal | amDateFormat:'HH:mm' }} {{ eventCardCtrl.event.address.city ? ' | ' + eventCardCtrl.event.address.city : ''}}

    diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index 550add828..7b5716f6f 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -21,7 +21,6 @@

    {{events.day}}

    - {{eventCtrl.test(events.events[0])}} {{events.events[0].start_time | amUtc | amDateFormat:'ddd' }}

    diff --git a/frontend/search/searchController.js b/frontend/search/searchController.js index 2eb20776c..0ad196cc7 100644 --- a/frontend/search/searchController.js +++ b/frontend/search/searchController.js @@ -31,6 +31,7 @@ promise.then(function success(response) { searchCtrl.events = response; searchCtrl.loading = true; + searchCtrl.hasChanges = true; console.log(response); }); } else { @@ -85,9 +86,9 @@ } }; - searchCtrl.searchBy = function searchBy(search) { + searchCtrl.searchBy = function searchBy(search, type) { if (keywordHasChanges()) { - searchCtrl.makeSearch(search, 'institution'); + searchCtrl.makeSearch(search, type || 'institution'); refreshPreviousKeyword(); } }; diff --git a/frontend/search/search_event.html b/frontend/search/search_event.html index d2a5431ec..74fcc5d91 100644 --- a/frontend/search/search_event.html +++ b/frontend/search/search_event.html @@ -1,62 +1,50 @@ - -
    - - clear - - PESQUISAR + + +
    +
    + Pesquisa avançada + + arrow_drop_down +
    -
    -

    Pesquisa avançada

    -
    - +
    + +

    INSTITUIÇÃO

    + placeholder="Digite o nome ou sigla da instituição" ng-change="searchCtrl.setHasChanges()"/>     - -

    DATA DO EVENTO

    - -     -
    -

    PAÍS

    - - - {{country.nome_pais}} - - -
    -
    -

    ESTADO

    - - - {{ federal_state.nome }} + +
    +
    +
    + + + + {{state.nome}} -
    -
    -

    MUNICÍPIO

    - - {{city}} - -
    - + +
    +
    + + CANCELAR + + + PESQUISAR + +
    -
    - - CANCELAR - - - PESQUISAR - +
    +
    +
    + +
    +
    +
    + +
    - \ No newline at end of file +
    \ No newline at end of file From 6355684b47be54a0e0e84011ee0206cc2356c0f1 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Mar 2019 14:34:33 -0300 Subject: [PATCH 530/606] Add more jsdoc and second and third step specs --- .../createInvitedInstitutionController.js | 21 ++++++ .../createInvitedInstitutionSpec.js | 66 +++++++++++++++++-- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index c3f46d704..04f04b1b1 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -20,6 +20,13 @@ ctrl.currentStep === 0 ? window.history.back() : ctrl.previousStep(); } + /** + * Loads the "empty" institution from InstitutionService and sets its default values. + * This consists of a address with Brasil as a country, and the suggested name from inviter. + * Sets an ObserverRecorderService required to generate a json patch later (when the institution is finally saved); + * + * @returns {Promise} - InstituionService promise; + */ ctrl.loadInstitution = () => { return InstitutionService.getInstitution(ctrl.institutionKey).then(res => { ctrl.newInstitution = res; @@ -37,6 +44,16 @@ }) } + /** + * Validates the current form step, based on required fields. + * 1st step: requires a valid address. For institutions on Brazil, + * this requires a valid street, federal_state, neighbourhood, city and cep. + * For foreign institutions, this only requires a country. + * 2nd step: requires a name, institutional_email, legal_nature and actuation_area. + * 3rd step: requires a description and a leader. + * + * @returns {Boolean} - if the step is valid or not + */ ctrl.isCurrentStepValid = () => { const step = ctrl.currentStep; const institution = ctrl.newInstitution; @@ -146,6 +163,8 @@ * this method bails out and resolves a Promise with nothing. * Otherwise, sets the Image through ImageService and resolves it. * @param {Image} src - current institutions image file (resized) + * + * @returns {Promise} - a Promise resolving with nothing */ function saveProfileImage(src) { if (!src) { @@ -247,6 +266,8 @@ * * Replaces: * #createProfile + * + * @returns {Object} - An empty institution profile */ function createProfile(inst) { return { diff --git a/frontend/test/specs/institution/createInvitedInstitutionSpec.js b/frontend/test/specs/institution/createInvitedInstitutionSpec.js index 17680b1f7..c0c796f7f 100644 --- a/frontend/test/specs/institution/createInvitedInstitutionSpec.js +++ b/frontend/test/specs/institution/createInvitedInstitutionSpec.js @@ -38,7 +38,7 @@ describe('Test CreateInvitedInstitutionController', function() { const institutions = [{ name: 'Splab', - key: 'institutuion_key', + key: 'institution_key', portfolio_url: '', followers: [], members: [] @@ -55,7 +55,7 @@ describe('Test CreateInvitedInstitutionController', function() { const userData = { name: 'name', key: 'user-key', - current_institution: {key: "institutuion_key"}, + current_institution: {key: "institution_key"}, institutions: institutions, institutions_admin: [], follows: institutions, @@ -133,7 +133,7 @@ describe('Test CreateInvitedInstitutionController', function() { // Assign a valid institution, // so we can both test acceptance, // and strip values to test for rejections - ctrl.newInstitution = institution; + ctrl.newInstitution = _.cloneDeep(institution); }); describe('first step', () => { @@ -200,7 +200,7 @@ describe('Test CreateInvitedInstitutionController', function() { ctrl.currentStep = 0; }); - it('should reject a empty country', () => { + it('should reject an empty country', () => { ctrl.newInstitution.address.country = ''; const validation = ctrl.isCurrentStepValid(); expect(validation).toBeFalsy(); @@ -212,6 +212,64 @@ describe('Test CreateInvitedInstitutionController', function() { }); }); }); + + describe('second step', () => { + beforeEach(() => { + ctrl.currentStep = 1; + }); + + it('should reject an empty name', () => { + ctrl.newInstitution.name = ''; + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeFalsy(); + }); + + it('should reject an empty actuation_area', () => { + ctrl.newInstitution.actuation_area = ''; + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeFalsy(); + }); + + it('should reject an empty legal_nature', () => { + ctrl.newInstitution.legal_nature = ''; + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeFalsy(); + }); + + it('should reject an empty institutional_email', () => { + ctrl.newInstitution.institutional_email = ''; + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeFalsy(); + }); + + it('should accept a complete institution', () => { + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeTruthy(); + }); + }); + + describe('third step', () => { + beforeEach(() => { + ctrl.currentStep = 2; + }); + + it('should reject an empty description', () => { + ctrl.newInstitution.description = ''; + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeFalsy(); + }); + + it('should reject an empty leader', () => { + ctrl.newInstitution.description = ''; + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeFalsy(); + }); + + it('should accept a complete institution', () => { + const validation = ctrl.isCurrentStepValid(); + expect(validation).toBeTruthy(); + }); + }); }); }); From b2cc869a46d351775eb4b29bfb668f7e89e386af Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Tue, 12 Mar 2019 15:08:34 -0300 Subject: [PATCH 531/606] Return promise in changeTab function --- frontend/institution/allInstitutionsController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/allInstitutionsController.js b/frontend/institution/allInstitutionsController.js index 6ea2eab87..da746c2ea 100644 --- a/frontend/institution/allInstitutionsController.js +++ b/frontend/institution/allInstitutionsController.js @@ -29,7 +29,7 @@ possibleTabs.includes(nextTab) ? nextTab : allInstitutionsCtrl.currentTab); currentPage = 0; - loadInstitutions(); + return loadInstitutions(); } }; From c8f51e96e4c690375d10e0fd60bcb1d09adc26ea Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Tue, 12 Mar 2019 16:02:28 -0300 Subject: [PATCH 532/606] Adding search by date --- backend/admin.py | 4 +++- backend/search_module/search_event.py | 13 +++++++++++-- frontend/search/searchController.js | 1 + frontend/search/search_event.html | 7 ++++++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/backend/admin.py b/backend/admin.py index f4492b833..bceac5523 100644 --- a/backend/admin.py +++ b/backend/admin.py @@ -24,6 +24,7 @@ INDEX_INSTITUTION = 'institution' INDEX_USER = 'user' +INDEX_EVENT = 'event' TEXT = 'At vero eos et accusamus et iusto odio dignissimos \ ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti \ quos dolores et quas molestias excepturi sint occaecati cupiditate \ @@ -182,7 +183,8 @@ def clear_data_store(): delete_all_in_index(index_institution) index_user = search.Index(name=INDEX_USER) delete_all_in_index(index_user) - + index_event = search.Index(name=INDEX_EVENT) + delete_all_in_index(index_event) class BaseHandler(webapp2.RequestHandler): """Base Handler.""" diff --git a/backend/search_module/search_event.py b/backend/search_module/search_event.py index 2832fda38..e51d64349 100644 --- a/backend/search_module/search_event.py +++ b/backend/search_module/search_event.py @@ -4,6 +4,7 @@ from google.appengine.api import search from . import SearchDocument from utils import text_normalize +import json from datetime import datetime __all__ = ['SearchEvent'] @@ -22,6 +23,11 @@ def event_has_changes(fields, entity): return False +def get_date_string_without_utc(event_date): + """It returns only the date string without hours or hours with incorrect UTC.""" + return datetime(event_date.year, event_date.month, event_date.day, + event_date.hour - 3).isoformat().split("T")[0] + class SearchEvent(SearchDocument): """Search event's model.""" @@ -49,11 +55,13 @@ def createDocument(self, event): 'institution_key': event.institution_key.urlsafe(), 'photo_url': event.photo_url, 'institution_acronym': event.institution_acronym, - 'start_time': event.start_time.isoformat(), + 'start_time': get_date_string_without_utc(event.start_time), + 'address': event.address and json.dumps(dict(event.address)), 'country': event.address and event.address.country, 'federal_state': event.address and event.address.federal_state, 'city': event.address and event.address.city } + # Make the structure of the document by setting the fields and its id. document = search.Document( # The document's id is the same of the event's one, @@ -67,6 +75,7 @@ def createDocument(self, event): search.TextField(name='photo_url', value=content['photo_url']), search.TextField(name='institution_acronym', value=content['institution_acronym']), search.TextField(name='start_time', value=content['start_time']), + search.TextField(name='address', value=content['address']), search.TextField(name='country', value=content['country']), search.TextField(name='federal_state', value=content['federal_state']), search.TextField(name='city', value=content['city']) @@ -82,7 +91,7 @@ def getDocuments(self, value, state): index = search.Index(self.index_name) query_options = search.QueryOptions( returned_fields=['state', 'title', 'institution_key', 'photo_url', 'institution_name', - 'institution_acronym', 'start_time', 'country', 'federal_state', 'city'] + 'institution_acronym', 'start_time', 'address', 'country', 'federal_state', 'city'] ) query = search.Query( query_string=query_string, options=query_options) diff --git a/frontend/search/searchController.js b/frontend/search/searchController.js index 0ad196cc7..8db6fb9c3 100644 --- a/frontend/search/searchController.js +++ b/frontend/search/searchController.js @@ -53,6 +53,7 @@ searchCtrl.searchActuation = ""; searchCtrl.searchNature = ""; searchCtrl.searchState = ""; + searchCtrl.searchDate = ""; searchCtrl.institutions = []; }; diff --git a/frontend/search/search_event.html b/frontend/search/search_event.html index 74fcc5d91..a3832435f 100644 --- a/frontend/search/search_event.html +++ b/frontend/search/search_event.html @@ -20,7 +20,12 @@
    - + + + + {{state.nome}} From 9250e2070b6921a0bfc74b1900a75bec9493e248 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Mar 2019 16:23:25 -0300 Subject: [PATCH 533/606] Correctly return promises where needed --- .../createInvitedInstitutionController.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index 04f04b1b1..6385ee0e8 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -139,13 +139,12 @@ const instKey = ctrl.institutionKey; const senderName = $state.params.senderName; const dialogParent = angular.element('#create-inst-content'); - showConfirmationDialog(event, dialogParent) + return showConfirmationDialog(event, dialogParent) .then(() => { ctrl.loading = true; - saveProfileImage(ctrl.photoSrc).then(() => { - saveAndUpdateInst(inviteKey, instKey, senderName) - .then(() => { - reloadAndRedirectHome(); + return saveProfileImage(ctrl.photoSrc).then(() => { + return saveAndUpdateInst(inviteKey, instKey, senderName) .then(() => { + return reloadAndRedirectHome(); }) }) }).catch(e => { @@ -188,15 +187,15 @@ : 'A instituição foi criada e ja se encontra habilitada na Plataforma Virtual CIS.' - AuthService.reload().then(() => { - $state.go(STATES.HOME).then(() => { + return AuthService.reload().then(() => { + return $state.go(STATES.HOME).then(() => { ctrl.loading = false; const alert = $mdDialog.alert({ title: 'INSTITUIÇÃO CRIADA', textContent: message, ok: 'Fechar' }); - $mdDialog.show(alert); + return $mdDialog.show(alert); }); }); } @@ -234,7 +233,7 @@ const patch = ObserverRecorderService.generate(observer); const body = { sender_name: senderName } - return InstitutionService.save(body, instKey, inviteKey).then((savedInst)=> { + return InstitutionService.save(body, instKey, inviteKey).then(()=> { return InstitutionService.update(instKey, patch).then((updatedInst) => { updateUser(inviteKey, updatedInst); }); From 372937f2a94bb0bba41b01ddbbffe934b15cb7c1 Mon Sep 17 00:00:00 2001 From: ruanres Date: Tue, 12 Mar 2019 16:25:48 -0300 Subject: [PATCH 534/606] implemanted the card for invites sent --- .../invites/inviteInstitutionController.js | 12 ++++++++++- .../invites/invite_institution_mobile.html | 20 +++++++++++++++++-- .../entityShowcase.component.js | 5 +++++ .../utils/entityShowcase/entityShowcase.css | 10 +++++++++- .../utils/entityShowcase/entityShowcase.html | 5 ++++- 5 files changed, 47 insertions(+), 5 deletions(-) diff --git a/frontend/invites/inviteInstitutionController.js b/frontend/invites/inviteInstitutionController.js index c0f27ca19..befa9ae00 100644 --- a/frontend/invites/inviteInstitutionController.js +++ b/frontend/invites/inviteInstitutionController.js @@ -191,10 +191,20 @@ inviteInstCtrl.$onInit = () => { if (Utils.isMobileScreen()) { - StateLinkRequestService.showLinkRequestDialog(STATE_LINKS.INVITE_INSTITUTION, STATES.HOME); + // StateLinkRequestService.showLinkRequestDialog(STATE_LINKS.INVITE_INSTITUTION, STATES.HOME); } }; + inviteInstCtrl.createIconBtn = (icon, color, action, params, hideBtn) => { + const greyColor = '#9E9E9E'; + return { + icon: icon, + iconColor: color || greyColor, + action: () => action(...params), + showIf: () => hideBtn === undefined ? true : hideBtn + }; + }; + (function main() { loadSentInvitations(); loadSentRequests(); diff --git a/frontend/invites/invite_institution_mobile.html b/frontend/invites/invite_institution_mobile.html index afeee04c2..f32e06240 100644 --- a/frontend/invites/invite_institution_mobile.html +++ b/frontend/invites/invite_institution_mobile.html @@ -6,7 +6,7 @@
    - +
    @@ -32,7 +32,23 @@
    - + + +
    + + + + + +
    +     +
    diff --git a/frontend/utils/entityShowcase/entityShowcase.component.js b/frontend/utils/entityShowcase/entityShowcase.component.js index 0cda43bdd..8ba361391 100644 --- a/frontend/utils/entityShowcase/entityShowcase.component.js +++ b/frontend/utils/entityShowcase/entityShowcase.component.js @@ -37,6 +37,7 @@ icon: "@", title: "<", subtitle: "<", + subtitlesList: "<", leftAction: "<", rightIconBtns: "<", }, @@ -55,6 +56,10 @@ entityShowcaseCtrl.showIconBtn = iconBtn => { return iconBtn.showIf ? iconBtn.showIf() : true; } + + entityShowcaseCtrl.getSubtitles = () => { + return entityShowcaseCtrl.subtitlesList ? entityShowcaseCtrl.subtitlesList : [entityShowcaseCtrl.subtitle]; + } } })(); \ No newline at end of file diff --git a/frontend/utils/entityShowcase/entityShowcase.css b/frontend/utils/entityShowcase/entityShowcase.css index 9ca749f58..492199426 100644 --- a/frontend/utils/entityShowcase/entityShowcase.css +++ b/frontend/utils/entityShowcase/entityShowcase.css @@ -34,9 +34,13 @@ grid-area: title; line-height: 1rem; } +.entity-showcase__subtitles-container { + grid-area: subtitle; + display: grid; + grid-template-rows: repeat(auto-fill, max-content); +} .entity-showcase__subtitle { - grid-area: subtitle; font-size: 0.8em; line-height: 1rem; } @@ -54,4 +58,8 @@ height: 2.5em; width: 2.5em; } + + .entity-showcase__subtitle { + font-size: 0.7em; + } } diff --git a/frontend/utils/entityShowcase/entityShowcase.html b/frontend/utils/entityShowcase/entityShowcase.html index 94d46fb46..97e3d2ef0 100644 --- a/frontend/utils/entityShowcase/entityShowcase.html +++ b/frontend/utils/entityShowcase/entityShowcase.html @@ -4,7 +4,10 @@ {{ entityShowcaseCtrl.icon }} {{entityShowcaseCtrl.title }} - {{entityShowcaseCtrl.subtitle }} +
    + {{subtitle }} +
    Date: Tue, 12 Mar 2019 16:25:56 -0300 Subject: [PATCH 535/606] Add createInvInstController#submit spec --- .../createInvitedInstitutionSpec.js | 78 ++++++++++++++++++- 1 file changed, 75 insertions(+), 3 deletions(-) diff --git a/frontend/test/specs/institution/createInvitedInstitutionSpec.js b/frontend/test/specs/institution/createInvitedInstitutionSpec.js index c0c796f7f..0a16a0a47 100644 --- a/frontend/test/specs/institution/createInvitedInstitutionSpec.js +++ b/frontend/test/specs/institution/createInvitedInstitutionSpec.js @@ -2,7 +2,7 @@ describe('Test CreateInvitedInstitutionController', function() { let state, statesConst, scope, institutionService, inviteService, - httpBackend, authService, ctrl, imageService; + authService, ctrl, imageService, mdDialog, observerRecorderService; const address = { cep: "11111-000", @@ -67,14 +67,15 @@ describe('Test CreateInvitedInstitutionController', function() { beforeEach(module('app')); - beforeEach(inject(($controller, $httpBackend, $state, STATES, InviteService, InstitutionService, AuthService, ImageService, $rootScope) => { + beforeEach(inject(($controller, $httpBackend, $state, STATES, InviteService, InstitutionService, AuthService, ImageService, $rootScope, $mdDialog, ObserverRecorderService) => { state = $state; scope = $rootScope.$new(); statesConst = STATES; authService = AuthService; imageService = ImageService; institutionService = InstitutionService; - httpBackend = $httpBackend; + mdDialog = $mdDialog; + observerRecorderService = ObserverRecorderService; authService.login(userData); state.params.institutionKey = institution.key; @@ -271,5 +272,76 @@ describe('Test CreateInvitedInstitutionController', function() { }); }); }); + + describe('submit', () => { + let patch; + + beforeEach(() => { + ctrl.newInstitution = _.cloneDeep(institution); + ctrl.photoSrc = 'some_image_data'; + ctrl.institutionKey = ctrl.newInstitution.key; + + // Hard code photo_url so the returned patch is equal to later patch + ctrl.newInstitution.photo_url = 'imageurl'; + patch = jsonpatch.compare(emptyInstitution, ctrl.newInstitution); + + spyOn(mdDialog, 'show').and.callFake(() => Promise.resolve()); + spyOn(angular, 'element'); + spyOn(observerRecorderService, 'generate').and.returnValues(patch); + spyOn(imageService, 'saveImage').and.callFake(() => { + return Promise.resolve({ url: 'imageurl' }); + }); + + spyOn(institutionService, 'save').and.callFake(() => { + return Promise.resolve(); + }); + + spyOn(institutionService, 'update').and.callFake(() => { + return Promise.resolve(ctrl.newInstitution); + }); + + spyOn(state, 'go') + spyOn(authService, 'save'); + spyOn(authService, 'reload').and.callFake(() => { + return Promise.resolve(); + }); + + ctrl.user = new User(userData); + spyOn(ctrl.user, 'removeInvite'); + spyOn(ctrl.user, 'follow'); + spyOn(ctrl.user, 'addProfile'); + spyOn(ctrl.user, 'changeInstitution'); + }); + + it('correctly save institution data', (done) => { + ctrl.submit({}).then(() => { + expect(imageService.saveImage).toHaveBeenCalledWith('some_image_data'); + expect(ctrl.newInstitution.photo_url).toEqual('imageurl'); + expect(observerRecorderService.generate).toHaveBeenCalled(); + expect(institutionService.save).toHaveBeenCalled(); + + // Needed here so image url replacing is correctly tested + patch = jsonpatch.compare(emptyInstitution, ctrl.newInstitution); + expect(institutionService.update).toHaveBeenCalledWith(ctrl.newInstitution.key, patch); + expect(state.go).toHaveBeenCalled(); + expect(authService.reload).toHaveBeenCalled(); + done(); + }); + }); + + it('updates user data', (done) => { + state.params.inviteKey = invite.key; + + ctrl.submit({}).then(() => { + expect(ctrl.user.removeInvite).toHaveBeenCalledWith(invite.key); + expect(ctrl.user.follow).toHaveBeenCalledWith(ctrl.newInstitution); + expect(ctrl.user.addProfile).toHaveBeenCalled(); + expect(ctrl.user.changeInstitution).toHaveBeenCalledWith(ctrl.newInstitution); + expect(ctrl.user.institutions).toContain(ctrl.newInstitution); + expect(ctrl.user.institutions_admin).toContain(ctrl.newInstitution.key); + done(); + }); + }); + }); }); From a80d28b601b829618623e993ef8a329653ea5607 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 12 Mar 2019 16:40:45 -0300 Subject: [PATCH 536/606] Remove unused address variable --- .../institution/createInvitedInstitutionSpec.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/frontend/test/specs/institution/createInvitedInstitutionSpec.js b/frontend/test/specs/institution/createInvitedInstitutionSpec.js index 0a16a0a47..8bd3fe864 100644 --- a/frontend/test/specs/institution/createInvitedInstitutionSpec.js +++ b/frontend/test/specs/institution/createInvitedInstitutionSpec.js @@ -4,16 +4,6 @@ describe('Test CreateInvitedInstitutionController', function() { let state, statesConst, scope, institutionService, inviteService, authService, ctrl, imageService, mdDialog, observerRecorderService; - const address = { - cep: "11111-000", - city: "city", - country: "Country", - neighbourhood: "neighbourhood", - number: "555", - state: "State", - street: "Street x" - }; - const institution = { name: "name", photo_url: "imagens/test", @@ -25,7 +15,7 @@ describe('Test CreateInvitedInstitutionController', function() { actuation_area: "government agencies", phone_number: "phone", cnpj: "cnpj", - address: new Address(address), + address: {}, leader: "leader name", institutional_email: "email@institutional.com", description: "teste" From 0621b0b2dc432959fa5d74709723bba5b2df9e4e Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 13 Mar 2019 12:07:03 -0300 Subject: [PATCH 537/606] Create functions showInfoToast and showErrorToast --- feature-toggles/auth/authService.js | 2 +- feature-toggles/auth/loginController.js | 4 +-- .../manage/manageTogglesController.js | 6 ++-- .../test/specs/auth/loginControllerSpec.js | 12 ++++---- .../manage/manageTogglesControllerSpec.js | 10 +++---- frontend/auth/authService.js | 6 ++-- frontend/auth/loginController.js | 4 +-- frontend/auth/resetPasswordController.js | 2 +- frontend/auth/signupDirective.js | 2 +- frontend/comment/comment.component.js | 12 ++++---- frontend/event/eventDetailsDirective.js | 12 ++++---- frontend/event/eventDialogController.js | 16 +++++----- frontend/event/eventPageController.js | 2 +- frontend/home/colorPickerController.js | 2 +- frontend/imageUpload/cropImageController.js | 2 +- .../configInstitution/configInstDirective.js | 18 +++++------ .../institution/institutionCardDirective.js | 8 ++--- frontend/institution/institutionController.js | 10 +++---- .../managementMembersController.js | 16 +++++----- .../registeredInstitution.component.js | 2 +- frontend/institution/removeInstController.js | 2 +- .../institution/selectEmailsController.js | 8 ++--- .../institution/transferAdminController.js | 6 ++-- .../invites/inviteInstHierarchieController.js | 14 ++++----- .../invites/inviteInstitutionController.js | 10 +++---- frontend/invites/newInviteController.js | 6 ++-- .../invites/processInviteUserAdmController.js | 4 +-- frontend/invites/removeChildController.js | 2 +- .../invites/suggestInstitutionController.js | 8 ++--- frontend/post/postDetailsDirective.js | 16 +++++----- frontend/post/postDirective.js | 16 +++++----- frontend/post/postPageController.js | 6 ++-- frontend/post/sharePostController.js | 2 +- .../analyseHierarchyRequestController.js | 4 +-- frontend/requests/requestDialogService.js | 2 +- .../requests/requestInvitationController.js | 4 +-- .../requests/requestProcessingController.js | 8 ++--- frontend/sideMenu/sideMenu.component.js | 2 +- frontend/survey/survey.component.js | 4 +-- frontend/survey/surveyDetailsDirective.js | 6 ++-- .../specs/comment/commentControllerSpec.js | 20 ++++++------- .../specs/event/eventDetailsControllerSpec.js | 12 ++++---- .../test/specs/event/eventDialogCtrlSpec.js | 22 +++++++------- .../institution/configInstDirectiveSpec.js | 6 ++-- .../registeredInstitutionsControllerSpec.js | 5 ++-- .../institution/removeInstControllerSpec.js | 4 +-- .../transferAdminControllerSpec.js | 9 +++--- .../inviteInstHierarchieControllerSpec.js | 18 +++++------ .../processInviteUserAdmControllerSpec.js | 12 ++++---- .../specs/post/postDetailsControllerSpec.js | 8 ++--- .../test/specs/post/postPageControllerSpec.js | 12 ++++---- .../analyseHierarchyRequestControllerSpec.js | 18 +++++------ .../requestInvitationControllerSpec.js | 6 ++-- .../requestProcessingControllerSpec.js | 8 ++--- .../specs/user/configProfileControllerSpec.js | 8 ++--- .../specs/user/editProfileControllerSpec.js | 8 ++--- .../test/specs/user/profileServiceSpec.js | 4 +-- .../user/userRequestFormControllerSpec.js | 8 ++--- .../test/specs/utils/messageServiceSpec.js | 27 +++++++++++++++-- .../configProfile/configProfileController.js | 10 +++---- .../user/editProfile/editProfileController.js | 4 +-- frontend/user/profileService.js | 4 +-- .../userRequestForm.controller.js | 4 +-- frontend/utils/httpService.js | 2 +- frontend/utils/messageService.js | 30 ++++++++++--------- support/auth/authService.js | 12 ++++---- support/report/reportController.js | 2 +- support/support.js | 2 +- 68 files changed, 295 insertions(+), 268 deletions(-) diff --git a/feature-toggles/auth/authService.js b/feature-toggles/auth/authService.js index a8f55028e..681b16f9b 100644 --- a/feature-toggles/auth/authService.js +++ b/feature-toggles/auth/authService.js @@ -111,7 +111,7 @@ service.isLoadingUser = false; if (!userInfo.hasPermission('analyze_request_inst')) { service.logout(); - MessageService.showToast("Você não possui permissão para acessar esta página."); + MessageService.showErrorToast("Você não possui permissão para acessar esta página."); } }); } diff --git a/feature-toggles/auth/loginController.js b/feature-toggles/auth/loginController.js index 2c094dd65..4ff8afe18 100644 --- a/feature-toggles/auth/loginController.js +++ b/feature-toggles/auth/loginController.js @@ -16,7 +16,7 @@ return AuthService.loginWithGoogle().then(function success() { loginCtrl._redirectTo(redirectPath); }).catch(function(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); }); }; @@ -35,7 +35,7 @@ loginCtrl._redirectTo(redirectPath); } ).catch(function(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); }); }; diff --git a/feature-toggles/manage/manageTogglesController.js b/feature-toggles/manage/manageTogglesController.js index 072509390..dadb1e543 100644 --- a/feature-toggles/manage/manageTogglesController.js +++ b/feature-toggles/manage/manageTogglesController.js @@ -28,10 +28,10 @@ feature.isLoading = true; return ManageTogglesService.saveFeature(feature) .then(response => { - MessageService.showToast("Alterações salvas com sucesso."); + MessageService.showInfoToast("Alterações salvas com sucesso."); return response; }).catch(response => { - MessageService.showToast(response.data.msg); + MessageService.showErrorToast(response.data.msg); }).finally(function() { feature.isLoading = false; }); @@ -45,7 +45,7 @@ manageTogglesCtrl.features = features; return features; }).catch(response => { - MessageService.showToast(response.data.msg); + MessageService.showErrorToast(response.data.msg); }); } diff --git a/feature-toggles/test/specs/auth/loginControllerSpec.js b/feature-toggles/test/specs/auth/loginControllerSpec.js index 1aac93b06..bd8381e9c 100644 --- a/feature-toggles/test/specs/auth/loginControllerSpec.js +++ b/feature-toggles/test/specs/auth/loginControllerSpec.js @@ -85,15 +85,15 @@ scope.$apply(); }); - it('Should be call messageService.showToast if login is not successful', function(done) { + it('Should be call messageService.showErrorToast if login is not successful', function(done) { spyOn(authService, 'loginWithGoogle').and.callFake(function() { return q.reject('Login failed'); }); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); logginCtrl.loginWithGoogle().then(function() { expect(authService.loginWithGoogle).toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalledWith('Login failed'); + expect(messageService.showErrorToast).toHaveBeenCalledWith('Login failed'); done(); }); @@ -117,15 +117,15 @@ scope.$apply(); }); - it('Should be call messageService.showToast if login is not successful', function(done) { + it('Should be call messageService.showErrorToast if login is not successful', function(done) { spyOn(authService, 'loginWithEmailAndPassword').and.callFake(function() { return q.reject('Login failed'); }); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); logginCtrl.loginWithEmailPassword().then(function() { expect(authService.loginWithEmailAndPassword).toHaveBeenCalledWith(logginCtrl.user.email, logginCtrl.user.password); - expect(messageService.showToast).toHaveBeenCalledWith('Login failed'); + expect(messageService.showErrorToast).toHaveBeenCalledWith('Login failed'); done(); }); diff --git a/feature-toggles/test/specs/manage/manageTogglesControllerSpec.js b/feature-toggles/test/specs/manage/manageTogglesControllerSpec.js index 0350c8661..199deeb80 100644 --- a/feature-toggles/test/specs/manage/manageTogglesControllerSpec.js +++ b/feature-toggles/test/specs/manage/manageTogglesControllerSpec.js @@ -43,7 +43,7 @@ }); it('Should be show error message', function(done) { - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); spyOn(manageTogglesServices, 'getAllFeatureToggles').and.callFake(function() { return q.reject({ data: { @@ -53,7 +53,7 @@ }); manageTogglesCtrl.$onInit().then(function() { - expect(messageService.showToast).toHaveBeenCalledWith('Request fail'); + expect(messageService.showErrorToast).toHaveBeenCalledWith('Request fail'); done(); }); @@ -72,7 +72,7 @@ describe('Test save', function() { beforeEach(function() { - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); }); it('Should be call messageService.saveFeature', function(done) { @@ -86,7 +86,7 @@ expect(feature.isLoading).toBeTruthy(); promise.then(function(response) { - expect(messageService.showToast).toHaveBeenCalledWith("Alterações salvas com sucesso."); + expect(messageService.showInfoToast).toHaveBeenCalledWith("Alterações salvas com sucesso."); expect(manageTogglesServices.saveFeature).toHaveBeenCalledWith(feature); expect(response).toEqual(feature); expect(manageTogglesCtrl.isLoading).toBeFalsy(); @@ -110,7 +110,7 @@ expect(feature.isLoading).toBeTruthy(); promise.then(function() { - expect(messageService.showToast).toHaveBeenCalledWith("Feature not found"); + expect(messageService.showErrorToast).toHaveBeenCalledWith("Feature not found"); expect(manageTogglesCtrl.isLoading).toBeFalsy(); done(); }); diff --git a/frontend/auth/authService.js b/frontend/auth/authService.js index 5cdf12243..87e90e30b 100644 --- a/frontend/auth/authService.js +++ b/frontend/auth/authService.js @@ -114,7 +114,7 @@ configUser(userLoaded, firebaseUser); deferred.resolve(userInfo); }, function error(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); deferred.reject(error); }); return deferred.promise; @@ -160,7 +160,7 @@ deferred.resolve(userInfo); }); }).catch(function(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); deferred.reject(error); }); return deferred.promise; @@ -199,7 +199,7 @@ service.save(); deferred.resolve(userInfo); }, function error(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); deferred.reject(error); }); return deferred.promise; diff --git a/frontend/auth/loginController.js b/frontend/auth/loginController.js index 3784d8e2c..046956c15 100644 --- a/frontend/auth/loginController.js +++ b/frontend/auth/loginController.js @@ -26,7 +26,7 @@ promise.then(function success() { redirectTo(redirectPath); }).catch(function(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); }); return promise; }; @@ -43,7 +43,7 @@ redirectTo(redirectPath); } ).catch(function(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); }); }; diff --git a/frontend/auth/resetPasswordController.js b/frontend/auth/resetPasswordController.js index 96dab4546..aa69fd3c8 100644 --- a/frontend/auth/resetPasswordController.js +++ b/frontend/auth/resetPasswordController.js @@ -20,7 +20,7 @@ resetCtrl.emailSent = true; $scope.$apply(); }).catch(_ => { - MessageService.showToast("Ocorreu um erro, verifique seu e-mail e tente novamente"); + MessageService.showErrorToast("Ocorreu um erro, verifique seu e-mail e tente novamente"); }); }; diff --git a/frontend/auth/signupDirective.js b/frontend/auth/signupDirective.js index 7dd2b5456..bfcae9a52 100644 --- a/frontend/auth/signupDirective.js +++ b/frontend/auth/signupDirective.js @@ -14,7 +14,7 @@ } var newUser = controller.newUser; if (newUser.password !== newUser.verifypassword) { - MessageService.showToast("Senhas incompatíveis"); + MessageService.showErrorToast("Senhas incompatíveis"); return; } AuthService.signupWithEmailAndPassword( diff --git a/frontend/comment/comment.component.js b/frontend/comment/comment.component.js index 2b1d6f656..be6aa01a9 100644 --- a/frontend/comment/comment.component.js +++ b/frontend/comment/comment.component.js @@ -61,7 +61,7 @@ .then(function () { commentCtrl.addLike(); }).catch(function () { - MessageService.showToast("Não foi possível curtir o comentário"); + MessageService.showErrorToast("Não foi possível curtir o comentário"); }).finally(function () { commentCtrl.saving = false; }); @@ -73,7 +73,7 @@ .then(function sucess() { commentCtrl.removeLike(); }).catch(function error() { - MessageService.showToast("Não foi possível descurtir o comentário"); + MessageService.showErrorToast("Não foi possível descurtir o comentário"); }).finally(function() { commentCtrl.saving = false; }); @@ -88,7 +88,7 @@ ).then(function success(data) { commentCtrl.comment.replies[data.id] = data; }).catch(function error() { - MessageService.showToast("Não foi possível responder ao comentário"); + MessageService.showErrorToast("Não foi possível responder ao comentário"); }).finally(function() { commentCtrl.newReply = null; commentCtrl.saving = false; @@ -100,7 +100,7 @@ CommentService.deleteReply(commentCtrl.post.key, commentCtrl.comment.id, commentCtrl.replyId) .then(function success() { delete commentCtrl.comment.replies[commentCtrl.replyId]; - MessageService.showToast('Comentário excluído com sucesso'); + MessageService.showInfoToast('Comentário excluído com sucesso'); }); }; @@ -108,7 +108,7 @@ CommentService.deleteComment(commentCtrl.post.key, commentCtrl.comment.id).then( function success() { commentCtrl.post.deleteComment(commentCtrl.comment.id); - MessageService.showToast('Comentário excluído com sucesso'); + MessageService.showInfoToast('Comentário excluído com sucesso'); }); }; @@ -118,7 +118,7 @@ ).then(function () { commentCtrl.onDelete(); }).catch(function () { - MessageService.showToast('Cancelado'); + MessageService.showInfoToast('Cancelado'); }); }; diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index 98a901014..02aa3a193 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -36,14 +36,14 @@ dialog.then(function () { deleteEvent(eventCtrl.event); }, function () { - MessageService.showToast('Cancelado'); + MessageService.showInfoToast('Cancelado'); }); }; function deleteEvent() { let promise = EventService.deleteEvent(eventCtrl.event); promise.then(function success() { - MessageService.showToast('Evento removido com sucesso!'); + MessageService.showInfoToast('Evento removido com sucesso!'); eventCtrl.event.state = "deleted"; $state.go(STATES.EVENTS); }); @@ -163,7 +163,7 @@ eventCtrl.copyLink = function copyLink() { var url = Utils.generateLink(`/event/${eventCtrl.event.key}/details`); ngClipboard.toClipboard(url); - MessageService.showToast("O link foi copiado"); + MessageService.showInfoToast("O link foi copiado"); }; /** @@ -193,7 +193,7 @@ eventCtrl.addFollower = () => { return EventService.addFollower(eventCtrl.event.key).then(() => { eventCtrl.event.addFollower(eventCtrl.user.key); - MessageService.showToast('Você receberá as atualizações desse evento.'); + MessageService.showInfoToast('Você receberá as atualizações desse evento.'); }); }; @@ -203,7 +203,7 @@ eventCtrl.removeFollower = () => { return EventService.removeFollower(eventCtrl.event.key).then(() => { eventCtrl.event.removeFollower(eventCtrl.user.key); - MessageService.showToast('Você não receberá as atualizações desse evento.'); + MessageService.showInfoToast('Você não receberá as atualizações desse evento.'); }); }; @@ -218,7 +218,7 @@ return EventService.getEvent(eventKey).then(function success(response) { eventCtrl.event = new Event(response); }, function error(response) { - MessageService.showToast(response); + MessageService.showErrorToast(response); $state.go(STATES.HOME); }); } diff --git a/frontend/event/eventDialogController.js b/frontend/event/eventDialogController.js index 0d63e015d..219406557 100644 --- a/frontend/event/eventDialogController.js +++ b/frontend/event/eventDialogController.js @@ -73,7 +73,7 @@ dialogCtrl.event.photo_url = data.url; callback(); }, function error(response) { - MessageService.showToast(response.data.msg); + MessageService.showErrorToast(response.data.msg); }); } else { callback(); @@ -89,12 +89,12 @@ EventService.editEvent(dialogCtrl.event.key, formatedPatch) .then(function success() { dialogCtrl.cancelCreation(); - MessageService.showToast('Evento editado com sucesso.'); + MessageService.showInfoToast('Evento editado com sucesso.'); }, function error() { dialogCtrl.cancelCreation(); }); } else { - MessageService.showToast('Evento inválido'); + MessageService.showErrorToast('Evento inválido'); } } @@ -126,7 +126,7 @@ dialogCtrl.deletePreviousImage = true; dialogCtrl.file = null; }, function error(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); }); }; @@ -209,7 +209,7 @@ var nextStep = currentStep + 1; dialogCtrl.steps[nextStep] = true; } else { - MessageService.showToast(dialogCtrl._getRequiredFieldsMsg()); + MessageService.showErrorToast(dialogCtrl._getRequiredFieldsMsg()); } }; @@ -431,14 +431,14 @@ !isMobileScreen() && dialogCtrl.events.push(response); dialogCtrl.user.addPermissions(['edit_post', 'remove_post'], response.key); dialogCtrl.cancelCreation(); - MessageService.showToast('Evento criado com sucesso!'); + MessageService.showInfoToast('Evento criado com sucesso!'); }, function error() { dialogCtrl.loading = false; dialogCtrl.blockReturnButton = false; $state.go(STATES.EVENTS); }); } else { - MessageService.showToast('Evento inválido!'); + MessageService.showErrorToast('Evento inválido!'); } } @@ -500,7 +500,7 @@ dialogCtrl.isEditing = true; dialogCtrl._loadStatesToEdit(); }, function error(response) { - MessageService.showToast("Erro ao carregar evento."); + MessageService.showErrorToast("Erro ao carregar evento."); $state.go(STATES.HOME); }); } diff --git a/frontend/event/eventPageController.js b/frontend/event/eventPageController.js index 6044c50dc..51940ab72 100644 --- a/frontend/event/eventPageController.js +++ b/frontend/event/eventPageController.js @@ -21,7 +21,7 @@ var post = new Post({}, eventCtrl.user.current_institution.key); post.shared_event = event.key; PostService.createPost(post).then(function success(response) { - MessageService.showToast('Evento compartilhado com sucesso!'); + MessageService.showInfoToast('Evento compartilhado com sucesso!'); }); }; diff --git a/frontend/home/colorPickerController.js b/frontend/home/colorPickerController.js index 2561b1f71..5f4d5a2d1 100644 --- a/frontend/home/colorPickerController.js +++ b/frontend/home/colorPickerController.js @@ -13,7 +13,7 @@ var diff = jsonpatch.compare(colorPickerCtrl.user, colorPickerCtrl.newUser); var promise = ProfileService.editProfile(diff); promise.then(function success() { - MessageService.showToast('Cor salva com sucesso'); + MessageService.showInfoToast('Cor salva com sucesso'); colorPickerCtrl.user.institution_profiles = colorPickerCtrl.newUser.institution_profiles; $mdDialog.cancel(); AuthService.save(); diff --git a/frontend/imageUpload/cropImageController.js b/frontend/imageUpload/cropImageController.js index 5a9ef04f9..0f1ed2377 100644 --- a/frontend/imageUpload/cropImageController.js +++ b/frontend/imageUpload/cropImageController.js @@ -56,7 +56,7 @@ if(ImageService.isValidImage(image_file)) { readImage(image_file); } else { - MessageService.showToast("Imagem deve ser jpg ou png e menor que 5 Mb"); + MessageService.showErrorToast("Imagem deve ser jpg ou png e menor que 5 Mb"); cropImgCtrl.cancelCrop(); } })(); diff --git a/frontend/institution/configInstitution/configInstDirective.js b/frontend/institution/configInstitution/configInstDirective.js index 86c6ae813..6ef403f2c 100644 --- a/frontend/institution/configInstitution/configInstDirective.js +++ b/frontend/institution/configInstitution/configInstDirective.js @@ -84,7 +84,7 @@ ImageService.readFile(data, setImage); configInstCtrl.file = null; }, function error(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); }); return promise; }; @@ -122,10 +122,10 @@ configInstCtrl.loadingSaveInstitution = true; updateInstitution(); }, function error() { - MessageService.showToast('Cancelado'); + MessageService.showInfoToast('Cancelado'); }); } else { - MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); + MessageService.showErrorToast("Campos obrigatórios não preenchidos corretamente."); } return promise; }; @@ -139,7 +139,7 @@ configInstCtrl.newInstitution.photo_url = data.url; defer.resolve(); }, function error(response) { - MessageService.showToast(response.data.msg); + MessageService.showErrorToast(response.data.msg); defer.reject(); }); } else { @@ -157,7 +157,7 @@ currentPortfoliourl = data.url; defer.resolve(); }, function error(response) { - MessageService.showToast(response.data.msg); + MessageService.showErrorToast(response.data.msg); defer.reject(); }); } else { @@ -184,7 +184,7 @@ $q.resolve(promise); }, function error(response) { configInstCtrl.isSubmitting = false; - MessageService.showToast(response.data.msg); + MessageService.showErrorToast(response.data.msg); $q.reject(promise); }); return promise; @@ -253,7 +253,7 @@ function saveRequestInst() { RequestInvitationService.sendRequestInst(configInstCtrl.newInstitution).then( function success() { - MessageService.showToast("Pedido enviado com sucesso!"); + MessageService.showInfoToast("Pedido enviado com sucesso!"); configInstCtrl.nextStep(); }); } @@ -264,7 +264,7 @@ AuthService.save(); changeInstitution(institution); configInstCtrl.loadingSaveInstitution = false; - MessageService.showToast('Dados da instituição salvos com sucesso.'); + MessageService.showInfoToast('Dados da instituição salvos com sucesso.'); showHierarchyDialog(institution); $state.go(STATES.HOME); } @@ -294,7 +294,7 @@ var nextStep = currentStep + 1; configInstCtrl.steps[nextStep] = true; } else { - MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); + MessageService.showErrorToast("Campos obrigatórios não preenchidos corretamente."); } }; diff --git a/frontend/institution/institutionCardDirective.js b/frontend/institution/institutionCardDirective.js index 1ac1bbbe7..7ab8fd4ba 100644 --- a/frontend/institution/institutionCardDirective.js +++ b/frontend/institution/institutionCardDirective.js @@ -28,7 +28,7 @@ institutionCardCtrl.copyLink = function copyLink(){ var url = Utils.generateLink(URL_INSTITUTION + institutionCardCtrl.institution.key + "/home"); ngClipboard.toClipboard(url); - MessageService.showToast("O link foi copiado"); + MessageService.showInfoToast("O link foi copiado"); }; institutionCardCtrl.showFollowButton = function showFollowButton() { @@ -40,7 +40,7 @@ institutionCardCtrl.follow = function follow(){ var promise = InstitutionService.follow(institutionCardCtrl.institution.key); promise.then(function success(){ - MessageService.showToast("Seguindo "+ institutionCardCtrl.institution.name); + MessageService.showInfoToast("Seguindo "+ institutionCardCtrl.institution.name); institutionCardCtrl.user.follow(institutionCardCtrl.institution); AuthService.save(); }); @@ -49,13 +49,13 @@ institutionCardCtrl.unfollow = function unfollow() { if (institutionCardCtrl.user.isMember(institutionCardCtrl.institution.key)){ - MessageService.showToast("Você não pode deixar de seguir " + institutionCardCtrl.institution.name); + MessageService.showErrorToast("Você não pode deixar de seguir " + institutionCardCtrl.institution.name); } else { var promise = InstitutionService.unfollow(institutionCardCtrl.institution.key); promise.then(function success(){ institutionCardCtrl.user.unfollow(institutionCardCtrl.institution); AuthService.save(); - MessageService.showToast("Deixou de seguir "+institutionCardCtrl.institution.name); + MessageService.showInfoToast("Deixou de seguir "+institutionCardCtrl.institution.name); }); return promise; } diff --git a/frontend/institution/institutionController.js b/frontend/institution/institutionController.js index cb9db478d..7a4c73960 100644 --- a/frontend/institution/institutionController.js +++ b/frontend/institution/institutionController.js @@ -142,19 +142,19 @@ institutionCtrl.user.follow(institutionCtrl.institution); institutionCtrl.isUserFollower = true; AuthService.save(); - MessageService.showToast("Seguindo "+ institutionCtrl.institution.name); + MessageService.showInfoToast("Seguindo "+ institutionCtrl.institution.name); }); return promise; }; institutionCtrl.unfollow = function unfollow() { if(institutionCtrl.user.isMember(institutionCtrl.institution.key)){ - MessageService.showToast("Você não pode deixar de seguir " + institutionCtrl.institution.name); + MessageService.showErrorToast("Você não pode deixar de seguir " + institutionCtrl.institution.name); } else{ var promise = InstitutionService.unfollow(currentInstitutionKey); promise.then(function success(){ - MessageService.showToast("Deixou de seguir "+institutionCtrl.institution.name); + MessageService.showInfoToast("Deixou de seguir "+institutionCtrl.institution.name); institutionCtrl.user.unfollow(institutionCtrl.institution); institutionCtrl.isUserFollower = false; AuthService.save(); @@ -339,7 +339,7 @@ institutionCtrl.file = null; institutionCtrl.saveImage(); }, function error(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); }); }; @@ -349,7 +349,7 @@ ImageService.saveImage(institutionCtrl.cover_photo).then(function success(data) { updateCoverImage(data); }, function error(response) { - MessageService.showToast(response.msg); + MessageService.showErrorToast(response.msg); }); } }; diff --git a/frontend/institution/manageMembers/managementMembersController.js b/frontend/institution/manageMembers/managementMembersController.js index a4392aa55..6674ece11 100644 --- a/frontend/institution/manageMembers/managementMembersController.js +++ b/frontend/institution/manageMembers/managementMembersController.js @@ -90,7 +90,7 @@ _.remove(manageMemberCtrl.members, function(member) { return member.key === member_obj.key; }); - MessageService.showToast("Membro removido com sucesso."); + MessageService.showInfoToast("Membro removido com sucesso."); }; manageMemberCtrl.showUserProfile = function showUserProfile(userKey, ev) { @@ -142,13 +142,13 @@ manageMemberCtrl.showInvites = true; manageMemberCtrl.showSendInvite = false; manageMemberCtrl.isLoadingInvite = false; - MessageService.showToast(responseData.msg); + MessageService.showInfoToast(responseData.msg); }, function error() { manageMemberCtrl.isLoadingInvite = false; }); return promise; } else if(!invite.isValid()) { - MessageService.showToast('Convite inválido!'); + MessageService.showErrorToast('Convite inválido!'); } }; @@ -267,10 +267,10 @@ var promise = $mdDialog.show(confirm); promise.then(function () { InviteService.resendInvite(inviteKey).then(function success() { - MessageService.showToast("Convite reenviado com sucesso."); + MessageService.showInfoToast("Convite reenviado com sucesso."); }); }, function () { - MessageService.showToast('Cancelado.'); + MessageService.showInfoToast('Cancelado.'); }); return promise; }; @@ -301,13 +301,13 @@ manageMemberCtrl.isValidAllEmails = function isValidAllEmails(emails) { if(_.size(emails) === 0 ){ - MessageService.showToast("Insira pelo menos um email."); + MessageService.showErrorToast("Insira pelo menos um email."); return false; } var correctArray = manageMemberCtrl.removePendingAndMembersEmails(emails); if(!_.isEqual(correctArray, emails)){ - MessageService.showToast("E-mails selecionados já foram convidados, " + + MessageService.showErrorToast("E-mails selecionados já foram convidados, " + "requisitaram ser membro ou pertencem a algum" + " membro da instituição."); return false; @@ -334,7 +334,7 @@ manageMemberCtrl.addCSV = function addCSV(files, ev) { var file = files[0]; if(file && (file.size > MAXIMUM_CSV_SIZE)) { - MessageService.showToast('O arquivo deve ser um CSV menor que 5 Mb'); + MessageService.showErrorToast('O arquivo deve ser um CSV menor que 5 Mb'); } else { var reader = new FileReader(); reader.onload = function(e) { diff --git a/frontend/institution/registeredInstitution.component.js b/frontend/institution/registeredInstitution.component.js index fea9ed8b1..371fedf09 100644 --- a/frontend/institution/registeredInstitution.component.js +++ b/frontend/institution/registeredInstitution.component.js @@ -39,7 +39,7 @@ .then(function success() { regInstCtrl.user.follow(regInstCtrl.institution); AuthService.save(); - MessageService.showToast("Seguindo " + regInstCtrl.institution.name); + MessageService.showInfoToast("Seguindo " + regInstCtrl.institution.name); }); }; diff --git a/frontend/institution/removeInstController.js b/frontend/institution/removeInstController.js index 2d33ff7ec..7b363c5a6 100644 --- a/frontend/institution/removeInstController.js +++ b/frontend/institution/removeInstController.js @@ -25,7 +25,7 @@ } else { $state.go(STATES.HOME); } - MessageService.showToast("Instituição removida com sucesso."); + MessageService.showInfoToast("Instituição removida com sucesso."); }); }; diff --git a/frontend/institution/selectEmailsController.js b/frontend/institution/selectEmailsController.js index 9ab534687..ebe4413a8 100644 --- a/frontend/institution/selectEmailsController.js +++ b/frontend/institution/selectEmailsController.js @@ -18,7 +18,7 @@ if (emailExists) { selectEmailsCtrl.selectedEmails.splice(index, 1); } else if (!selectEmailsCtrl.validateEmail(email)) { - MessageService.showToast("Não é possível selecionar esta opção. E-mail inválido."); + MessageService.showErrorToast("Não é possível selecionar esta opção. E-mail inválido."); } else { selectEmailsCtrl.selectedEmails.push(email); } @@ -54,13 +54,13 @@ if (!_.isEmpty(emails)) { selectEmailsCtrl.sendUserInvite(emails); } else { - MessageService.showToast("E-mails selecionados já foram convidados, requisitaram ser membro ou pertencem a algum membro da instituição."); + MessageService.showErrorToast("E-mails selecionados já foram convidados, requisitaram ser membro ou pertencem a algum membro da instituição."); } selectEmailsCtrl.closeDialog(); } else if (selectEmailsCtrl.selectedEmails > MAX_EMAILS_QUANTITY) { - MessageService.showToast("Limite máximo de " + MAX_EMAILS_QUANTITY + " e-mails selecionados excedido."); + MessageService.showErrorToast("Limite máximo de " + MAX_EMAILS_QUANTITY + " e-mails selecionados excedido."); } else { - MessageService.showToast("Pelo menos um e-mail deve ser selecionado."); + MessageService.showErrorToast("Pelo menos um e-mail deve ser selecionado."); } }; diff --git a/frontend/institution/transferAdminController.js b/frontend/institution/transferAdminController.js index 72400b49a..e92a58a69 100644 --- a/frontend/institution/transferAdminController.js +++ b/frontend/institution/transferAdminController.js @@ -53,13 +53,13 @@ InviteService.sendInviteUser({invite_body: invite}).then(function success() { invite.status = 'sent'; $mdDialog.hide(invite); - MessageService.showToast("Convite enviado com sucesso!"); + MessageService.showInfoToast("Convite enviado com sucesso!"); }); } else { - MessageService.showToast('Você já é administrador da instituição, selecione outro membro!'); + MessageService.showErrorToast('Você já é administrador da instituição, selecione outro membro!'); } } else { - MessageService.showToast('Selecione um memebro!'); + MessageService.showErrorToast('Selecione um memebro!'); } }; }); diff --git a/frontend/invites/inviteInstHierarchieController.js b/frontend/invites/inviteInstHierarchieController.js index 6ffc63818..58f230d83 100644 --- a/frontend/invites/inviteInstHierarchieController.js +++ b/frontend/invites/inviteInstHierarchieController.js @@ -41,9 +41,9 @@ inviteInstHierCtrl.invite.admin_key = inviteInstHierCtrl.user.key; invite = new Invite(inviteInstHierCtrl.invite); if (!invite.isValid()) { - MessageService.showToast('Convite inválido!'); + MessageService.showErrorToast('Convite inválido!'); } else if(inviteInstHierCtrl.hasParent && invite.type_of_invite === INSTITUTION_PARENT) { - MessageService.showToast("Já possui instituição superior"); + MessageService.showErrorToast("Já possui instituição superior"); } else { var suggestionInstName = inviteInstHierCtrl.invite.suggestion_institution_name; promise = InstitutionService.searchInstitutions(suggestionInstName, INSTITUTION_STATE, 'institution'); @@ -96,7 +96,7 @@ } deferred.resolve(); inviteInstHierCtrl.isLoadingSubmission = false; - MessageService.showToast('Convite enviado com sucesso!'); + MessageService.showInfoToast('Convite enviado com sucesso!'); }, function error() { deferred.reject(); inviteInstHierCtrl.isLoadingSubmission = false; @@ -110,7 +110,7 @@ var deferred = $q.defer(); sendRequest(invite).then(function success() { - MessageService.showToast('Convite enviado com sucesso!'); + MessageService.showInfoToast('Convite enviado com sucesso!'); addInviteToRequests(invite); if (invite.type_of_invite === REQUEST_PARENT) { addParentInstitution(institutionRequestedKey); @@ -193,7 +193,7 @@ if (inviteInstHierCtrl.isActive(institution)) { inviteInstHierCtrl.goToInst(institution.key); } else { - MessageService.showToast("Institutição inativa!"); + MessageService.showErrorToast("Institutição inativa!"); } }; @@ -252,7 +252,7 @@ var promise = $mdDialog.show(confirm); promise.then(function() { InstitutionService.removeLink(inviteInstHierCtrl.institution.key, institution.key, isParent).then(function success() { - MessageService.showToast('Conexão removida com sucesso'); + MessageService.showInfoToast('Conexão removida com sucesso'); if(isParent) { inviteInstHierCtrl.hasParent = false; inviteInstHierCtrl.institution.parent_institution = {}; @@ -261,7 +261,7 @@ } }); }, function() { - MessageService.showToast('Cancelado'); + MessageService.showInfoToast('Cancelado'); }); return promise; }; diff --git a/frontend/invites/inviteInstitutionController.js b/frontend/invites/inviteInstitutionController.js index c0f27ca19..aa61a49e9 100644 --- a/frontend/invites/inviteInstitutionController.js +++ b/frontend/invites/inviteInstitutionController.js @@ -42,9 +42,9 @@ invite = new Invite(inviteInstCtrl.invite); if (!invite.isValid()) { - MessageService.showToast('Convite inválido!'); + MessageService.showErrorToast('Convite inválido!'); } else if (!inviteInstCtrl.user.hasPermission('analyze_request_inst')) { - MessageService.showToast('Você não tem permissão para enviar este tipo de convite.'); + MessageService.showErrorToast('Você não tem permissão para enviar este tipo de convite.'); } else { var suggestionInstName = inviteInstCtrl.invite.suggestion_institution_name; promise = InstitutionService.searchInstitutions(suggestionInstName, INSTITUTION_STATE, 'institution'); @@ -93,7 +93,7 @@ inviteInstCtrl.sent_invitations.push(invite); inviteInstCtrl.showInvites = true; inviteInstCtrl.showSendInvites = false; - MessageService.showToast('Convite enviado com sucesso!'); + MessageService.showInfoToast('Convite enviado com sucesso!'); }); return promise; }; @@ -134,10 +134,10 @@ var promise = $mdDialog.show(confirm); promise.then(function () { InviteService.resendInvite(inviteKey).then(function success() { - MessageService.showToast("Convite reenviado com sucesso."); + MessageService.showInfoToast("Convite reenviado com sucesso."); }); }, function () { - MessageService.showToast('Cancelado.'); + MessageService.showInfoToast('Cancelado.'); }); return promise; }; diff --git a/frontend/invites/newInviteController.js b/frontend/invites/newInviteController.js index 216e31df8..7be00a701 100644 --- a/frontend/invites/newInviteController.js +++ b/frontend/invites/newInviteController.js @@ -26,7 +26,7 @@ if (!userIsAMember()) { newInviteCtrl.addInstitution(event); } else { - MessageService.showToast('Você já é membro dessa instituição'); + MessageService.showErrorToast('Você já é membro dessa instituição'); newInviteCtrl.deleteInvite(); } } @@ -106,7 +106,7 @@ promise.then(function() { newInviteCtrl.deleteInvite(); }, function() { - MessageService.showToast('Cancelado'); + MessageService.showInfoToast('Cancelado'); }); return promise; }; @@ -195,7 +195,7 @@ function isValidProfile() { if(!newInviteCtrl.office) { - MessageService.showToast("Cargo institucional deve ser preenchido."); + MessageService.showErrorToast("Cargo institucional deve ser preenchido."); return false; } return true; diff --git a/frontend/invites/processInviteUserAdmController.js b/frontend/invites/processInviteUserAdmController.js index 3ded90487..7ecc2c43a 100644 --- a/frontend/invites/processInviteUserAdmController.js +++ b/frontend/invites/processInviteUserAdmController.js @@ -23,14 +23,14 @@ AuthService.save(); processCtrl.typeOfDialog = processCtrl.VIEW_INVITE_INVITEE; processCtrl.isAccepting = true; - MessageService.showToast('Convite aceito com sucesso!'); + MessageService.showInfoToast('Convite aceito com sucesso!'); }); }; processCtrl.reject = function reject() { InviteService.rejectInviteUserAdm(processCtrl.invite.key).then(function success() { processCtrl.close(); - MessageService.showToast('Convite recusado!'); + MessageService.showInfoToast('Convite recusado!'); }); }; diff --git a/frontend/invites/removeChildController.js b/frontend/invites/removeChildController.js index a19611b5d..a1a8b837b 100644 --- a/frontend/invites/removeChildController.js +++ b/frontend/invites/removeChildController.js @@ -29,7 +29,7 @@ AuthService.save(); removeChildFromParent(); removeChildCtrl.closeDialog(); - MessageService.showToast("Instituição removida com sucesso."); + MessageService.showInfoToast("Instituição removida com sucesso."); }); }; }); diff --git a/frontend/invites/suggestInstitutionController.js b/frontend/invites/suggestInstitutionController.js index 57ca944de..e5f1898dd 100644 --- a/frontend/invites/suggestInstitutionController.js +++ b/frontend/invites/suggestInstitutionController.js @@ -94,7 +94,7 @@ const isChild = isChildFromBottomUpPerspective && isChildFromTopDownPerspective; if (isParent || isChild) { - MessageService.showToast('As instituições já estão conectadas'); + MessageService.showErrorToast('As instituições já estão conectadas'); return true; } return false; @@ -102,7 +102,7 @@ function isPedingRequest() { if (_.includes(_.map(suggestInstCtrl.requested_invites, getInstKeyFromInvite), suggestInstCtrl.chosen_institution)) { - MessageService.showToast('Esta instituição tem uma requisição de vínculo pendente. Aceite ou rejeite a requisição'); + MessageService.showErrorToast('Esta instituição tem uma requisição de vínculo pendente. Aceite ou rejeite a requisição'); return true; } return false; @@ -110,7 +110,7 @@ function isSelf() { if (suggestInstCtrl.institution.key === suggestInstCtrl.chosen_institution) { - MessageService.showToast('A instituição convidada não pode ser ela mesma'); + MessageService.showErrorToast('A instituição convidada não pode ser ela mesma'); return true; } return false; @@ -121,7 +121,7 @@ _.forEach(suggestInstCtrl.institution.sent_invitations, function(invite) { if ((invite.type_of_invite === "REQUEST_INSTITUTION_PARENT" || invite.type_of_invite === "REQUEST_INSTITUTION_CHILDREN") && invite.institution_requested_key === suggestInstCtrl.chosen_institution && invite.status === "sent") { - MessageService.showToast('Esta instituição já foi convidada, mas seu convite está pendente'); + MessageService.showErrorToast('Esta instituição já foi convidada, mas seu convite está pendente'); result = true; } }); diff --git a/frontend/post/postDetailsDirective.js b/frontend/post/postDetailsDirective.js index 17a684e58..0e20cd5b7 100644 --- a/frontend/post/postDetailsDirective.js +++ b/frontend/post/postDetailsDirective.js @@ -41,10 +41,10 @@ POST_EVENTS.DELETED_POST_EVENT_TO_UP, postDetailsCtrl.post ); - MessageService.showToast('Post excluído com sucesso'); + MessageService.showInfoToast('Post excluído com sucesso'); }); }, function() { - MessageService.showToast('Cancelado'); + MessageService.showInfoToast('Cancelado'); }); }; @@ -190,7 +190,7 @@ postDetailsCtrl.copyLink = function copyLink(){ var url = Utils.generateLink(URL_POST + postDetailsCtrl.post.key); ngClipboard.toClipboard(url); - MessageService.showToast("O link foi copiado"); + MessageService.showInfoToast("O link foi copiado"); }; postDetailsCtrl.likeOrDislikePost = function likeOrDislikePost() { @@ -247,14 +247,14 @@ postDetailsCtrl.addSubscriber = function addSubscriber() { PostService.addSubscriber(postDetailsCtrl.post.key).then(function success() { - MessageService.showToast('Esse post foi marcado como de seu interesse.'); + MessageService.showInfoToast('Esse post foi marcado como de seu interesse.'); postDetailsCtrl.post.subscribers.push(postDetailsCtrl.user.key); }); }; postDetailsCtrl.removeSubscriber = function removeSubscriber() { PostService.removeSubscriber(postDetailsCtrl.post.key).then(function success() { - MessageService.showToast('Esse post foi removido dos posts de seu interesse.'); + MessageService.showInfoToast('Esse post foi removido dos posts de seu interesse.'); _.remove(postDetailsCtrl.post.subscribers, function(userKey) { return userKey === postDetailsCtrl.user.key; }); @@ -302,7 +302,7 @@ postDetailsCtrl.followEvent = () => { EventService.addFollower(postDetailsCtrl.post.shared_event.key).then(() => { postDetailsCtrl.post.shared_event.addFollower(postDetailsCtrl.user.key); - MessageService.showToast('Você receberá as atualizações desse evento.'); + MessageService.showInfoToast('Você receberá as atualizações desse evento.'); }); }; @@ -313,7 +313,7 @@ postDetailsCtrl.unFollowEvent = () => { EventService.removeFollower(postDetailsCtrl.post.shared_event.key).then(() => { postDetailsCtrl.post.shared_event.removeFollower(postDetailsCtrl.user.key); - MessageService.showToast('Você não receberá as atualizações desse evento.'); + MessageService.showInfoToast('Você não receberá as atualizações desse evento.'); }); }; @@ -479,7 +479,7 @@ $state.go(STATES.HOME); }); } else { - MessageService.showToast("Comentário não pode ser vazio."); + MessageService.showErrorToast("Comentário não pode ser vazio."); } return promise; }; diff --git a/frontend/post/postDirective.js b/frontend/post/postDirective.js index 67b7285de..3815203f1 100644 --- a/frontend/post/postDirective.js +++ b/frontend/post/postDirective.js @@ -37,7 +37,7 @@ postCtrl.deletePreviousImage = true; postCtrl.file = null; }, function error(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); }); }; @@ -61,7 +61,7 @@ postCtrl.addPdf = function addPdf(files) { if(files[0].size > MAXIMUM_PDF_SIZE) { - MessageService.showToast('O arquivo deve ser um pdf menor que 5 Mb'); + MessageService.showErrorToast('O arquivo deve ser um pdf menor que 5 Mb'); } else { postCtrl.pdfFiles = files; } @@ -136,7 +136,7 @@ } deferred.resolve(); }, function error(response) { - MessageService.showToast(response); + MessageService.showErrorToast(response); deferred.reject(); }); } else { @@ -200,7 +200,7 @@ saveEditedPost(originalPost); }, function error(error) { postCtrl.loadingPost = false; - MessageService.showToast(error); + MessageService.showErrorToast(error); }); }; @@ -229,7 +229,7 @@ PostService.createPost(post).then(function success(response) { postCtrl.clearPost(); $rootScope.$emit(POST_EVENTS.NEW_POST_EVENT_TO_UP, new Post(response)); - MessageService.showToast('Postado com sucesso!'); + MessageService.showInfoToast('Postado com sucesso!'); changeTimelineToStart(); $mdDialog.hide(); postCtrl.loadingPost = false; @@ -243,7 +243,7 @@ }); }); } else { - MessageService.showToast('Post inválido!'); + MessageService.showErrorToast('Post inválido!'); } }); postCtrl.post.photo_url = null; @@ -290,14 +290,14 @@ PostService.save(postCtrl.post.key, patch).then(function success() { deleteFiles().then(function success() { postCtrl.deletedFiles = []; - MessageService.showToast('Publicação editada com sucesso!'); + MessageService.showInfoToast('Publicação editada com sucesso!'); $mdDialog.hide(postCtrl.post); }, function error(response) { $mdDialog.cancel(); }); }); } else { - MessageService.showToast('Edição inválida!'); + MessageService.showErrorToast('Edição inválida!'); } }); } diff --git a/frontend/post/postPageController.js b/frontend/post/postPageController.js index 49400fa43..931bf0cfd 100644 --- a/frontend/post/postPageController.js +++ b/frontend/post/postPageController.js @@ -28,7 +28,7 @@ postCtrl.copyLink = function copyLink() { var url = Utils.generateLink('/post/' + postCtrl.post.key); ngClipboard.toClipboard(url); - MessageService.showToast("O link foi copiado"); + MessageService.showInfoToast("O link foi copiado"); }; /** @@ -75,7 +75,7 @@ */ postCtrl.addSubscriber = function addSubscriber() { PostService.addSubscriber(postCtrl.post.key).then(function success() { - MessageService.showToast('Esse post foi marcado como de seu interesse.'); + MessageService.showInfoToast('Esse post foi marcado como de seu interesse.'); postCtrl.post.subscribers.push(postCtrl.user.key); }); }; @@ -86,7 +86,7 @@ */ postCtrl.removeSubscriber = function removeSubscriber() { PostService.removeSubscriber(postCtrl.post.key).then(function success() { - MessageService.showToast('Esse post foi removido dos posts de seu interesse.'); + MessageService.showInfoToast('Esse post foi removido dos posts de seu interesse.'); _.remove(postCtrl.post.subscribers, function (userKey) { return userKey === postCtrl.user.key; }); diff --git a/frontend/post/sharePostController.js b/frontend/post/sharePostController.js index ef58942a1..f16578ee0 100644 --- a/frontend/post/sharePostController.js +++ b/frontend/post/sharePostController.js @@ -44,7 +44,7 @@ shareCtrl.share = function share() { makePost(shareCtrl.post); PostService.createPost(shareCtrl.newPost).then(function success(response) { - MessageService.showToast('Compartilhado com sucesso!'); + MessageService.showInfoToast('Compartilhado com sucesso!'); $mdDialog.hide(); shareCtrl.addPostTimeline(response); const postAuthorPermissions = ["remove_post"]; diff --git a/frontend/requests/analyseHierarchyRequestController.js b/frontend/requests/analyseHierarchyRequestController.js index 8acf8cc09..774c64ce4 100644 --- a/frontend/requests/analyseHierarchyRequestController.js +++ b/frontend/requests/analyseHierarchyRequestController.js @@ -36,13 +36,13 @@ function success() { request.status = 'rejected'; $mdDialog.cancel(); - MessageService.showToast('Solicitação rejeitada com sucesso'); + MessageService.showInfoToast('Solicitação rejeitada com sucesso'); }); }; analyseHierReqCtrl.close = function close() { $mdDialog.hide(); - MessageService.showToast('Solicitação aceita com sucesso'); + MessageService.showInfoToast('Solicitação aceita com sucesso'); }; analyseHierReqCtrl.showProcessingMessage = function showProcessingMessage() { diff --git a/frontend/requests/requestDialogService.js b/frontend/requests/requestDialogService.js index 04610171c..ef104764b 100644 --- a/frontend/requests/requestDialogService.js +++ b/frontend/requests/requestDialogService.js @@ -35,7 +35,7 @@ var request = new Invite(data); selectDialogToShow(request, event, dialogProperties); }, function error(response) { - MessageService.showToast(response.data.msg); + MessageService.showErrorToast(response.data.msg); } ); }; diff --git a/frontend/requests/requestInvitationController.js b/frontend/requests/requestInvitationController.js index 165de470d..9a193e9ee 100644 --- a/frontend/requests/requestInvitationController.js +++ b/frontend/requests/requestInvitationController.js @@ -31,7 +31,7 @@ requestInvCtrl.currentUser.institutions_requested.push(requestInvCtrl.institutionSelect.key); AuthService.save(); $mdDialog.hide(); - MessageService.showToast("Pedido enviado com sucesso!"); + MessageService.showInfoToast("Pedido enviado com sucesso!"); }, function error() { requestInvCtrl.cancelDialog(); }); @@ -44,7 +44,7 @@ .filter(request => request.status === "sent") .map(request => request.sender_key); return !sender_keys.includes(requestInvCtrl.currentUser.key) ? - requestInvCtrl.sendRequest() : MessageService.showToast("Usuário já solicitou fazer parte dessa instituição."); + requestInvCtrl.sendRequest() : MessageService.showErrorToast("Usuário já solicitou fazer parte dessa instituição."); } else { requestInvCtrl.sendRequest(); } diff --git a/frontend/requests/requestProcessingController.js b/frontend/requests/requestProcessingController.js index 5ef0e3fee..12f433327 100644 --- a/frontend/requests/requestProcessingController.js +++ b/frontend/requests/requestProcessingController.js @@ -19,7 +19,7 @@ requestController.acceptRequest = function acceptRequest() { resolveRequest().then(function success() { - MessageService.showToast("Solicitação aceita!"); + MessageService.showInfoToast("Solicitação aceita!"); request.status = 'accepted'; requestController.hideDialog(); refreshUser(); @@ -47,13 +47,13 @@ deleteRequest().then(function success() { request.status = 'rejected'; requestController.hideDialog(); - MessageService.showToast("Solicitação rejeitada!"); + MessageService.showInfoToast("Solicitação rejeitada!"); }); }; requestController.cancelReject = function cancelReject() { $mdDialog.cancel(); - MessageService.showToast('Cancelado'); + MessageService.showInfoToast('Cancelado'); }; function deleteRequest() { @@ -123,7 +123,7 @@ const institutionLinkKey = requestController.children.parent_institution.key; InstitutionService.removeLink(institutionKey, institutionLinkKey, isParent).then(function success() { - MessageService.showToast('Vínculo removido.'); + MessageService.showInfoToast('Vínculo removido.'); delete requestController.children.parent_institution; }); }; diff --git a/frontend/sideMenu/sideMenu.component.js b/frontend/sideMenu/sideMenu.component.js index 9f5111397..9270e29cd 100644 --- a/frontend/sideMenu/sideMenu.component.js +++ b/frontend/sideMenu/sideMenu.component.js @@ -50,7 +50,7 @@ setItems(); }) .catch(err => { - MessageService.showToast("Um erro ocorreu. Não foi possível carregar a instituição."); + MessageService.showErrorToast("Um erro ocorreu. Não foi possível carregar a instituição."); }); }; diff --git a/frontend/survey/survey.component.js b/frontend/survey/survey.component.js index 0f1fee332..cdb13ee77 100644 --- a/frontend/survey/survey.component.js +++ b/frontend/survey/survey.component.js @@ -79,7 +79,7 @@ var promise = PostService.createPost(survey).then(function success(response) { surveyCtrl.resetSurvey(); $rootScope.$emit(POST_EVENTS.NEW_POST_EVENT_TO_UP, new Post(response)); - MessageService.showToast('Postado com sucesso!'); + MessageService.showInfoToast('Postado com sucesso!'); surveyCtrl.callback(); const postAuthorPermissions = ["remove_post"]; surveyCtrl.user.addPermissions(postAuthorPermissions, response.key); @@ -93,7 +93,7 @@ }); return promise; } else { - MessageService.showToast("Enquete deve ter no mínimo 2 opções e data limite definida"); + MessageService.showErrorToast("Enquete deve ter no mínimo 2 opções e data limite definida"); } }; diff --git a/frontend/survey/surveyDetailsDirective.js b/frontend/survey/surveyDetailsDirective.js index 86f401bd3..5b93bf716 100644 --- a/frontend/survey/surveyDetailsDirective.js +++ b/frontend/survey/surveyDetailsDirective.js @@ -67,11 +67,11 @@ surveyCtrl.reloadPost(); }); }, function() { - MessageService.showToast('Cancelado'); + MessageService.showInfoToast('Cancelado'); }); return dialog; } else { - MessageService.showToast('Você precisa escolher alguma alternativa'); + MessageService.showErrorToast('Você precisa escolher alguma alternativa'); } }; @@ -80,7 +80,7 @@ promise.then(function sucess(response){ surveyCtrl.post = response; addVote(surveyCtrl.optionsSelected); - MessageService.showToast('Voto computado'); + MessageService.showInfoToast('Voto computado'); }); return promise; }; diff --git a/frontend/test/specs/comment/commentControllerSpec.js b/frontend/test/specs/comment/commentControllerSpec.js index 9d6019424..4ac3af98b 100644 --- a/frontend/test/specs/comment/commentControllerSpec.js +++ b/frontend/test/specs/comment/commentControllerSpec.js @@ -211,7 +211,7 @@ commentCtrl.saving = true; spyOn(commentService, 'like').and.returnValue(deferred.promise); spyOn(commentCtrl, 'addLike').and.callThrough(); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); expect(commentCtrl.numberOfLikes()).toEqual(0); }); @@ -235,7 +235,7 @@ expect(commentService.like).toHaveBeenCalledWith(post.key, comment.id, null); expect(commentCtrl.addLike).not.toHaveBeenCalled(); expect(commentCtrl.numberOfLikes()).toEqual(0); - expect(messageService.showToast).toHaveBeenCalledWith("Não foi possível curtir o comentário"); + expect(messageService.showErrorToast).toHaveBeenCalledWith("Não foi possível curtir o comentário"); }); it('should like the reply', function() { @@ -260,7 +260,7 @@ expect(commentService.like).toHaveBeenCalledWith(post.key, comment.id, reply.id); expect(commentCtrl.addLike).not.toHaveBeenCalled(); expect(commentCtrl.numberOfLikes()).toEqual(0); - expect(messageService.showToast).toHaveBeenCalledWith("Não foi possível curtir o comentário"); + expect(messageService.showErrorToast).toHaveBeenCalledWith("Não foi possível curtir o comentário"); }); }); @@ -269,7 +269,7 @@ commentCtrl.saving = true; spyOn(commentService, 'dislike').and.returnValue(deferred.promise); spyOn(commentCtrl, 'removeLike').and.callThrough(); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); }); afterEach(function() { @@ -300,7 +300,7 @@ expect(commentService.dislike).toHaveBeenCalledWith(post.key, comment.id, null); expect(commentCtrl.removeLike).not.toHaveBeenCalled(); expect(commentCtrl.numberOfLikes()).toEqual(1); - expect(messageService.showToast).toHaveBeenCalledWith("Não foi possível descurtir o comentário"); + expect(messageService.showErrorToast).toHaveBeenCalledWith("Não foi possível descurtir o comentário"); }); it('should dislike the reply', function() { @@ -327,7 +327,7 @@ expect(commentService.dislike).toHaveBeenCalledWith(post.key, comment.id, null); expect(commentCtrl.removeLike).not.toHaveBeenCalled(); expect(commentCtrl.numberOfLikes()).toEqual(1); - expect(messageService.showToast).toHaveBeenCalledWith("Não foi possível descurtir o comentário"); + expect(messageService.showErrorToast).toHaveBeenCalledWith("Não foi possível descurtir o comentário"); }); }); @@ -368,14 +368,14 @@ commentCtrl.setReplyId(); expect(commentCtrl.comment.replies).toEqual(replies); spyOn(commentService, 'deleteReply').and.callThrough(); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); httpBackend.expect( 'DELETE', POSTS_URI + '/' + post.key + '/comments/'+ comment.id +'/replies/'+ reply.id ).respond(reply); commentCtrl.deleteReply(); httpBackend.flush(); expect(commentService.deleteReply).toHaveBeenCalledWith(post.key, comment.id, reply.id); - expect(messageService.showToast).toHaveBeenCalledWith('Comentário excluído com sucesso'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Comentário excluído com sucesso'); expect(commentCtrl.comment.replies).toEqual({'nil-key': nilReply}); }); }); @@ -385,14 +385,14 @@ commentCtrl.post.data_comments = [comment]; expect(commentCtrl.post.data_comments).toEqual([comment]); spyOn(commentService, 'deleteComment').and.callThrough(); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); httpBackend.expect( 'DELETE', POSTS_URI + '/' + post.key + '/comments/' + comment.id ).respond(comment); commentCtrl.deleteComment(); httpBackend.flush(); expect(commentService.deleteComment).toHaveBeenCalledWith(post.key, comment.id); - expect(messageService.showToast).toHaveBeenCalledWith('Comentário excluído com sucesso'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Comentário excluído com sucesso'); expect(commentCtrl.post.data_comments).toEqual([]); }); }); diff --git a/frontend/test/specs/event/eventDetailsControllerSpec.js b/frontend/test/specs/event/eventDetailsControllerSpec.js index 722022e6a..08ac4027e 100644 --- a/frontend/test/specs/event/eventDetailsControllerSpec.js +++ b/frontend/test/specs/event/eventDetailsControllerSpec.js @@ -261,13 +261,13 @@ describe('copyLink()', () => { it('should call toClipboard', () => { spyOn(clipboard, 'toClipboard'); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); eventCtrl.event = new Event({key: 'aposdkspoakdposa'}); eventCtrl.copyLink(); expect(clipboard.toClipboard).toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalled(); + expect(messageService.showInfoToast).toHaveBeenCalled(); }); }); @@ -304,7 +304,7 @@ spyOn(eventService, 'addFollower').and.callFake(() => { return q.when(); }); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); eventCtrl.event = new Event({ key: 'aopskdopas-OKAPODKAOP', followers: [] }); spyOn(eventCtrl.event, 'addFollower').and.callThrough(); @@ -312,7 +312,7 @@ scope.$apply(); expect(eventService.addFollower).toHaveBeenCalledWith(eventCtrl.event.key); - expect(messageService.showToast).toHaveBeenCalled(); + expect(messageService.showInfoToast).toHaveBeenCalled(); expect(eventCtrl.event.addFollower).toHaveBeenCalled(); expect(eventCtrl.event.followers).toEqual([user.key]); }); @@ -340,7 +340,7 @@ spyOn(eventService, 'removeFollower').and.callFake(() => { return q.when(); }); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); eventCtrl.event = new Event({ key: 'aopskdopas-OKAPODKAOP', followers: [] }); spyOn(eventCtrl.event, 'removeFollower').and.callThrough(); @@ -348,7 +348,7 @@ scope.$apply(); expect(eventService.removeFollower).toHaveBeenCalledWith(eventCtrl.event.key); - expect(messageService.showToast).toHaveBeenCalled(); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Você não receberá as atualizações desse evento.'); expect(eventCtrl.event.removeFollower).toHaveBeenCalled(); }); diff --git a/frontend/test/specs/event/eventDialogCtrlSpec.js b/frontend/test/specs/event/eventDialogCtrlSpec.js index c757b4c2d..46a877784 100644 --- a/frontend/test/specs/event/eventDialogCtrlSpec.js +++ b/frontend/test/specs/event/eventDialogCtrlSpec.js @@ -163,23 +163,23 @@ expect(eventService.createEvent).toHaveBeenCalledWith(event); }); - describe('MessageService.showToast()', () => { + describe('MessageService.showErrorToast()', () => { it('should be invalid, because title is undefined', () => { controller.event.title = undefined; - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); controller.save(); scope.$apply(); - expect(messageService.showToast).toHaveBeenCalledWith('Evento inválido!'); + expect(messageService.showErrorToast).toHaveBeenCalledWith('Evento inválido!'); }); it('should be invalid, because local is undefined', () => { controller.event.title = "Inauguration"; controller.event.local = undefined; - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); controller.save(); scope.$apply(); - expect(messageService.showToast).toHaveBeenCalledWith('Evento inválido!'); + expect(messageService.showErrorToast).toHaveBeenCalledWith('Evento inválido!'); }); }); @@ -259,11 +259,11 @@ controller.steps = [true, false, false]; }); - it('should call showToast', () => { - spyOn(messageService, 'showToast'); + it('should call showErrorToast', () => { + spyOn(messageService, 'showErrorToast'); controller.event.address = {country: 'Brasil'}; controller.nextStep(); - expect(messageService.showToast).toHaveBeenCalled(); + expect(messageService.showErrorToast).toHaveBeenCalled(); }); it('should not pass from first step', () => { @@ -550,15 +550,15 @@ }); describe('in fail case', () => { - it('Should call messageService.showToast and state.go', () => { + it('Should call messageService.showErrorToast and state.go', () => { spyOn(eventService, 'getEvent').and.returnValue(deferred.promise); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); spyOn(state, 'go'); deferred.reject(); controller._loadEvent(event.key); scope.$apply(); expect(state.go).toHaveBeenCalledWith(states.HOME); - expect(messageService.showToast).toHaveBeenCalledWith("Erro ao carregar evento."); + expect(messageService.showErrorToast).toHaveBeenCalledWith("Erro ao carregar evento."); }); }); }); diff --git a/frontend/test/specs/institution/configInstDirectiveSpec.js b/frontend/test/specs/institution/configInstDirectiveSpec.js index 2a04be49b..6ff56ca9e 100644 --- a/frontend/test/specs/institution/configInstDirectiveSpec.js +++ b/frontend/test/specs/institution/configInstDirectiveSpec.js @@ -316,11 +316,11 @@ describe('Test ConfigInstDirective', function() { expect(editInstCtrl.steps).toEqual([false, false, true]); }); - it('should call showToast', function() { - spyOn(messageService, 'showToast'); + it('should call showErrorToast', function() { + spyOn(messageService, 'showErrorToast'); editInstCtrl.newInstitution.address = {}; editInstCtrl.nextStep(); - expect(messageService.showToast).toHaveBeenCalled(); + expect(messageService.showErrorToast).toHaveBeenCalledWith('Campos obrigatórios não preenchidos corretamente.'); }); it('should not pass from first step', function() { diff --git a/frontend/test/specs/institution/registeredInstitutionsControllerSpec.js b/frontend/test/specs/institution/registeredInstitutionsControllerSpec.js index 04d38b683..5b0dfeedc 100644 --- a/frontend/test/specs/institution/registeredInstitutionsControllerSpec.js +++ b/frontend/test/specs/institution/registeredInstitutionsControllerSpec.js @@ -12,6 +12,7 @@ describe('registeredInstitutionController test', () => { }); const institution = new Institution({ + name: 'institution', key: 'sopdkfap-OPAKOPAKFPO', creation_date: new Date() }); @@ -66,13 +67,13 @@ describe('registeredInstitutionController test', () => { } }); - spyOn(msgService, 'showToast'); + spyOn(msgService, 'showInfoToast'); spyOn(authService, 'save'); regInstCtrl.follow(regInstCtrl.institution.key); - expect(msgService.showToast).toHaveBeenCalled(); + expect(msgService.showInfoToast).toHaveBeenCalledWith('Seguindo institution'); expect(authService.save).toHaveBeenCalled(); expect(instService.follow).toHaveBeenCalled(); diff --git a/frontend/test/specs/institution/removeInstControllerSpec.js b/frontend/test/specs/institution/removeInstControllerSpec.js index 1d3d93c6c..14fb33c4d 100644 --- a/frontend/test/specs/institution/removeInstControllerSpec.js +++ b/frontend/test/specs/institution/removeInstControllerSpec.js @@ -86,14 +86,14 @@ spyOn(authService, 'save'); spyOn(removeInstCtrl, 'closeDialog'); spyOn(state, 'go'); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); removeInstCtrl.removeInst(); expect(institutionService.removeInstitution).toHaveBeenCalled(); expect(removeInstCtrl.user.institutions).toEqual([sec_institution]); expect(authService.save).toHaveBeenCalled(); expect(removeInstCtrl.closeDialog).toHaveBeenCalled(); expect(state.go).toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalled(); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Instituição removida com sucesso.'); }); it('should call authService.logout()', function() { diff --git a/frontend/test/specs/institution/transferAdminControllerSpec.js b/frontend/test/specs/institution/transferAdminControllerSpec.js index 219c35d8f..a54d57ecb 100644 --- a/frontend/test/specs/institution/transferAdminControllerSpec.js +++ b/frontend/test/specs/institution/transferAdminControllerSpec.js @@ -83,7 +83,8 @@ }); spyOn(mdDialog, 'hide').and.callFake(function() {}); - spyOn(messageService, 'showToast').and.callFake(function() {}); + spyOn(messageService, 'showErrorToast').and.callFake(function() {}); + spyOn(messageService, 'showInfoToast').and.callFake(function() {}); }); it('Should not send the invitation.', function() { @@ -103,7 +104,7 @@ transferAdminCtrl.selectMember(user); transferAdminCtrl.confirm(); - expect(messageService.showToast).toHaveBeenCalledWith("Você já é administrador da instituição, selecione outro membro!"); + expect(messageService.showErrorToast).toHaveBeenCalledWith("Você já é administrador da instituição, selecione outro membro!"); }); it('Should must send the invitation.', function() { @@ -125,14 +126,14 @@ expect(inviteService.sendInviteUser).toHaveBeenCalledWith({invite_body: invite}); expect(mdDialog.hide).toHaveBeenCalledWith(invite); - expect(messageService.showToast).toHaveBeenCalledWith("Convite enviado com sucesso!"); + expect(messageService.showInfoToast).toHaveBeenCalledWith("Convite enviado com sucesso!"); }); it('Should not be sent if there is no member selected.', function() { transferAdminCtrl.confirm(); expect(inviteService.sendInviteUser).not.toHaveBeenCalled(); expect(mdDialog.hide).not.toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalledWith("Selecione um memebro!"); + expect(messageService.showErrorToast).toHaveBeenCalledWith("Selecione um memebro!"); }); }); })); \ No newline at end of file diff --git a/frontend/test/specs/invites/inviteInstHierarchieControllerSpec.js b/frontend/test/specs/invites/inviteInstHierarchieControllerSpec.js index ca3b47245..c07c3ce77 100644 --- a/frontend/test/specs/invites/inviteInstHierarchieControllerSpec.js +++ b/frontend/test/specs/invites/inviteInstHierarchieControllerSpec.js @@ -124,20 +124,20 @@ describe('checkInstInvite', function() { beforeEach(function() { - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); }); - it('should call showToast with invalid invite message', function () { + it('should call showErrorToast with invalid invite message', function () { inviteInstHierarchieCtrl.invite = {}; inviteInstHierarchieCtrl.checkInstInvite('$event'); - expect(messageService.showToast).toHaveBeenCalledWith('Convite inválido!'); + expect(messageService.showErrorToast).toHaveBeenCalledWith('Convite inválido!'); }); - it('should call showToast with institution has already have a parent message', function() { + it('should call showErrorToast with institution has already have a parent message', function() { inviteInstHierarchieCtrl.invite = invite; inviteInstHierarchieCtrl.hasParent = true; inviteInstHierarchieCtrl.checkInstInvite('$event'); - expect(messageService.showToast).toHaveBeenCalledWith("Já possui instituição superior"); + expect(messageService.showErrorToast).toHaveBeenCalledWith("Já possui instituição superior"); }); it('should call searchInstitutions', function(done) { @@ -184,12 +184,12 @@ }); it('should call sendInviteHierarchy', function() { - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); inviteInstHierarchieCtrl.institution.sent_invitations = []; inviteInstHierarchieCtrl.sendInstInvite(invite); expect(inviteInstHierarchieCtrl.showParentHierarchie).toBeTruthy(); expect(inviteService.sendInviteHierarchy).toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalled(); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Convite enviado com sucesso!'); }); }); @@ -252,11 +252,11 @@ }); it('should not go', function() { - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); spyOn(state, 'go'); institution.state = 'inactive'; inviteInstHierarchieCtrl.goToActiveInst(institution); - expect(messageService.showToast).toHaveBeenCalled(); + expect(messageService.showErrorToast).toHaveBeenCalledWith('Institutição inativa!'); expect(state.go).not.toHaveBeenCalled(); }); }); diff --git a/frontend/test/specs/invites/processInviteUserAdmControllerSpec.js b/frontend/test/specs/invites/processInviteUserAdmControllerSpec.js index b60f2e366..495f7d989 100644 --- a/frontend/test/specs/invites/processInviteUserAdmControllerSpec.js +++ b/frontend/test/specs/invites/processInviteUserAdmControllerSpec.js @@ -102,7 +102,7 @@ }; }); - spyOn(messageService, 'showToast').and.callFake(function(){}); + spyOn(messageService, 'showInfoToast').and.callFake(function(){}); }); it('Should accept the invitation to become an administrator', function() { @@ -117,7 +117,7 @@ expect(processInviteUserAdmCtrl.typeOfDialog).toEqual('VIEW_ACCEPTED_INVITATION_INVITEE'); expect(processInviteUserAdmCtrl.isAccepting).toBeTruthy(); expect(inviteService.acceptInviteUserAdm).toHaveBeenCalledWith(invite.key); - expect(messageService.showToast).toHaveBeenCalledWith('Convite aceito com sucesso!'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Convite aceito com sucesso!'); }); it('Should add super user permissions of old admin', function() { @@ -141,7 +141,7 @@ expect(processInviteUserAdmCtrl.typeOfDialog).toEqual('VIEW_ACCEPTED_INVITATION_INVITEE'); expect(processInviteUserAdmCtrl.isAccepting).toBeTruthy(); expect(inviteService.acceptInviteUserAdm).toHaveBeenCalledWith(invite.key); - expect(messageService.showToast).toHaveBeenCalledWith('Convite aceito com sucesso!'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Convite aceito com sucesso!'); }); it('Should not add super user permissions of old admin', function() { @@ -165,7 +165,7 @@ expect(processInviteUserAdmCtrl.typeOfDialog).toEqual('VIEW_ACCEPTED_INVITATION_INVITEE'); expect(processInviteUserAdmCtrl.isAccepting).toBeTruthy(); expect(inviteService.acceptInviteUserAdm).toHaveBeenCalledWith(invite.key); - expect(messageService.showToast).toHaveBeenCalledWith('Convite aceito com sucesso!'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Convite aceito com sucesso!'); }); }); @@ -179,7 +179,7 @@ }; }); - spyOn(messageService, 'showToast').and.callFake(function(){}); + spyOn(messageService, 'showInfoToast').and.callFake(function(){}); spyOn(mdDialog, 'hide').and.callFake(function(){}); }); @@ -188,7 +188,7 @@ user = JSON.parse(window.localStorage.userInfo); expect(user.institutions_admin).toEqual([]); - expect(messageService.showToast).toHaveBeenCalledWith('Convite recusado!'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Convite recusado!'); expect(inviteService.rejectInviteUserAdm).toHaveBeenCalledWith(invite.key); expect(mdDialog.hide).toHaveBeenCalled(); }); diff --git a/frontend/test/specs/post/postDetailsControllerSpec.js b/frontend/test/specs/post/postDetailsControllerSpec.js index f4255a8c3..f69d3f662 100644 --- a/frontend/test/specs/post/postDetailsControllerSpec.js +++ b/frontend/test/specs/post/postDetailsControllerSpec.js @@ -635,7 +635,7 @@ spyOn(eventService, 'addFollower').and.callFake(() => { return q.when(); }); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); postDetailsCtrl.post = new Post({ shared_event: new Event({followers: [], key: 'akaspo'}) }); @@ -644,7 +644,7 @@ scope.$apply(); expect(eventService.addFollower).toHaveBeenCalledWith('akaspo'); - expect(messageService.showToast).toHaveBeenCalledWith('Você receberá as atualizações desse evento.'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Você receberá as atualizações desse evento.'); expect(postDetailsCtrl.post.shared_event.followers).toEqual([user.key]); }); }); @@ -654,7 +654,7 @@ spyOn(eventService, 'removeFollower').and.callFake(() => { return q.when(); }); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); postDetailsCtrl.post = new Post({ shared_event: new Event({ followers: [postDetailsCtrl.user.key], key:'aposkd' }) }); @@ -663,7 +663,7 @@ scope.$apply(); expect(eventService.removeFollower).toHaveBeenCalledWith('aposkd'); - expect(messageService.showToast).toHaveBeenCalledWith('Você não receberá as atualizações desse evento.'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Você não receberá as atualizações desse evento.'); }); }); diff --git a/frontend/test/specs/post/postPageControllerSpec.js b/frontend/test/specs/post/postPageControllerSpec.js index 51544ed6a..5eca0a3a0 100644 --- a/frontend/test/specs/post/postPageControllerSpec.js +++ b/frontend/test/specs/post/postPageControllerSpec.js @@ -95,13 +95,13 @@ it('should call toClipboard', () => { spyOn(Utils, 'generateLink'); spyOn(clipboard, 'toClipboard'); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); postCtrl.copyLink(); expect(Utils.generateLink).toHaveBeenCalled(); expect(clipboard.toClipboard).toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalled(); + expect(messageService.showInfoToast).toHaveBeenCalled(); }); }); @@ -124,13 +124,13 @@ spyOn(postService, 'addSubscriber').and.callFake(() => { return q.when(); }); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); postCtrl.addSubscriber(); scope.$apply(); expect(postService.addSubscriber).toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalled(); + expect(messageService.showInfoToast).toHaveBeenCalled(); expect(postCtrl.post.subscribers).toEqual([postCtrl.user.key]); }); }); @@ -140,13 +140,13 @@ spyOn(postService, 'removeSubscriber').and.callFake(() => { return q.when(); }); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); postCtrl.removeSubscriber(); scope.$apply(); expect(postService.removeSubscriber).toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalled(); + expect(messageService.showInfoToast).toHaveBeenCalled(); }); }); diff --git a/frontend/test/specs/request/analyseHierarchyRequestControllerSpec.js b/frontend/test/specs/request/analyseHierarchyRequestControllerSpec.js index 4b245e33e..bdded6705 100644 --- a/frontend/test/specs/request/analyseHierarchyRequestControllerSpec.js +++ b/frontend/test/specs/request/analyseHierarchyRequestControllerSpec.js @@ -66,7 +66,7 @@ analyseHierReqCtrl = createCtrl(request); spyOn(requestInvitationService, 'acceptInstParentRequest').and.callFake(fakeCallback); spyOn(requestInvitationService, 'rejectInstParentRequest').and.callFake(fakeCallback); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); }); describe('Test loadInstitutions', function () { @@ -92,7 +92,7 @@ expect(requestInvitationService.rejectInstParentRequest).toHaveBeenCalledWith(request.key); expect(request.status).toEqual('rejected'); expect(mdDialog.cancel).toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalledWith('Solicitação rejeitada com sucesso'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Solicitação rejeitada com sucesso'); }); }); }); @@ -104,7 +104,7 @@ analyseHierReqCtrl = createCtrl(request); spyOn(requestInvitationService, 'acceptInstChildrenRequest').and.callFake(fakeCallback); spyOn(requestInvitationService, 'rejectInstChildrenRequest').and.callFake(fakeCallback); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); }); describe('Test loadInstitutions', function () { @@ -121,7 +121,7 @@ expect(requestInvitationService.rejectInstChildrenRequest).toHaveBeenCalledWith(request.key); expect(request.status).toEqual('rejected'); expect(mdDialog.cancel).toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalledWith('Solicitação rejeitada com sucesso'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Solicitação rejeitada com sucesso'); }); }); @@ -140,7 +140,7 @@ expect(requestInvitationService.acceptInstChildrenRequest).toHaveBeenCalledWith(request.key); expect(request.status).toEqual('accepted'); expect(mdDialog.hide).toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalledWith('Solicitação aceita com sucesso'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Solicitação aceita com sucesso'); }); }); }); @@ -174,7 +174,7 @@ expect(requestInvitationService.acceptInstChildrenRequest).toHaveBeenCalledWith(request.key); expect(request.status).toEqual('accepted'); expect(mdDialog.hide).toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalledWith('Solicitação aceita com sucesso'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Solicitação aceita com sucesso'); }); }); }); @@ -193,10 +193,10 @@ expect(mdDialog.hide).toHaveBeenCalled(); }); - it('Should call MessageService.showToast', function() { - spyOn(messageService, 'showToast'); + it('Should call MessageService.showInfoToast', function() { + spyOn(messageService, 'showInfoToast'); analyseHierReqCtrl.close(); - expect(messageService.showToast).toHaveBeenCalledWith('Solicitação aceita com sucesso'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Solicitação aceita com sucesso'); }); }); diff --git a/frontend/test/specs/request/requestInvitationControllerSpec.js b/frontend/test/specs/request/requestInvitationControllerSpec.js index 91dce4c27..4995c724f 100644 --- a/frontend/test/specs/request/requestInvitationControllerSpec.js +++ b/frontend/test/specs/request/requestInvitationControllerSpec.js @@ -103,7 +103,7 @@ spyOn(requestInvCtrl.currentUser.institutions_requested, 'push'); spyOn(mdDialog, 'hide').and.callFake(fakeCallback); spyOn(authService, 'save').and.callFake(fakeCallback); - spyOn(messageService, 'showToast').and.callFake(fakeCallback); + spyOn(messageService, 'showInfoToast').and.callFake(fakeCallback); promise = requestInvCtrl.sendRequest(); }); @@ -128,9 +128,9 @@ }); }); - it('Should call MessageService.showToast()', function(done) { + it('Should call MessageService.showInfoToast()', function(done) { promise.then(function() { - expect(messageService.showToast).toHaveBeenCalledWith("Pedido enviado com sucesso!"); + expect(messageService.showInfoToast).toHaveBeenCalledWith("Pedido enviado com sucesso!"); done(); }); }); diff --git a/frontend/test/specs/request/requestProcessingControllerSpec.js b/frontend/test/specs/request/requestProcessingControllerSpec.js index d7230bb19..053145cb7 100644 --- a/frontend/test/specs/request/requestProcessingControllerSpec.js +++ b/frontend/test/specs/request/requestProcessingControllerSpec.js @@ -146,7 +146,7 @@ }); spyOn(requestInvitationService, 'getRequest').and.callFake(callFake); - spyOn(messageService, 'showToast').and.callFake(callFake); + spyOn(messageService, 'showInfoToast').and.callFake(callFake); spyOn(requestCtrl, 'hideDialog').and.callFake(function() {}); }); @@ -157,7 +157,7 @@ requestCtrl.acceptRequest(); expect(authService.getCurrentUser().permissions).toEqual(permissions); - expect(messageService.showToast).toHaveBeenCalledWith("Solicitação aceita!"); + expect(messageService.showInfoToast).toHaveBeenCalledWith("Solicitação aceita!"); expect(request.status).toEqual('accepted'); }); }); @@ -250,11 +250,11 @@ } }; }); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); requestCtrl.children.parent_institution = {key: 'poaskdoad-OPAKSDOAP'}; requestCtrl.confirmLinkRemoval(); - expect(messageService.showToast).toHaveBeenCalled(); + expect(messageService.showInfoToast).toHaveBeenCalled(); expect(requestCtrl.children.parent_institution).toEqual(undefined); }); }); diff --git a/frontend/test/specs/user/configProfileControllerSpec.js b/frontend/test/specs/user/configProfileControllerSpec.js index 8c9cff067..5a3a0e41a 100644 --- a/frontend/test/specs/user/configProfileControllerSpec.js +++ b/frontend/test/specs/user/configProfileControllerSpec.js @@ -251,7 +251,7 @@ spyOn(observerRecorderService, 'generate').and.returnValue(patch); spyOn(userService, 'save').and.returnValue(q.when()); spyOn(authService, 'save'); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); configCtrl._saveUser(); scope.$apply(); @@ -259,15 +259,15 @@ expect(observerRecorderService.generate).toHaveBeenCalled(); expect(userService.save).toHaveBeenCalledWith(patch); expect(authService.save).toHaveBeenCalledWith(); - expect(messageService.showToast).toHaveBeenCalledWith("Edição concluída com sucesso"); + expect(messageService.showInfoToast).toHaveBeenCalledWith("Edição concluída com sucesso"); }); it("Should show a message when the user is invalid", function(){ - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); spyOn(configCtrl, '_saveImage').and.returnValue(Promise.resolve()); spyOn(configCtrl.newUser, 'isValid').and.returnValue(false); configCtrl._saveUser().should.be.resolved; - expect(messageService.showToast).toHaveBeenCalledWith("Campos obrigatórios não preenchidos corretamente."); + expect(messageService.showErrorToast).toHaveBeenCalledWith("Campos obrigatórios não preenchidos corretamente."); }); }); diff --git a/frontend/test/specs/user/editProfileControllerSpec.js b/frontend/test/specs/user/editProfileControllerSpec.js index 68f54948e..fc33a0904 100644 --- a/frontend/test/specs/user/editProfileControllerSpec.js +++ b/frontend/test/specs/user/editProfileControllerSpec.js @@ -90,7 +90,7 @@ spyOn(observerRecorderService, 'generate').and.returnValue(patch); spyOn(profileService, 'editProfile').and.returnValue(q.when()); spyOn(authService, 'save'); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showInfoToast'); spyOn(mdDialog, 'hide'); editProfileCtrl.edit(); @@ -98,7 +98,7 @@ expect(observerRecorderService.generate).toHaveBeenCalled(); expect(profileService.editProfile).toHaveBeenCalledWith(patch); - expect(messageService.showToast).toHaveBeenCalledWith('Perfil editado com sucesso'); + expect(messageService.showInfoToast).toHaveBeenCalledWith('Perfil editado com sucesso'); expect(authService.save).toHaveBeenCalled(); expect(mdDialog.hide).toHaveBeenCalled(); }); @@ -120,13 +120,13 @@ editProfileCtrl.profile.office = undefined; spyOn(observerRecorderService, 'generate'); spyOn(profileService, 'editProfile'); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); editProfileCtrl.edit(); expect(observerRecorderService.generate).not.toHaveBeenCalled(); expect(profileService.editProfile).not.toHaveBeenCalled(); - expect(messageService.showToast).toHaveBeenCalledWith('O cargo é obrigatório.'); + expect(messageService.showErrorToast).toHaveBeenCalledWith('O cargo é obrigatório.'); }); }); diff --git a/frontend/test/specs/user/profileServiceSpec.js b/frontend/test/specs/user/profileServiceSpec.js index cdce1711f..26bdfd425 100644 --- a/frontend/test/specs/user/profileServiceSpec.js +++ b/frontend/test/specs/user/profileServiceSpec.js @@ -62,7 +62,7 @@ spyOn(mdDialog, 'show').and.returnValue(q.when()); spyOn(mdDialog, 'confirm').and.callThrough(); spyOn(profileService, '_deleteInstitution'); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); }); it(`should show a confirm dialog and remove @@ -88,7 +88,7 @@ expect(mdDialog.confirm).not.toHaveBeenCalled(); expect(mdDialog.show).not.toHaveBeenCalled(); const msg = 'Desvínculo não permitido. Você é administrador dessa instituição.'; - expect(messageService.showToast).toHaveBeenCalledWith(msg); + expect(messageService.showErrorToast).toHaveBeenCalledWith(msg); }); }); diff --git a/frontend/test/specs/user/userRequestFormControllerSpec.js b/frontend/test/specs/user/userRequestFormControllerSpec.js index 748b1c322..907f90562 100644 --- a/frontend/test/specs/user/userRequestFormControllerSpec.js +++ b/frontend/test/specs/user/userRequestFormControllerSpec.js @@ -103,12 +103,12 @@ it('should show an error message when the request fails', function () { expect(userReqFormCtrl.isRequestSent).toBeFalsy(); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); deferred.reject(); userReqFormCtrl.sendRequest(); scope.$apply(); const msg = "Um erro ocorreu. Verifique as informações e tente novamente"; - expect(messageService.showToast).toHaveBeenCalledWith(msg) + expect(messageService.showErrorToast).toHaveBeenCalledWith(msg) expect(userReqFormCtrl.isRequestSent).toBeFalsy(); }); }); @@ -159,10 +159,10 @@ it(`should show a message when the institution has already been requested by the user`, function () { spyOn(userReqFormCtrl, '_wasInstRequested').and.returnValue(true); - spyOn(messageService, 'showToast'); + spyOn(messageService, 'showErrorToast'); userReqFormCtrl._verifyAndSendRequest(); const msg = "Você já solicitou para fazer parte dessa instituição."; - expect(messageService.showToast).toHaveBeenCalledWith(msg) + expect(messageService.showErrorToast).toHaveBeenCalledWith(msg) }); it(`should send the request when the institution diff --git a/frontend/test/specs/utils/messageServiceSpec.js b/frontend/test/specs/utils/messageServiceSpec.js index 781e34314..5144b5090 100644 --- a/frontend/test/specs/utils/messageServiceSpec.js +++ b/frontend/test/specs/utils/messageServiceSpec.js @@ -11,11 +11,34 @@ service = MessageService; })); - describe("showToast", function() { + describe("showInfoToast", function() { + it('should call mdToast.show', function() { + window.screen = { width: 2000 }; + spyOn(mdToast, 'show').and.callThrough(); + service.showInfoToast(""); + expect(mdToast.show).toHaveBeenCalled(); + }); + + it('should not call mdToast.show', function() { + window.screen = { width: 200 }; + spyOn(mdToast, 'show').and.callThrough(); + service.showInfoToast(""); + expect(mdToast.show).not.toHaveBeenCalled(); + }); + }); + describe("showErrorToast", function() { it('should call mdToast.show', function() { + window.screen = { width: 2000 }; + spyOn(mdToast, 'show').and.callThrough(); + service.showErrorToast(""); + expect(mdToast.show).toHaveBeenCalled(); + }); + + it('should not call mdToast.show', function() { + window.screen = { width: 200 }; spyOn(mdToast, 'show').and.callThrough(); - service.showToast(""); + service.showErrorToast(""); expect(mdToast.show).toHaveBeenCalled(); }); }); diff --git a/frontend/user/configProfile/configProfileController.js b/frontend/user/configProfile/configProfileController.js index e7a863bb6..3eaa10dc4 100644 --- a/frontend/user/configProfile/configProfileController.js +++ b/frontend/user/configProfile/configProfileController.js @@ -61,7 +61,7 @@ ImageService.readFile(data, setImage); configProfileCtrl.file = null; }, function error(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); }); }; @@ -111,10 +111,10 @@ return UserService.save(patch) .then(() => { AuthService.save(); - MessageService.showToast("Edição concluída com sucesso"); + MessageService.showInfoToast("Edição concluída com sucesso"); }); } - MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); + MessageService.showErrorToast("Campos obrigatórios não preenchidos corretamente."); return $q.when(); } @@ -167,11 +167,11 @@ configProfileCtrl.user.state = 'inactive'; deleteUser(); }, function () { - MessageService.showToast('Cancelado'); + MessageService.showInfoToast('Cancelado'); }); return promise; } else { - MessageService.showToast('Não é possível excluir sua conta enquanto você for administrador de uma instituição.'); + MessageService.showErrorToast('Não é possível excluir sua conta enquanto você for administrador de uma instituição.'); } }; diff --git a/frontend/user/editProfile/editProfileController.js b/frontend/user/editProfile/editProfileController.js index d793ec7ef..4e34adf07 100644 --- a/frontend/user/editProfile/editProfileController.js +++ b/frontend/user/editProfile/editProfileController.js @@ -44,13 +44,13 @@ if (!_.isEmpty(patch)) { ProfileService.editProfile(patch) .then(() => { - MessageService.showToast('Perfil editado com sucesso'); + MessageService.showInfoToast('Perfil editado com sucesso'); AuthService.save(); }); } $mdDialog.hide(); } else { - MessageService.showToast('O cargo é obrigatório.'); + MessageService.showErrorToast('O cargo é obrigatório.'); } }; diff --git a/frontend/user/profileService.js b/frontend/user/profileService.js index 50f1ed828..db62a9c78 100644 --- a/frontend/user/profileService.js +++ b/frontend/user/profileService.js @@ -83,10 +83,10 @@ .then(function () { service._deleteInstitution(institution.key); }, function () { - MessageService.showToast('Cancelado'); + MessageService.showInfoToast('Cancelado'); }); } else { - MessageService.showToast('Desvínculo não permitido. Você é administrador dessa instituição.'); + MessageService.showErrorToast('Desvínculo não permitido. Você é administrador dessa instituição.'); } }; /** diff --git a/frontend/user/userRequestForm/userRequestForm.controller.js b/frontend/user/userRequestForm/userRequestForm.controller.js index baedd70a3..64dd9aca2 100644 --- a/frontend/user/userRequestForm/userRequestForm.controller.js +++ b/frontend/user/userRequestForm/userRequestForm.controller.js @@ -50,7 +50,7 @@ userReqFormCtrl.isRequestSent = true; }) .catch(_ => { - MessageService.showToast("Um erro ocorreu. Verifique as informações e tente novamente"); + MessageService.showErrorToast("Um erro ocorreu. Verifique as informações e tente novamente"); }); }; @@ -84,7 +84,7 @@ */ userReqFormCtrl._verifyAndSendRequest = function () { if (userReqFormCtrl._wasInstRequested()) { - MessageService.showToast("Você já solicitou para fazer parte dessa instituição."); + MessageService.showErrorToast("Você já solicitou para fazer parte dessa instituição."); } else { userReqFormCtrl.sendRequest(); } diff --git a/frontend/utils/httpService.js b/frontend/utils/httpService.js index d443803e4..1f6a29a39 100644 --- a/frontend/utils/httpService.js +++ b/frontend/utils/httpService.js @@ -42,7 +42,7 @@ }).then(function success(response) { deferred.resolve(response.data); }, function error(response) { - MessageService.showToast(response.data.msg); + MessageService.showErrorToast(response.data.msg); deferred.reject(response); }); diff --git a/frontend/utils/messageService.js b/frontend/utils/messageService.js index 5859a0580..bc3321295 100644 --- a/frontend/utils/messageService.js +++ b/frontend/utils/messageService.js @@ -43,22 +43,24 @@ "Error! The user is the author": "O usuário é o autor do evento." }; - service.showToast = function showToast(message) { - if(! hideToast(message)) { - message = customMessage(message); - $mdToast.show( - $mdToast.simple() - .textContent(message) - .action('FECHAR') - .highlightAction(true) - .hideDelay(5000) - .position('bottom right') - ); - } + function showToast(message) { + message = customMessage(message); + $mdToast.show( + $mdToast.simple() + .textContent(message) + .action('FECHAR') + .highlightAction(true) + .hideDelay(5000) + .position('bottom right') + ); }; - function hideToast (message) { - return Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE) && message.includes('sucesso'); + service.showInfoToast = function showInfoToast(message){ + !Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE) && showToast(message); + } + + service.showErrorToast = function showErrorToast(message){ + showToast(message); } function customMessage(message) { diff --git a/support/auth/authService.js b/support/auth/authService.js index 9ccb3c6de..f8d551342 100644 --- a/support/auth/authService.js +++ b/support/auth/authService.js @@ -40,7 +40,7 @@ configUser(userLoaded, firebaseUser); deferred.resolve(userInfo); }, function error(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); deferred.reject(error); }); return deferred.promise; @@ -55,7 +55,7 @@ }); }); }).catch(function(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); deferred.reject(error); }); return deferred.promise; @@ -72,11 +72,11 @@ }); } else { service.sendEmailVerification(user); - MessageService.showToast("Seu email precisa ser verificado."); + MessageService.showErrorToast("Seu email precisa ser verificado."); deferred.reject("Email not verified."); } }).catch(function(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); deferred.reject(error); }); return deferred.promise; @@ -92,7 +92,7 @@ deferred.resolve(userInfo); }); }).catch(function(error) { - MessageService.showToast(error); + MessageService.showErrorToast(error); deferred.reject(error); }); return deferred.promise; @@ -141,7 +141,7 @@ service.resetPassword = function resetPassword(email) { authObj.$sendPasswordResetEmail(email).then( function success() { - MessageService.showToast('Você receberá um email para redefinir sua senha.'); + MessageService.showInfoToast('Você receberá um email para redefinir sua senha.'); }, function error(error) { console.error(error); }); diff --git a/support/report/reportController.js b/support/report/reportController.js index f0eed151b..4547a41d1 100644 --- a/support/report/reportController.js +++ b/support/report/reportController.js @@ -128,7 +128,7 @@ controller.report.userInfo = getUserInfo(); controller.report.appVersion = Config.APP_VERSION; FirebaseService.createReport(controller.report).then(function () { - MessageService.showToast("Obrigado! Recebemos seu Relatório."); + MessageService.showInfoToast("Obrigado! Recebemos seu Relatório."); $state.go("support.home"); }); }; diff --git a/support/support.js b/support/support.js index 6444eb85e..21b8c4f83 100644 --- a/support/support.js +++ b/support/support.js @@ -177,7 +177,7 @@ } }, function(transition) { AuthService.logout(); - MessageService.showToast("Você ainda não tem uma conta ativa na plataforma."); + MessageService.showErrorToast("Você ainda não tem uma conta ativa na plataforma."); }); }); })(); \ No newline at end of file From 726f2c88bd364405008fff51b5b25c88383f9d22 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 13 Mar 2019 12:20:42 -0300 Subject: [PATCH 538/606] changed messageService of feature-toggles --- feature-toggles/auth/authService.js | 2 +- .../test/specs/utils/messageServiceSpec.js | 27 +++++++++++++++++-- feature-toggles/utils/messageService.js | 16 +++++++++-- frontend/utils/messageService.js | 8 ++++-- 4 files changed, 46 insertions(+), 7 deletions(-) diff --git a/feature-toggles/auth/authService.js b/feature-toggles/auth/authService.js index 681b16f9b..a8f55028e 100644 --- a/feature-toggles/auth/authService.js +++ b/feature-toggles/auth/authService.js @@ -111,7 +111,7 @@ service.isLoadingUser = false; if (!userInfo.hasPermission('analyze_request_inst')) { service.logout(); - MessageService.showErrorToast("Você não possui permissão para acessar esta página."); + MessageService.showToast("Você não possui permissão para acessar esta página."); } }); } diff --git a/feature-toggles/test/specs/utils/messageServiceSpec.js b/feature-toggles/test/specs/utils/messageServiceSpec.js index 781e34314..5144b5090 100644 --- a/feature-toggles/test/specs/utils/messageServiceSpec.js +++ b/feature-toggles/test/specs/utils/messageServiceSpec.js @@ -11,11 +11,34 @@ service = MessageService; })); - describe("showToast", function() { + describe("showInfoToast", function() { + it('should call mdToast.show', function() { + window.screen = { width: 2000 }; + spyOn(mdToast, 'show').and.callThrough(); + service.showInfoToast(""); + expect(mdToast.show).toHaveBeenCalled(); + }); + + it('should not call mdToast.show', function() { + window.screen = { width: 200 }; + spyOn(mdToast, 'show').and.callThrough(); + service.showInfoToast(""); + expect(mdToast.show).not.toHaveBeenCalled(); + }); + }); + describe("showErrorToast", function() { it('should call mdToast.show', function() { + window.screen = { width: 2000 }; + spyOn(mdToast, 'show').and.callThrough(); + service.showErrorToast(""); + expect(mdToast.show).toHaveBeenCalled(); + }); + + it('should not call mdToast.show', function() { + window.screen = { width: 200 }; spyOn(mdToast, 'show').and.callThrough(); - service.showToast(""); + service.showErrorToast(""); expect(mdToast.show).toHaveBeenCalled(); }); }); diff --git a/feature-toggles/utils/messageService.js b/feature-toggles/utils/messageService.js index 219dbd4a7..0c5102fab 100644 --- a/feature-toggles/utils/messageService.js +++ b/feature-toggles/utils/messageService.js @@ -3,14 +3,14 @@ const app = angular.module('app'); - app.service('MessageService', ['$mdToast', function($mdToast) { + app.service('MessageService', ['$mdToast', 'SCREEN_SIZES', function($mdToast, SCREEN_SIZES) { const service = this; /** * This function displays a small dialog containing the received message per parameter. * @param {String} message - Message to show */ - service.showToast = function showToast(message) { + function showToast(message) { $mdToast.show( $mdToast.simple() .textContent(message) @@ -20,5 +20,17 @@ .position('bottom right') ); }; + + /** Show toast with infomation message when not in mobile. + */ + service.showInfoToast = function showInfoToast(message){ + !Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE) && showToast(message); + } + + /** Show toast with error message. + */ + service.showErrorToast = function showErrorToast(message){ + showToast(message); + } }]); })(); \ No newline at end of file diff --git a/frontend/utils/messageService.js b/frontend/utils/messageService.js index bc3321295..e440e09ae 100644 --- a/frontend/utils/messageService.js +++ b/frontend/utils/messageService.js @@ -3,7 +3,7 @@ (function() { var app = angular.module("app"); - app.service("MessageService", function MessageService($mdToast, $mdDialog, SCREEN_SIZES) { + app.service("MessageService",['$mdToast', '$mdDialog', 'SCREEN_SIZES', function MessageService($mdToast, $mdDialog, SCREEN_SIZES) { var service = this; var msg = { @@ -55,10 +55,14 @@ ); }; + /** Show toast with infomation message when not in mobile. + */ service.showInfoToast = function showInfoToast(message){ !Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE) && showToast(message); } + /** Show toast with error message. + */ service.showErrorToast = function showErrorToast(message){ showToast(message); } @@ -100,5 +104,5 @@ clickOutsideToClose:true }); } - }); + }]); })(); \ No newline at end of file From fe7cf80a7accd88a92162399e837b44ee7fd161e Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 13 Mar 2019 12:55:18 -0300 Subject: [PATCH 539/606] fix tests --- feature-toggles/utils/messageService.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/feature-toggles/utils/messageService.js b/feature-toggles/utils/messageService.js index 0c5102fab..cb3821f1f 100644 --- a/feature-toggles/utils/messageService.js +++ b/feature-toggles/utils/messageService.js @@ -3,8 +3,11 @@ const app = angular.module('app'); - app.service('MessageService', ['$mdToast', 'SCREEN_SIZES', function($mdToast, SCREEN_SIZES) { + app.service('MessageService', ['$mdToast', function($mdToast) { const service = this; + const SCREEN_SIZES = { + SMARTPHONE: 475 + }; /** * This function displays a small dialog containing the received message per parameter. From dd53f33100f49f902330df942764a404ceb3a13e Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 13 Mar 2019 13:04:36 -0300 Subject: [PATCH 540/606] added function isMobileScreen on utils of feature-toggles --- .../specs/manage/manageTogglesControllerSpec.js | 1 + feature-toggles/utils/utils.js | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/feature-toggles/test/specs/manage/manageTogglesControllerSpec.js b/feature-toggles/test/specs/manage/manageTogglesControllerSpec.js index 199deeb80..79b0db0b5 100644 --- a/feature-toggles/test/specs/manage/manageTogglesControllerSpec.js +++ b/feature-toggles/test/specs/manage/manageTogglesControllerSpec.js @@ -73,6 +73,7 @@ describe('Test save', function() { beforeEach(function() { spyOn(messageService, 'showInfoToast'); + spyOn(messageService, 'showErrorToast'); }); it('Should be call messageService.saveFeature', function(done) { diff --git a/feature-toggles/utils/utils.js b/feature-toggles/utils/utils.js index 271decafe..fd6f4c5e3 100644 --- a/feature-toggles/utils/utils.js +++ b/feature-toggles/utils/utils.js @@ -1,6 +1,19 @@ 'use strict'; var Utils = { + + /** + * This function indicate if the current screen size are smaller than the screen passed by parameter. + * @param {number} the screen size that will be compared. + * @returns {boolean} True if the screen is smaller or equal to the parameter and false in otherwise. + */ + isMobileScreen: function isMobileScreen(mobileScreenSize) { + if (mobileScreenSize) { + return screen.width <= mobileScreenSize; + } + return screen.width <= 960; + }, + /** * Replaces the original backend domain by the local one * @param {object} config configutarion object From cd17e591aca9dc227cbe3beb8576ac40dfe93a8f Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 13 Mar 2019 15:47:18 -0300 Subject: [PATCH 541/606] set leftAction to institution items --- .../manageInstitution/management_institution_mobile.html | 5 ++++- frontend/utils/entityShowcase/entityShowcase.component.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/institution/manageInstitution/management_institution_mobile.html b/frontend/institution/manageInstitution/management_institution_mobile.html index 26f6e52a3..b516a8e6e 100644 --- a/frontend/institution/manageInstitution/management_institution_mobile.html +++ b/frontend/institution/manageInstitution/management_institution_mobile.html @@ -48,8 +48,9 @@ icon="account_balance" title="inviteInstHierCtrl.institution.parent_institution.name" subtitle="inviteInstHierCtrl.getStatusMsg(inviteInstHierCtrl.institution.parent_institution, true)" + left-action="inviteInstHierCtrl.goToActiveInst(inviteInstHierCtrl.institution.parent_institution)" right-icon-btns="[ - inviteInstHierCtrl.createIconBtn('more_vert', + inviteInstHierCtrl.createIconBtn('link', inviteInstHierCtrl.removeLink, [inviteInstHierCtrl.institution.parent_institution, true, $event]) ]"> @@ -65,6 +66,7 @@ icon="account_balance" title="subInst.name" subtitle="inviteInstHierCtrl.getStatusMsg(subInst, false)" + left-action="inviteInstHierCtrl.goToActiveInst(subInst)" right-icon-btns="[ inviteInstHierCtrl.createIconBtn('link', inviteInstHierCtrl.removeLink, [subInst, false, $event]), inviteInstHierCtrl.createIconBtn('delete', inviteInstHierCtrl.removeChild, [subInst], inviteInstHierCtrl.canRemoveInst(subInst)) @@ -84,6 +86,7 @@ icon="account_balance" title="inviteInstHierCtrl.getReqInstName(instRequest)" subtitle="inviteInstHierCtrl.showMessage(instRequest)" + left-action="inviteInstHierCtrl.goToActiveInst(instRequest)" right-icon-btns="[ inviteInstHierCtrl.createIconBtn('error', inviteInstHierCtrl.analyseRequest, [$event, instRequest]), ]"> diff --git a/frontend/utils/entityShowcase/entityShowcase.component.js b/frontend/utils/entityShowcase/entityShowcase.component.js index 0cda43bdd..19a8db5d7 100644 --- a/frontend/utils/entityShowcase/entityShowcase.component.js +++ b/frontend/utils/entityShowcase/entityShowcase.component.js @@ -37,7 +37,7 @@ icon: "@", title: "<", subtitle: "<", - leftAction: "<", + leftAction: "&", rightIconBtns: "<", }, }); From 0677a87a24eb7103fadf9c50c2b770e2642a1537 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Wed, 13 Mar 2019 16:02:21 -0300 Subject: [PATCH 542/606] Adding all search fields --- frontend/search/searchController.js | 36 ++++++++++++++--------------- frontend/search/search_event.html | 20 ++++++++++++++-- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/frontend/search/searchController.js b/frontend/search/searchController.js index 8db6fb9c3..98ea62c72 100644 --- a/frontend/search/searchController.js +++ b/frontend/search/searchController.js @@ -25,23 +25,13 @@ searchCtrl.makeSearch = function makeSearch(value, type) { searchCtrl.loading = false; const valueOrKeyword = value ? value : (searchCtrl.search_keyword || ""); - let promise; - if (type === 'event') { - promise = EventService.searchEvents(valueOrKeyword, "published", type); - promise.then(function success(response) { - searchCtrl.events = response; - searchCtrl.loading = true; - searchCtrl.hasChanges = true; - console.log(response); - }); - } else { - promise = InstitutionService.searchInstitutions(valueOrKeyword, "active", type); - promise.then(function success(response) { - searchCtrl.institutions = response; - searchCtrl.loading = true; - searchCtrl.hasChanges = true; - }); - } + let promise = type === "event" ? EventService.searchEvents(valueOrKeyword, "published", type) + : InstitutionService.searchInstitutions(valueOrKeyword, "active", type); + promise.then(function success(response) { + type === "event" ? searchCtrl.events = response : searchCtrl.institutions = response; + searchCtrl.loading = true; + searchCtrl.hasChanges = true; + }); return promise; }; @@ -54,6 +44,8 @@ searchCtrl.searchNature = ""; searchCtrl.searchState = ""; searchCtrl.searchDate = ""; + searchCtrl.searchCoutry = ""; + searchCtrl.searchCity = ""; searchCtrl.institutions = []; }; @@ -123,6 +115,14 @@ return Utils.isMobileScreen(); }; + /** + * Go to the page of a specific event + * @param {object} event - The current event + */ + searchCtrl.goToEvent = (event) => { + event.state !== 'deleted' && $state.go(STATES.EVENT_DETAILS, { eventKey: event.id }); + }; + /** * A simple function that works like a controller to the * search_dialog.html. @@ -198,7 +198,7 @@ } searchCtrl.getCitiesByState = () => { - searchCtrl.cities = brCidadesEstados.buscarCidadesPorSigla(searchCtrl.selectedFederalState.sigla); + searchCtrl.cities = brCidadesEstados.buscarCidadesPorSigla(searchCtrl.searchState.sigla); }; function loadBrazilianFederalStates() { diff --git a/frontend/search/search_event.html b/frontend/search/search_event.html index a3832435f..311a2047d 100644 --- a/frontend/search/search_event.html +++ b/frontend/search/search_event.html @@ -25,12 +25,28 @@ ng-change="searchCtrl.searchBy(searchCtrl.searchDate.toISOString().split('T')[0], 'event')"/> - - + + + {{country.nome_pais}} + + + + + + {{state.nome}} + + + + {{city}} + + +
    From 7bc3228749b9bda558353dba0b0a711d30872d82 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 13 Mar 2019 16:16:42 -0300 Subject: [PATCH 543/606] added notification badge to clickable card --- .../manageInstitution/management_institution_mobile.html | 2 +- frontend/styles/custom.css | 9 +++++++++ frontend/utils/clickableCard/clickableCard.component.js | 1 + frontend/utils/clickableCard/clickable_card.html | 3 ++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/frontend/institution/manageInstitution/management_institution_mobile.html b/frontend/institution/manageInstitution/management_institution_mobile.html index b516a8e6e..d60afe374 100644 --- a/frontend/institution/manageInstitution/management_institution_mobile.html +++ b/frontend/institution/manageInstitution/management_institution_mobile.html @@ -76,7 +76,7 @@
    - +
    diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index e582b3960..7bf519597 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -537,6 +537,15 @@ a:active { border: 2px solid #EFEBE9; } +@media screen and (max-width: 420px) { + .notification-badge[data-badge]:after { + background: #27e627; + width: 11px; + height: 11px; + border: none; + } +} + .counter-of-notifications { position:relative; } diff --git a/frontend/utils/clickableCard/clickableCard.component.js b/frontend/utils/clickableCard/clickableCard.component.js index f50f4beba..6d8499d43 100644 --- a/frontend/utils/clickableCard/clickableCard.component.js +++ b/frontend/utils/clickableCard/clickableCard.component.js @@ -22,6 +22,7 @@ controllerAs: 'clickableCardCtrl', bindings: { icon: '@', + showNotification: '<', title: '@', isOpen: '<' }, diff --git a/frontend/utils/clickableCard/clickable_card.html b/frontend/utils/clickableCard/clickable_card.html index 11ab0ca82..852e48fd6 100644 --- a/frontend/utils/clickableCard/clickable_card.html +++ b/frontend/utils/clickableCard/clickable_card.html @@ -1,6 +1,7 @@
    - {{clickableCardCtrl.icon}} + {{clickableCardCtrl.icon}} {{ clickableCardCtrl.title}} {{ clickableCardCtrl.isOpen ? 'arrow_drop_up' : 'arrow_drop_down' }}
    From 5313fc2afe2940ea615eb1457414e2c7945ab73a Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 13 Mar 2019 16:20:47 -0300 Subject: [PATCH 544/606] fixed bug on pending link left action --- .../manageInstitution/management_institution_mobile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/manageInstitution/management_institution_mobile.html b/frontend/institution/manageInstitution/management_institution_mobile.html index d60afe374..3f6fa2fd7 100644 --- a/frontend/institution/manageInstitution/management_institution_mobile.html +++ b/frontend/institution/manageInstitution/management_institution_mobile.html @@ -86,7 +86,7 @@ icon="account_balance" title="inviteInstHierCtrl.getReqInstName(instRequest)" subtitle="inviteInstHierCtrl.showMessage(instRequest)" - left-action="inviteInstHierCtrl.goToActiveInst(instRequest)" + left-action="inviteInstHierCtrl.goToActiveInst(instRequest.institution)" right-icon-btns="[ inviteInstHierCtrl.createIconBtn('error', inviteInstHierCtrl.analyseRequest, [$event, instRequest]), ]"> From 0db5e1517ecc39b437555d316641ad7cb666172a Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 13 Mar 2019 16:25:26 -0300 Subject: [PATCH 545/606] Added flag to force show on mobile --- frontend/event/eventDetailsDirective.js | 2 +- frontend/institution/institutionCardDirective.js | 4 ++-- frontend/institution/transferAdminController.js | 2 +- frontend/post/postDetailsDirective.js | 2 +- frontend/post/postPageController.js | 2 +- frontend/utils/messageService.js | 5 +++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/frontend/event/eventDetailsDirective.js b/frontend/event/eventDetailsDirective.js index 02aa3a193..dabc51eaa 100644 --- a/frontend/event/eventDetailsDirective.js +++ b/frontend/event/eventDetailsDirective.js @@ -163,7 +163,7 @@ eventCtrl.copyLink = function copyLink() { var url = Utils.generateLink(`/event/${eventCtrl.event.key}/details`); ngClipboard.toClipboard(url); - MessageService.showInfoToast("O link foi copiado"); + MessageService.showInfoToast("O link foi copiado", true); }; /** diff --git a/frontend/institution/institutionCardDirective.js b/frontend/institution/institutionCardDirective.js index 7ab8fd4ba..559027f7b 100644 --- a/frontend/institution/institutionCardDirective.js +++ b/frontend/institution/institutionCardDirective.js @@ -28,7 +28,7 @@ institutionCardCtrl.copyLink = function copyLink(){ var url = Utils.generateLink(URL_INSTITUTION + institutionCardCtrl.institution.key + "/home"); ngClipboard.toClipboard(url); - MessageService.showInfoToast("O link foi copiado"); + MessageService.showInfoToast("O link foi copiado", true); }; institutionCardCtrl.showFollowButton = function showFollowButton() { @@ -55,7 +55,7 @@ promise.then(function success(){ institutionCardCtrl.user.unfollow(institutionCardCtrl.institution); AuthService.save(); - MessageService.showInfoToast("Deixou de seguir "+institutionCardCtrl.institution.name); + MessageService.showInfoToast("Deixou de seguir "+institutionCardCtrl.institution.name, true); }); return promise; } diff --git a/frontend/institution/transferAdminController.js b/frontend/institution/transferAdminController.js index e92a58a69..06124a012 100644 --- a/frontend/institution/transferAdminController.js +++ b/frontend/institution/transferAdminController.js @@ -59,7 +59,7 @@ MessageService.showErrorToast('Você já é administrador da instituição, selecione outro membro!'); } } else { - MessageService.showErrorToast('Selecione um memebro!'); + MessageService.showErrorToast('Selecione um membro!'); } }; }); diff --git a/frontend/post/postDetailsDirective.js b/frontend/post/postDetailsDirective.js index 0e20cd5b7..67754676d 100644 --- a/frontend/post/postDetailsDirective.js +++ b/frontend/post/postDetailsDirective.js @@ -190,7 +190,7 @@ postDetailsCtrl.copyLink = function copyLink(){ var url = Utils.generateLink(URL_POST + postDetailsCtrl.post.key); ngClipboard.toClipboard(url); - MessageService.showInfoToast("O link foi copiado"); + MessageService.showInfoToast("O link foi copiado", true); }; postDetailsCtrl.likeOrDislikePost = function likeOrDislikePost() { diff --git a/frontend/post/postPageController.js b/frontend/post/postPageController.js index 931bf0cfd..485f5a278 100644 --- a/frontend/post/postPageController.js +++ b/frontend/post/postPageController.js @@ -28,7 +28,7 @@ postCtrl.copyLink = function copyLink() { var url = Utils.generateLink('/post/' + postCtrl.post.key); ngClipboard.toClipboard(url); - MessageService.showInfoToast("O link foi copiado"); + MessageService.showInfoToast("O link foi copiado", true); }; /** diff --git a/frontend/utils/messageService.js b/frontend/utils/messageService.js index e440e09ae..a2de48a45 100644 --- a/frontend/utils/messageService.js +++ b/frontend/utils/messageService.js @@ -57,8 +57,9 @@ /** Show toast with infomation message when not in mobile. */ - service.showInfoToast = function showInfoToast(message){ - !Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE) && showToast(message); + service.showInfoToast = function showInfoToast(message, forceShow){ + let shouldShow = !Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE) || forceShow; + shouldShow && showToast(message); } /** Show toast with error message. From d8ed37b13b68b41f5e976b500d962fd1a30159e3 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 13 Mar 2019 16:25:28 -0300 Subject: [PATCH 546/606] added prop show-notification to the requested invites card --- .../institution/manageMembers/management_members_mobile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/manageMembers/management_members_mobile.html b/frontend/institution/manageMembers/management_members_mobile.html index 5c8014b7f..9eceef9e4 100644 --- a/frontend/institution/manageMembers/management_members_mobile.html +++ b/frontend/institution/manageMembers/management_members_mobile.html @@ -92,7 +92,7 @@

    Convidar Membros

    - +
    From 7d33af226855669597c7130a9972840234bdf43e Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 13 Mar 2019 16:29:25 -0300 Subject: [PATCH 547/606] change the documentation --- frontend/utils/messageService.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/utils/messageService.js b/frontend/utils/messageService.js index a2de48a45..db458aed8 100644 --- a/frontend/utils/messageService.js +++ b/frontend/utils/messageService.js @@ -55,7 +55,8 @@ ); }; - /** Show toast with infomation message when not in mobile. + /** Show toast with infomation message when not in mobile or when the flag + * force show is true. */ service.showInfoToast = function showInfoToast(message, forceShow){ let shouldShow = !Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE) || forceShow; From 0e355f2a5493cc946fb4902c9ad2be99b1107577 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 13 Mar 2019 16:30:44 -0300 Subject: [PATCH 548/606] fix test --- frontend/test/specs/institution/transferAdminControllerSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/test/specs/institution/transferAdminControllerSpec.js b/frontend/test/specs/institution/transferAdminControllerSpec.js index a54d57ecb..a24aaa0ec 100644 --- a/frontend/test/specs/institution/transferAdminControllerSpec.js +++ b/frontend/test/specs/institution/transferAdminControllerSpec.js @@ -133,7 +133,7 @@ transferAdminCtrl.confirm(); expect(inviteService.sendInviteUser).not.toHaveBeenCalled(); expect(mdDialog.hide).not.toHaveBeenCalled(); - expect(messageService.showErrorToast).toHaveBeenCalledWith("Selecione um memebro!"); + expect(messageService.showErrorToast).toHaveBeenCalledWith("Selecione um membro!"); }); }); })); \ No newline at end of file From dc94bb1e3ef6e096291e0e9b031b1caa75dc780e Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 13 Mar 2019 17:13:36 -0300 Subject: [PATCH 549/606] started to do the requested invites card --- .../invites/invite_institution_mobile.html | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/frontend/invites/invite_institution_mobile.html b/frontend/invites/invite_institution_mobile.html index f32e06240..c54081a51 100644 --- a/frontend/invites/invite_institution_mobile.html +++ b/frontend/invites/invite_institution_mobile.html @@ -35,21 +35,40 @@
    - + -
    - + + + + + + + +
    \ No newline at end of file From 079aff3ec42e266ed0cf3f05e80e254750e67fe5 Mon Sep 17 00:00:00 2001 From: ruanres Date: Wed, 13 Mar 2019 17:25:17 -0300 Subject: [PATCH 550/606] changed the badge color --- frontend/styles/custom.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index 7bf519597..704672127 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -539,7 +539,7 @@ a:active { @media screen and (max-width: 420px) { .notification-badge[data-badge]:after { - background: #27e627; + background: #84C45E; width: 11px; height: 11px; border: none; From 2058a86868ebffa8b8a27c3beed26629ce68ebfc Mon Sep 17 00:00:00 2001 From: MaianaB Date: Wed, 13 Mar 2019 17:26:22 -0300 Subject: [PATCH 551/606] Changed limit value --- frontend/utils/hideNavbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/utils/hideNavbar.js b/frontend/utils/hideNavbar.js index a02bf9625..03936f1f0 100644 --- a/frontend/utils/hideNavbar.js +++ b/frontend/utils/hideNavbar.js @@ -72,7 +72,7 @@ if(Utils.isMobileScreen(SCREEN_SIZES.SMARTPHONE)){ const content = element[0]; - const limitScrol = 30; + const limitScrol = 50; const hideTopDynamically = hideTop && inStateArray(scope.STATES_DINAMICALLY_TOP); const hideBottomDynamically = hideBottom && inStateArray(scope.STATES_DINAMICALLY_BOTTOM); From 98de8338a5d7079238803539232220419ec45c9e Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Wed, 13 Mar 2019 20:24:56 -0300 Subject: [PATCH 552/606] create shared events mobile component --- frontend/event/sharedEvent.component.js | 14 ++++++++++++ frontend/event/shared_event_mobile.html | 30 +++++++++++++++++++++++++ frontend/index.html | 1 + frontend/post/post_details.html | 3 ++- 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 frontend/event/sharedEvent.component.js create mode 100644 frontend/event/shared_event_mobile.html diff --git a/frontend/event/sharedEvent.component.js b/frontend/event/sharedEvent.component.js new file mode 100644 index 000000000..7bf2bcee2 --- /dev/null +++ b/frontend/event/sharedEvent.component.js @@ -0,0 +1,14 @@ +(function() { + 'use strict'; + + const app = angular.module('app'); + + app.component('sharedEvent', { + templateUrl: 'app/event/shared_event_mobile.html', + controller: 'EventDetailsController', + controllerAs: 'eventDetailsCtrl', + bindings: { + event: '<' + } + }); +})(); \ No newline at end of file diff --git a/frontend/event/shared_event_mobile.html b/frontend/event/shared_event_mobile.html new file mode 100644 index 000000000..660246a04 --- /dev/null +++ b/frontend/event/shared_event_mobile.html @@ -0,0 +1,30 @@ +
    + +
    +
    +

    + {{eventDetailsCtrl.event.start_time | amUtc | amLocal | amDateFormat:'DD'}} + A {{eventDetailsCtrl.event.end_time | amUtc | amLocal | amDateFormat:'DD' | uppercase}}

    +

    + {{eventDetailsCtrl.event.start_time | amUtc | amLocal | amDateFormat:'DD'}}

    + + + + +

    + {{eventDetailsCtrl.event.start_time | amUtc | amLocal | amDateFormat:'MMM' | uppercase}} + | {{eventDetailsCtrl.event.end_time | amUtc | amLocal | amDateFormat:'MMM' | uppercase}} +

    +

    + {{eventDetailsCtrl.event.start_time | amUtc | amLocal | amDateFormat:'MMMM' | uppercase}} +

    +
    +
    + + {{ eventDetailsCtrl.event.title | uppercase}} + + Organizado por {{eventDetailsCtrl.event.institution_name}} +
    +
    +
    \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html index e3e10e343..eb20cdebb 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -239,6 +239,7 @@ + diff --git a/frontend/post/post_details.html b/frontend/post/post_details.html index 4a05f04bb..b8040d889 100644 --- a/frontend/post/post_details.html +++ b/frontend/post/post_details.html @@ -105,7 +105,8 @@ - + + From f2e34e3f56dc6861d7eab93ba6ff15f66dca487d Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Wed, 13 Mar 2019 23:09:36 -0300 Subject: [PATCH 553/606] Adding not tags --- backend/fcm.py | 9 ++- .../push_notification_service.py | 80 +++++++++++-------- frontend/sw.js | 13 ++- 3 files changed, 67 insertions(+), 35 deletions(-) diff --git a/backend/fcm.py b/backend/fcm.py index 3666717f1..5f1ad8da5 100644 --- a/backend/fcm.py +++ b/backend/fcm.py @@ -65,10 +65,15 @@ def send_push_notifications(data, tokens): tokens: The devices' tokens that will receive the notification. """ - validate_object(data, ['title', 'body', 'click_action']) + validate_object(data, [ + 'title', + 'body_message', + 'click_action', + 'type' + ]) title = data['title'] - body = data['body'] + body = {'data': data['body_message'], 'type': data['type']} click_action = data['click_action'] if tokens: diff --git a/backend/push_notification/push_notification_service.py b/backend/push_notification/push_notification_service.py index 1eca35de4..65e606813 100644 --- a/backend/push_notification/push_notification_service.py +++ b/backend/push_notification/push_notification_service.py @@ -100,8 +100,9 @@ def __get_like_props(self): return { 'title': 'Publicação curtida', - 'body': 'Uma publicação de seu interesse foi curtida', - 'click_action': url + 'body_message': 'Uma publicação de seu interesse foi curtida', + 'click_action': url, + 'type': 'LIKE_POST' } def __get_comment_props(self): @@ -117,8 +118,9 @@ def __get_comment_props(self): return { 'title': 'Publicação comentada', - 'body': 'Uma publicação do seu interesse foi comentada', - 'click_action': url + 'body_message': 'Uma publicação do seu interesse foi comentada', + 'click_action': url, + 'type': 'COMMENT' } def __get_invite_user_props(self): @@ -129,8 +131,9 @@ def __get_invite_user_props(self): return { 'title': 'Novo convite', - 'body': 'Você recebeu um novo convite para ser membro de uma instituição', - 'click_action': url + 'body_message': 'Você recebeu um novo convite para ser membro de uma instituição', + 'click_action': url, + 'type': 'USER' } def __get_invite_user_adm_props(self): @@ -141,8 +144,9 @@ def __get_invite_user_adm_props(self): return { 'title': 'Novo convite', - 'body': 'Você recebeu um novo convite para ser administrador de uma instituição', - 'click_action': url + 'body_message': 'Você recebeu um novo convite para ser administrador de uma instituição', + 'click_action': url, + 'type': 'USER_ADM' } def __get_link_props(self): @@ -153,8 +157,9 @@ def __get_link_props(self): return { 'title': 'Solicitação de vínculo', - 'body': 'Uma instituição que você administra recebeu uma nova solicitação de vínculo', - 'click_action': url + 'body_message': 'Uma instituição que você administra recebeu uma nova solicitação de vínculo', + 'click_action': url, + 'type': 'LINK' } def __get_delete_member_props(self): @@ -162,8 +167,9 @@ def __get_delete_member_props(self): return { 'title': 'Remoção de vínculo', - 'body': 'Você foi removido da instituição %s' %self.entity.name, - 'click_action': url + 'body_message': 'Você foi removido da instituição %s' %self.entity.name, + 'click_action': url, + 'type': 'DELETE_MEMBER' } def __get_remove_inst_link_props(self): @@ -171,8 +177,9 @@ def __get_remove_inst_link_props(self): return { 'title': 'Remoção de vínculo', - 'body': 'A instituição %s teve um de seus vínculos removidos' %self.entity.name, - 'click_action': url + 'body_message': 'A instituição %s teve um de seus vínculos removidos' %self.entity.name, + 'click_action': url, + 'type': 'REMOVE_INSTITUTION_LINK' } def __get_create_post_props(self): @@ -180,8 +187,9 @@ def __get_create_post_props(self): return { 'title': 'Novo post criado', - 'body': '%s criou um novo post' %self.entity.author.urlsafe(), - 'click_action': url + 'body_message': '%s criou um novo post' %self.entity.author.urlsafe(), + 'click_action': url, + 'type': 'CREATE_POST' } def __get_delete_post_props(self): @@ -190,8 +198,9 @@ def __get_delete_post_props(self): return { 'title': 'Post deletado', - 'body': '%s deletou seu post' %admin_name, - 'click_action': url + 'body_message': '%s deletou seu post' %admin_name, + 'click_action': url, + 'type': 'DELETE_POST' } def __get_reply_comment_props(self): @@ -199,49 +208,56 @@ def __get_reply_comment_props(self): return { 'title': 'Novo comentário', - 'body': 'Seu comentário tem uma nova resposta', - 'click_action': url + 'body_message': 'Seu comentário tem uma nova resposta', + 'click_action': url, + 'type': 'REPLY_COMMENT' } def __get_deleted_user_props(self): return { 'title': 'Usuário inativo', - 'body': '%s não está mais ativo na plataforma' %self.entity.name, - 'click_action': '/' + 'body_message': '%s não está mais ativo na plataforma' %self.entity.name, + 'click_action': '/', + 'type': 'DELETED_USER' } def __get_left_institution_props(self): return { 'title': 'Remoção de vínculo de membro', - 'body': '%s removeu o vínculo com uma das instituições que você administra' %self.entity.name, - 'click_action': '/' + 'body_message': '%s removeu o vínculo com uma das instituições que você administra' %self.entity.name, + 'click_action': '/', + 'type': 'LEFT_INSTITUTION' } def __get_invite_props(self): url = '%s/new_invite' %self.entity.key.urlsafe() return { 'title': 'Novo convite', - 'body': 'Você tem um novo convite', - 'click_action': url + 'body_message': 'Você tem um novo convite', + 'click_action': url, + 'type': 'INVITE' } def __get_deleted_institution_props(self): return { 'title': 'Instituição removida', - 'body': 'A instituição %s foi removida' %self.entity.name, - 'click_action': '/' + 'body_message': 'A instituição %s foi removida' %self.entity.name, + 'click_action': '/', + 'type':'DELETED_INSTITUTION' } def __get_deleted_event_props(self): return { 'title': 'Evento removido', - 'body': 'O evento %s foi removido' %self.entity.title, - 'click_action': '/' + 'body_message': 'O evento %s foi removido' %self.entity.title, + 'click_action': '/', + 'type': 'DELETED_EVENT' } def __get_updated_event_props(self): return { 'title': 'Evento editado', - 'body': 'O evento %s foi editado' %self.entity.title, - 'click_action': '/event/%s/details' %self.entity.key.urlsafe() + 'body_message': 'O evento %s foi editado' %self.entity.title, + 'click_action': '/event/%s/details' %self.entity.key.urlsafe(), + 'type': 'UPDATED_EVENT' } diff --git a/frontend/sw.js b/frontend/sw.js index 4bca0fe8a..e0f7e8dbf 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'master'; + const CACHE_SUFIX = 'dev'; let messaging; @@ -56,10 +56,21 @@ options.data = { url: options.click_action }; + + const body = JSON.parse(options.body); + options.body = body.data; + options.tag = body.type; } options.vibrate = [100, 50, 100]; options.badge = options.icon; + console.log(event.data.json()); + console.log(event.data.json().notification); + + console.log(options.tag); + self.registration.getNotifications().then(data => { + console.log(data); + }); event.waitUntil(self.registration.showNotification(options.title, options)); }); From fa2331d47dce4f7ffb3ab20991e067b002c2de78 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Thu, 14 Mar 2019 08:36:10 -0300 Subject: [PATCH 554/606] fix description test --- feature-toggles/test/specs/utils/messageServiceSpec.js | 2 +- frontend/test/specs/utils/messageServiceSpec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/feature-toggles/test/specs/utils/messageServiceSpec.js b/feature-toggles/test/specs/utils/messageServiceSpec.js index 5144b5090..1fe192b54 100644 --- a/feature-toggles/test/specs/utils/messageServiceSpec.js +++ b/feature-toggles/test/specs/utils/messageServiceSpec.js @@ -35,7 +35,7 @@ expect(mdToast.show).toHaveBeenCalled(); }); - it('should not call mdToast.show', function() { + it('should call mdToast.show', function() { window.screen = { width: 200 }; spyOn(mdToast, 'show').and.callThrough(); service.showErrorToast(""); diff --git a/frontend/test/specs/utils/messageServiceSpec.js b/frontend/test/specs/utils/messageServiceSpec.js index 5144b5090..1fe192b54 100644 --- a/frontend/test/specs/utils/messageServiceSpec.js +++ b/frontend/test/specs/utils/messageServiceSpec.js @@ -35,7 +35,7 @@ expect(mdToast.show).toHaveBeenCalled(); }); - it('should not call mdToast.show', function() { + it('should call mdToast.show', function() { window.screen = { width: 200 }; spyOn(mdToast, 'show').and.callThrough(); service.showErrorToast(""); From 301006dbb60eb498182bc8231c36a2d829947dd5 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 14 Mar 2019 08:51:10 -0300 Subject: [PATCH 555/606] Fix wrong address remove --- .../createInvitedInstitutionSpec.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/test/specs/institution/createInvitedInstitutionSpec.js b/frontend/test/specs/institution/createInvitedInstitutionSpec.js index 8bd3fe864..f404113cf 100644 --- a/frontend/test/specs/institution/createInvitedInstitutionSpec.js +++ b/frontend/test/specs/institution/createInvitedInstitutionSpec.js @@ -4,6 +4,15 @@ describe('Test CreateInvitedInstitutionController', function() { let state, statesConst, scope, institutionService, inviteService, authService, ctrl, imageService, mdDialog, observerRecorderService; + const address = { + country: 'Brasil', + street: 'Street', + federal_state: 'State', + neighbourhood: 'Neighbourhood', + city: 'City', + cep: '12345-768' + } + const institution = { name: "name", photo_url: "imagens/test", @@ -15,7 +24,7 @@ describe('Test CreateInvitedInstitutionController', function() { actuation_area: "government agencies", phone_number: "phone", cnpj: "cnpj", - address: {}, + address: new Address(address), leader: "leader name", institutional_email: "email@institutional.com", description: "teste" @@ -130,15 +139,6 @@ describe('Test CreateInvitedInstitutionController', function() { describe('first step', () => { describe('when country is Brasil', () => { beforeEach(() => { - ctrl.newInstitution.address = { - country: 'Brasil', - street: 'Street', - federal_state: 'State', - neighbourhood: 'Neighbourhood', - city: 'City', - cep: '12345-768' - } - ctrl.currentStep = 0; }); From 81b7412d2636b03f52220dd949ed5c96d500a390 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 14 Mar 2019 09:06:31 -0300 Subject: [PATCH 556/606] Add InviteService to check type of invite --- .../institution/createInvitedInstitutionController.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index 6385ee0e8..9f6d9b88f 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -2,8 +2,8 @@ (function() { angular.module('app') .controller('CreateInvitedInstitutionController', - ['STATES', '$state', 'AuthService', 'InstitutionService', 'MessageService', '$mdDialog', 'ObserverRecorderService', 'ImageService', - function (STATES, $state, AuthService, InstitutionService, MessageService, $mdDialog, ObserverRecorderService, ImageService) { + ['STATES', '$state', 'AuthService', 'InstitutionService', 'MessageService', '$mdDialog', 'ObserverRecorderService', 'ImageService', 'InviteService', + function (STATES, $state, AuthService, InstitutionService, MessageService, $mdDialog, ObserverRecorderService, ImageService, InviteService) { const ctrl = this; let observer; ctrl.loading = true; @@ -295,7 +295,9 @@ ctrl.user = AuthService.getCurrentUser(); ctrl.institutionKey = $state.params.institutionKey; const inviteKey = $state.params.inviteKey; - ctrl.invite = _.find(ctrl.user.invites, i => _.isEqual(i.key, inviteKey)); + InviteService.getInvite(inviteKey).then(res => { + ctrl.invite = res; + }) if (ctrl.institutionKey) { ctrl.loadInstitution(ctrl.institutionKey) } else { From 0e7424a2e432e2ae3ce890b3592dd7040184871f Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Mar 2019 09:37:38 -0300 Subject: [PATCH 557/606] finished the requested invites card --- frontend/invites/invite_institution_mobile.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/invites/invite_institution_mobile.html b/frontend/invites/invite_institution_mobile.html index c54081a51..9561711d7 100644 --- a/frontend/invites/invite_institution_mobile.html +++ b/frontend/invites/invite_institution_mobile.html @@ -33,7 +33,7 @@
    - +
    @@ -52,18 +52,18 @@
    - + From 2b5bd569b9a86ce4ac1667067de60e7fc0e3ed44 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Mar 2019 09:50:25 -0300 Subject: [PATCH 558/606] added notifcation badge to requested invites card --- frontend/invites/invite_institution_mobile.css | 2 +- frontend/invites/invite_institution_mobile.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/invites/invite_institution_mobile.css b/frontend/invites/invite_institution_mobile.css index 5fd2cfafd..27c854d06 100644 --- a/frontend/invites/invite_institution_mobile.css +++ b/frontend/invites/invite_institution_mobile.css @@ -1,7 +1,6 @@ .invite-inst { display: grid; padding: 1em 0; - margin-top: 15%; } .invite-inst__toolbar__title { @@ -14,6 +13,7 @@ grid-row-start: 2; display: grid; grid-row-gap: 1em; + padding-top: 10%; } .invite-inst__card__content { diff --git a/frontend/invites/invite_institution_mobile.html b/frontend/invites/invite_institution_mobile.html index 9561711d7..7d115f92f 100644 --- a/frontend/invites/invite_institution_mobile.html +++ b/frontend/invites/invite_institution_mobile.html @@ -52,7 +52,7 @@
    - + Date: Thu, 14 Mar 2019 09:53:18 -0300 Subject: [PATCH 559/606] Add new invite institution prompt mobile screen --- frontend/index.html | 1 + frontend/invites/newInviteController.js | 4 ++ frontend/invites/new_invite_mobile.css | 72 +++++++++++++++++++++++++ frontend/invites/new_invite_page.html | 72 ++++++++++++++++++++++++- 4 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 frontend/invites/new_invite_mobile.css diff --git a/frontend/index.html b/frontend/index.html index 5c31459a4..fc6144a69 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -81,6 +81,7 @@ + diff --git a/frontend/invites/newInviteController.js b/frontend/invites/newInviteController.js index 216e31df8..f4fa2cb2b 100644 --- a/frontend/invites/newInviteController.js +++ b/frontend/invites/newInviteController.js @@ -154,6 +154,10 @@ return promise; } + newInviteCtrl.showMobileInstInviteScreen = () => { + return Utils.isMobileScreen() && !newInviteCtrl.isInviteUser(); + }; + function showAlert(event) { $mdDialog.show({ templateUrl: 'app/invites/welcome_dialog.html', diff --git a/frontend/invites/new_invite_mobile.css b/frontend/invites/new_invite_mobile.css new file mode 100644 index 000000000..47bcf8f39 --- /dev/null +++ b/frontend/invites/new_invite_mobile.css @@ -0,0 +1,72 @@ +img.mobile-invite-logo { + width: 70%; +} + +.mobile-invite-btns { + display: grid; + width: 100%; + grid-auto-flow: column; + justify-content: end; +} + +#accept-invite-grid { + display: grid; +} + +.divisor-text { + font-size: 0.8em; + font-weight: 500; + margin-left: 1.6em; +} + +.invite-inst-name { + overflow: hidden; + line-height: 1.2em; + max-height: 3.6em; + font-size: 1em; + font-weight: normal; + padding: 0.1em; + text-align: left; + text-overflow: ellipsis; + justify-items: start; +} + +.ec-list-item { + display: grid; + grid-auto-flow: column; + grid-template-columns: 1fr 3fr; + background: #ddd; + margin-bottom: 1em; + align-content: center; + align-items: center; + justify-items: center; + padding: 0.8em; +} + +.ec-list-description { + width: 100%; + display: grid; + justify-content: left; + grid-auto-flow: row; +} + +.ec-list-description p { + margin: 0.2em; +} + +.ec-list-fade-text { + color: #888; +} + +.ec-list-avatar { + width: 2.8em; + height: 2.8em; + border-radius: 50%; + margin: -0.6em 0 0 -0.6em; +} + +#invite-back-button { + justify-self: center; + margin-bottom: -2.5em; + /* margin-top: 2em; */ +} diff --git a/frontend/invites/new_invite_page.html b/frontend/invites/new_invite_page.html index 4247951ba..9e25473ea 100644 --- a/frontend/invites/new_invite_page.html +++ b/frontend/invites/new_invite_page.html @@ -1,4 +1,4 @@ - + @@ -103,4 +103,72 @@

    {{ newInviteCtrl.invite.suggestion_institution_name }}

     -     \ No newline at end of file +     + + + + + +
    + +
    +

    VOCÊ RECEBEU UM CONVITE DE:

    + + +
    +

    + PREENCHA O FORMULÁRIO PARA CADASTRAR A INSTITUIÇÃO: +

    + + +
    + + +
    +
    +
    +
    + + Rejeitar + + + Próximo + +
    + +
    +
    + + + keyboard_arrow_left + + + + + + +
    + +
    +
    +

    Este convite já foi processado!

    +
    +     + + + VOLTAR + + +     + From 735bf7f0fa4295212848ee50691e866a79f500a2 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Mar 2019 10:37:33 -0300 Subject: [PATCH 560/606] finished the accepted invites card --- frontend/invites/inviteInstitutionController.js | 4 ++++ frontend/invites/invite_institution_mobile.html | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/frontend/invites/inviteInstitutionController.js b/frontend/invites/inviteInstitutionController.js index befa9ae00..8915d6ff7 100644 --- a/frontend/invites/inviteInstitutionController.js +++ b/frontend/invites/inviteInstitutionController.js @@ -172,6 +172,10 @@ $state.go(STATES.HOME); }); } + + inviteInstCtrl.hasNewRequests = () => { + return inviteInstCtrl.sent_requests.length > 0; + }; function getSentInvitations(requests) { var isSentInvitation = createRequestSelector('sent', 'INSTITUTION'); diff --git a/frontend/invites/invite_institution_mobile.html b/frontend/invites/invite_institution_mobile.html index 7d115f92f..ddf6f2c5b 100644 --- a/frontend/invites/invite_institution_mobile.html +++ b/frontend/invites/invite_institution_mobile.html @@ -59,7 +59,7 @@ icon="account_balance" title="request.institution.name || request.requested_inst_name" subtitles-list="[ - 'Requisitado por: '+ request.sender_name, + 'Requisitado por: '+ request.sender_name, 'E-mail: ' + request.sender[0] ]" right-icon-btns="[ @@ -69,6 +69,17 @@ - + + + + + + +
    \ No newline at end of file From a0da09bd415a9d60247a12699a7e696d710c107c Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Mar 2019 11:10:29 -0300 Subject: [PATCH 561/606] fixed tests --- frontend/invites/inviteInstitutionController.js | 13 ++++--------- .../invites/inviteInstitutionControllerSpec.js | 7 +++++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/frontend/invites/inviteInstitutionController.js b/frontend/invites/inviteInstitutionController.js index 8915d6ff7..db348d00c 100644 --- a/frontend/invites/inviteInstitutionController.js +++ b/frontend/invites/inviteInstitutionController.js @@ -153,7 +153,7 @@ angular.element($cancelButton).addClass('green-button-text'); } - function loadSentRequests() { + inviteInstCtrl._loadSentRequests = () => { var institution_key = inviteInstCtrl.user.current_institution.key; RequestInvitationService.getRequestsInst(institution_key).then(function success(requests) { var isSentRequest = createRequestSelector('sent', 'REQUEST_INSTITUTION'); @@ -163,7 +163,7 @@ }); } - function loadSentInvitations() { + inviteInstCtrl._loadSentInvitations = () => { InviteService.getSentInstitutionInvitations().then(function success(response) { var requests = response; getSentInvitations(requests); @@ -194,9 +194,8 @@ } inviteInstCtrl.$onInit = () => { - if (Utils.isMobileScreen()) { - // StateLinkRequestService.showLinkRequestDialog(STATE_LINKS.INVITE_INSTITUTION, STATES.HOME); - } + inviteInstCtrl._loadSentInvitations(); + inviteInstCtrl._loadSentRequests(); }; inviteInstCtrl.createIconBtn = (icon, color, action, params, hideBtn) => { @@ -209,9 +208,5 @@ }; }; - (function main() { - loadSentInvitations(); - loadSentRequests(); - })(); }); })(); \ No newline at end of file diff --git a/frontend/test/specs/invites/inviteInstitutionControllerSpec.js b/frontend/test/specs/invites/inviteInstitutionControllerSpec.js index bcfe692eb..5e34e152c 100644 --- a/frontend/test/specs/invites/inviteInstitutionControllerSpec.js +++ b/frontend/test/specs/invites/inviteInstitutionControllerSpec.js @@ -71,6 +71,7 @@ }; state.params.institutionKey = institution.key; inviteinstitutionCtrl = createCtrl(); + inviteinstitutionCtrl.$onInit(); httpBackend.flush(); })); @@ -218,9 +219,11 @@ describe('$onInit', function () { it('should call showLinkRequestDialog if in mobile screen', function () { - spyOn(stateLinkRequestService, 'showLinkRequestDialog'); + spyOn(inviteinstitutionCtrl, '_loadSentRequests'); + spyOn(inviteinstitutionCtrl, '_loadSentInvitations'); inviteinstitutionCtrl.$onInit(); - expect(stateLinkRequestService.showLinkRequestDialog).toHaveBeenCalledWith(stateLinks.INVITE_INSTITUTION, states.HOME); + expect(inviteinstitutionCtrl._loadSentRequests).toHaveBeenCalled(); + expect(inviteinstitutionCtrl._loadSentInvitations).toHaveBeenCalled(); }); }); })); \ No newline at end of file From faaf863dd2109508906bde867183b7bd20d37ed4 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Mar 2019 11:33:54 -0300 Subject: [PATCH 562/606] fixed test --- .../invites/suggestInstitutionControllerSpec.js | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/frontend/test/specs/invites/suggestInstitutionControllerSpec.js b/frontend/test/specs/invites/suggestInstitutionControllerSpec.js index c0c62d963..6342a2c69 100644 --- a/frontend/test/specs/invites/suggestInstitutionControllerSpec.js +++ b/frontend/test/specs/invites/suggestInstitutionControllerSpec.js @@ -43,15 +43,6 @@ inviteService: InviteService, }); - httpBackend.expect('GET', '/api/invites/institution').respond([]); - httpBackend.expect('GET', '/api/institutions/requests/institution/1239').respond([]); - httpBackend.when('GET', "main/main.html").respond(200); - httpBackend.when('GET', "error/user_inactive.html").respond(200); - httpBackend.when('GET', 'invites/existing_institutions.html').respond(200); - httpBackend.when('GET', "home/home.html").respond(200); - httpBackend.when('GET', "auth/login.html").respond(200); - httpBackend.when('GET', "app/user/user_inactive.html").respond(200); - createCtrl = function() { return $controller('SuggestInstitutionController', { scope: scope, @@ -65,14 +56,8 @@ }; suggestInstCtrl = createCtrl(); - httpBackend.flush(); })); - afterEach(function() { - httpBackend.verifyNoOutstandingExpectation(); - httpBackend.verifyNoOutstandingRequest(); - }); - describe('cancel()', function() { it('should call mdDialog.cancel()', function() { spyOn(mdDialog, 'cancel'); From 9231b43c80eb046bd0b4b720a05c038dbbb87481 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 14 Mar 2019 11:42:39 -0300 Subject: [PATCH 563/606] Create shared_event style --- frontend/event/shared_event.css | 27 +++++++++++++++++++++++++ frontend/event/shared_event_mobile.html | 13 +++++++++--- frontend/index.html | 1 + 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 frontend/event/shared_event.css diff --git a/frontend/event/shared_event.css b/frontend/event/shared_event.css new file mode 100644 index 000000000..1cba9dadf --- /dev/null +++ b/frontend/event/shared_event.css @@ -0,0 +1,27 @@ +.shared-event__image-container { + position: relative; +} + +.shared-event__canceled-box { + position: absolute; + width: 100%; + z-index: 1; + height: 100%; + background-color: rgba(0,153,141,.85); + top: 0; + display: grid; + color: white; + font-weight: bold; + align-content: center; + align-items: center; + justify-content: center; + grid-template-areas: 'icon title' 'icon user'; +} + +.shared-event__canceled-box__icon { + grid-area: icon; + width: 50px; + height: 50px; + font-size: 50px; + color: white; +} \ No newline at end of file diff --git a/frontend/event/shared_event_mobile.html b/frontend/event/shared_event_mobile.html index 660246a04..0557161a1 100644 --- a/frontend/event/shared_event_mobile.html +++ b/frontend/event/shared_event_mobile.html @@ -1,6 +1,14 @@
    - +
    + + +
    + cancel +

    ESTE EVENTO FOI CANCELADO

    +

    por Administrador do CIS * Ontem às 22:32

    +
    +

    @@ -11,7 +19,6 @@

    -

    {{eventDetailsCtrl.event.start_time | amUtc | amLocal | amDateFormat:'MMM' | uppercase}} | {{eventDetailsCtrl.event.end_time | amUtc | amLocal | amDateFormat:'MMM' | uppercase}} diff --git a/frontend/index.html b/frontend/index.html index 3b1a2338b..b32a0248c 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -85,6 +85,7 @@ + From 567a0321035bd788dbd3fc3d418f5e7044d4e0b9 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 14 Mar 2019 13:27:09 -0300 Subject: [PATCH 564/606] Add limit card width --- frontend/invites/new_invite_mobile.css | 4 ++++ frontend/invites/new_invite_page.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/invites/new_invite_mobile.css b/frontend/invites/new_invite_mobile.css index 47bcf8f39..fdbc4cd91 100644 --- a/frontend/invites/new_invite_mobile.css +++ b/frontend/invites/new_invite_mobile.css @@ -1,3 +1,7 @@ +.limit-card { + max-width: 400px; +} + img.mobile-invite-logo { width: 70%; } diff --git a/frontend/invites/new_invite_page.html b/frontend/invites/new_invite_page.html index 9e25473ea..1fef46492 100644 --- a/frontend/invites/new_invite_page.html +++ b/frontend/invites/new_invite_page.html @@ -111,7 +111,7 @@

    {{ newInviteCtrl.invite.suggestion_institution_name }}

    -
    +

    VOCÊ RECEBEU UM CONVITE DE:

    From fe3296f07e1d6af31406b5a50f4e23b0b153b214 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 14 Mar 2019 13:52:09 -0300 Subject: [PATCH 565/606] Fix Promise nesting on #submit method --- .../createInvitedInstitutionController.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index 9f6d9b88f..17b4b67ba 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -139,18 +139,18 @@ const instKey = ctrl.institutionKey; const senderName = $state.params.senderName; const dialogParent = angular.element('#create-inst-content'); - return showConfirmationDialog(event, dialogParent) - .then(() => { - ctrl.loading = true; - return saveProfileImage(ctrl.photoSrc).then(() => { - return saveAndUpdateInst(inviteKey, instKey, senderName) .then(() => { - return reloadAndRedirectHome(); - }) - }) - }).catch(e => { - ctrl.loading = false; - MessageService.showToast(e); - }) + + return showConfirmationDialog(event, dialogParent).then(() => { + ctrl.loading = true; + return saveProfileImage(ctrl.photoSrc); + }).then(() => { + return saveAndUpdateInst(inviteKey, instKey, senderName); + }).then(() => { + return reloadAndRedirectHome(); + }).catch(e => { + ctrl.loading = false; + MessageService.showToast(e); + }) } else { MessageService.showToast("Campos obrigatórios não preenchidos corretamente."); } From dd831f23dafc9d2f6bd89512ad568e61ac2d493c Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Mar 2019 14:05:06 -0300 Subject: [PATCH 566/606] created function to reset form after submission --- frontend/invites/inviteInstitutionController.js | 8 ++++++++ frontend/invites/invite_institution_mobile.html | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/frontend/invites/inviteInstitutionController.js b/frontend/invites/inviteInstitutionController.js index db348d00c..b49c8e66a 100644 --- a/frontend/invites/inviteInstitutionController.js +++ b/frontend/invites/inviteInstitutionController.js @@ -31,6 +31,11 @@ inviteInstCtrl.invite = {}; }; + inviteInstCtrl.resetForm = () => { + inviteInstCtrl.inviteInstForm.$setPristine(); + inviteInstCtrl.inviteInstForm.$setUntouched(); + }; + inviteInstCtrl.checkInstInvite = function checkInstInvite(ev) { var promise; var currentInstitutionKey = inviteInstCtrl.user.current_institution.key; @@ -80,6 +85,8 @@ parent: angular.element(document.body), targetEvent: ev, clickOutsideToClose: true + }).then(_ => { + inviteInstCtrl.resetForm(); }); }; @@ -93,6 +100,7 @@ inviteInstCtrl.sent_invitations.push(invite); inviteInstCtrl.showInvites = true; inviteInstCtrl.showSendInvites = false; + inviteInstCtrl.resetForm(); MessageService.showToast('Convite enviado com sucesso!'); }); return promise; diff --git a/frontend/invites/invite_institution_mobile.html b/frontend/invites/invite_institution_mobile.html index ddf6f2c5b..9172d390f 100644 --- a/frontend/invites/invite_institution_mobile.html +++ b/frontend/invites/invite_institution_mobile.html @@ -8,7 +8,7 @@
    - +
    - CANCELAR - + From 0774cd044b9b72c33880d48778d1462df452c13e Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Mar 2019 14:35:22 -0300 Subject: [PATCH 567/606] added shadow to toolbar --- frontend/invites/invite_institution_mobile.css | 8 +++++++- frontend/invites/invite_institution_mobile.html | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/frontend/invites/invite_institution_mobile.css b/frontend/invites/invite_institution_mobile.css index 27c854d06..a8bf05e5a 100644 --- a/frontend/invites/invite_institution_mobile.css +++ b/frontend/invites/invite_institution_mobile.css @@ -3,6 +3,12 @@ padding: 1em 0; } +.invite-inst__toolbar { + position: fixed; + z-index: 3; + width: 100%; +} + .invite-inst__toolbar__title { color: #737474; text-transform: uppercase; @@ -13,7 +19,7 @@ grid-row-start: 2; display: grid; grid-row-gap: 1em; - padding-top: 10%; + padding-top: 25%; } .invite-inst__card__content { diff --git a/frontend/invites/invite_institution_mobile.html b/frontend/invites/invite_institution_mobile.html index 9172d390f..254f832af 100644 --- a/frontend/invites/invite_institution_mobile.html +++ b/frontend/invites/invite_institution_mobile.html @@ -1,7 +1,8 @@ + title-class="invite-inst__toolbar__title" + class="invite-inst__toolbar"> @@ -26,7 +27,7 @@ CANCELAR ENVIAR
    From e0689aa2f8709c6ddee4c2f50ce50be9745c4462 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Thu, 14 Mar 2019 14:42:40 -0300 Subject: [PATCH 568/606] Finishing search event --- backend/search_module/search_event.py | 11 ++-- frontend/search/search.css | 13 ++++ frontend/search/searchController.js | 3 + frontend/search/search_event.html | 93 +++++++++++++-------------- 4 files changed, 66 insertions(+), 54 deletions(-) diff --git a/backend/search_module/search_event.py b/backend/search_module/search_event.py index e51d64349..c3f0b9b8e 100644 --- a/backend/search_module/search_event.py +++ b/backend/search_module/search_event.py @@ -5,7 +5,7 @@ from . import SearchDocument from utils import text_normalize import json -from datetime import datetime +from datetime import timedelta __all__ = ['SearchEvent'] @@ -23,10 +23,9 @@ def event_has_changes(fields, entity): return False -def get_date_string_without_utc(event_date): - """It returns only the date string without hours or hours with incorrect UTC.""" - return datetime(event_date.year, event_date.month, event_date.day, - event_date.hour - 3).isoformat().split("T")[0] +def get_date_string(event_date): + """It fix the utc for Brazil and returns only the date.""" + return (event_date - timedelta(hours=3)).isoformat().split("T")[0] class SearchEvent(SearchDocument): """Search event's model.""" @@ -55,7 +54,7 @@ def createDocument(self, event): 'institution_key': event.institution_key.urlsafe(), 'photo_url': event.photo_url, 'institution_acronym': event.institution_acronym, - 'start_time': get_date_string_without_utc(event.start_time), + 'start_time': get_date_string(event.start_time), 'address': event.address and json.dumps(dict(event.address)), 'country': event.address and event.address.country, 'federal_state': event.address and event.address.federal_state, diff --git a/frontend/search/search.css b/frontend/search/search.css index 61a30e360..61edab3f4 100644 --- a/frontend/search/search.css +++ b/frontend/search/search.css @@ -160,4 +160,17 @@ grid-template-columns: 49% 49%; grid-column-gap: 0.4em; margin-top: 1em; +} + +.search-event-input-container { + padding: 0; + margin: 0; +} + +.search-event-select-container { + margin-bottom: 2em; +} + +.search-event-header { + margin-top: 1.2em; } \ No newline at end of file diff --git a/frontend/search/searchController.js b/frontend/search/searchController.js index 98ea62c72..b162025aa 100644 --- a/frontend/search/searchController.js +++ b/frontend/search/searchController.js @@ -47,6 +47,7 @@ searchCtrl.searchCoutry = ""; searchCtrl.searchCity = ""; searchCtrl.institutions = []; + searchCtrl.events = []; }; /** @@ -123,6 +124,8 @@ event.state !== 'deleted' && $state.go(STATES.EVENT_DETAILS, { eventKey: event.id }); }; + searchCtrl.isAnotherCountry = () => searchCtrl.searchCountry !== "Brasil"; + /** * A simple function that works like a controller to the * search_dialog.html. diff --git a/frontend/search/search_event.html b/frontend/search/search_event.html index 311a2047d..cd50060ed 100644 --- a/frontend/search/search_event.html +++ b/frontend/search/search_event.html @@ -1,61 +1,58 @@
    -
    +
    Pesquisa avançada arrow_drop_down
    -
    -
    - -

    INSTITUIÇÃO

    - -     -
    +
    + +

    INSTITUIÇÃO

    + +     + + + + + + + {{country.nome_pais}} + + + + + + + + {{state.nome}} + + + + + + + + {{city}} + + +
    -
    -
    - - - - - - - {{country.nome_pais}} - - - - - - - {{state.nome}} - - - - - - - {{city}} - - - -
    -
    - - CANCELAR - - - PESQUISAR - -
    +
    + + CANCELAR + + + PESQUISAR +
    From 378f7836701b7e4cdf2febc051f88e1ebf30881b Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Mar 2019 14:47:10 -0300 Subject: [PATCH 569/606] go to instituion when the accepted invite is clicked --- frontend/invites/inviteInstitutionController.js | 13 ++++++++++--- frontend/invites/invite_institution_mobile.html | 10 ++++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/frontend/invites/inviteInstitutionController.js b/frontend/invites/inviteInstitutionController.js index b49c8e66a..3b9390223 100644 --- a/frontend/invites/inviteInstitutionController.js +++ b/frontend/invites/inviteInstitutionController.js @@ -22,6 +22,10 @@ inviteInstCtrl.user = AuthService.getCurrentUser(); + inviteInstCtrl.$onInit = () => { + inviteInstCtrl._loadSentInvitations(); + inviteInstCtrl._loadSentRequests(); + }; inviteInstCtrl.toggleElement = function toggleElement(flagName) { inviteInstCtrl[flagName] = !inviteInstCtrl[flagName]; @@ -201,9 +205,12 @@ } } - inviteInstCtrl.$onInit = () => { - inviteInstCtrl._loadSentInvitations(); - inviteInstCtrl._loadSentRequests(); + inviteInstCtrl.goToActiveInst = (institution) => { + if (institution.state === "active") { + inviteInstCtrl.goToInst(institution.key); + } else { + MessageService.showToast("Institutição inativa!"); + } }; inviteInstCtrl.createIconBtn = (icon, color, action, params, hideBtn) => { diff --git a/frontend/invites/invite_institution_mobile.html b/frontend/invites/invite_institution_mobile.html index 254f832af..237c8ed2f 100644 --- a/frontend/invites/invite_institution_mobile.html +++ b/frontend/invites/invite_institution_mobile.html @@ -73,15 +73,13 @@ - + left-action="inviteInstCtrl.goToActiveInst(acceptedInvite.stub_institution)"> From ea2acfdab54f7bda8b0f67c3f698901347f46774 Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Mar 2019 15:17:33 -0300 Subject: [PATCH 570/606] created the entityShowcase factory --- frontend/index.html | 1 + .../managementMembersController.js | 10 ++----- .../invites/inviteInstHierarchieController.js | 21 +++---------- .../invites/inviteInstitutionController.js | 12 ++------ .../entityShowcase/entityShowcase.factory.js | 30 +++++++++++++++++++ 5 files changed, 41 insertions(+), 33 deletions(-) create mode 100644 frontend/utils/entityShowcase/entityShowcase.factory.js diff --git a/frontend/index.html b/frontend/index.html index 64249cc6e..c1cb045f5 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -324,6 +324,7 @@ + diff --git a/frontend/institution/manageMembers/managementMembersController.js b/frontend/institution/manageMembers/managementMembersController.js index a4392aa55..32195d541 100644 --- a/frontend/institution/manageMembers/managementMembersController.js +++ b/frontend/institution/manageMembers/managementMembersController.js @@ -4,7 +4,7 @@ app.controller("ManagementMembersController", function InviteUserController( InviteService, $state, $mdDialog, InstitutionService, AuthService, MessageService, - RequestInvitationService, ProfileService, STATES) { + RequestInvitationService, ProfileService, STATES, EntityShowcase) { var manageMemberCtrl = this; var MAX_EMAILS_QUANTITY = 10; @@ -112,12 +112,8 @@ * Constructs the object that will be used to create a button * in the entity-showcase component */ - manageMemberCtrl.getEntityShowcaseBtn = (icon, color, action, params) => { - return { - icon: icon, - iconColor: color, - action: () => action(...params) - }; + manageMemberCtrl.getEntityShowcaseBtn = (...args) => { + return EntityShowcase.createIconBtn(...args); }; manageMemberCtrl.sendUserInvite = function sendInvite(loadedEmails) { diff --git a/frontend/invites/inviteInstHierarchieController.js b/frontend/invites/inviteInstHierarchieController.js index 3f90955a8..78f0a1335 100644 --- a/frontend/invites/inviteInstHierarchieController.js +++ b/frontend/invites/inviteInstHierarchieController.js @@ -5,7 +5,7 @@ app.controller("InviteInstHierarchieController", function InviteInstHierarchieController( InviteService, STATES, $mdDialog, $state, AuthService, InstitutionService, - MessageService, RequestInvitationService, RequestDialogService, $q) { + MessageService, RequestInvitationService, RequestDialogService, $q, EntityShowcase) { var inviteInstHierCtrl = this; var institutionKey = $state.params.institutionKey; @@ -424,22 +424,9 @@ inviteInstHierCtrl.limitString = function limitString(string, size) { return Utils.limitString(string, size); }; - - /** - * Generates an object with the properties used to create an rightIconBtn - * in the EntityShowCase component - * @param {string} - icon tho be showed as a button - * @param {function} - action function to be called when the button is clicked - * @param {array} - params that will be necessary to action function to be called - * @param {boolean} - hideBtn flag used to hide the button if true - */ - inviteInstHierCtrl.createIconBtn = (icon, action, params, hideBtn) => { - return { - icon: icon, - iconColor: '#009688', - action: () => action(...params), - showIf: () => hideBtn === undefined ? true : hideBtn - }; + + inviteInstHierCtrl.createIconBtn = (...args) => { + return EntityShowcase.createIconBtn(...args); }; }); })(); \ No newline at end of file diff --git a/frontend/invites/inviteInstitutionController.js b/frontend/invites/inviteInstitutionController.js index 3b9390223..cc52ac5fa 100644 --- a/frontend/invites/inviteInstitutionController.js +++ b/frontend/invites/inviteInstitutionController.js @@ -4,7 +4,7 @@ app.controller("InviteInstitutionController", function InviteInstitutionController( InviteService, $state, AuthService, InstitutionService, RequestInvitationService, - STATES, $mdDialog, MessageService, StateLinkRequestService, STATE_LINKS) { + STATES, $mdDialog, MessageService, EntityShowcase, STATE_LINKS) { var inviteInstCtrl = this; inviteInstCtrl.invite = {}; @@ -213,14 +213,8 @@ } }; - inviteInstCtrl.createIconBtn = (icon, color, action, params, hideBtn) => { - const greyColor = '#9E9E9E'; - return { - icon: icon, - iconColor: color || greyColor, - action: () => action(...params), - showIf: () => hideBtn === undefined ? true : hideBtn - }; + inviteInstCtrl.createIconBtn = (...args) => { + return EntityShowcase.createIconBtn(...args) }; }); diff --git a/frontend/utils/entityShowcase/entityShowcase.factory.js b/frontend/utils/entityShowcase/entityShowcase.factory.js new file mode 100644 index 000000000..c8def8986 --- /dev/null +++ b/frontend/utils/entityShowcase/entityShowcase.factory.js @@ -0,0 +1,30 @@ +(function() { + "use strict"; + + angular + .module('app') + .factory("EntityShowcase", function () { + const factory = {}; + + /** + * Generates an object with the properties used to create an rightIconBtn + * in the EntityShowCase component + * @param {string} - icon tho be showed as a button + * @param {string} - color of the icon, if not defined it is set to a default one + * @param {function} - action function to be called when the button is clicked + * @param {array} - params that will be necessary to action function to be called + * @param {boolean} - hideBtn flag used to hide the button if true + */ + factory.createIconBtn = (icon, color, action, params, hideBtn) => { + const greyColor = '#9E9E9E'; + return { + icon: icon, + iconColor: color || greyColor, + action: () => action(...params), + showIf: () => hideBtn === undefined ? true : hideBtn + }; + }; + + return factory; + }); +})(); \ No newline at end of file From 7afa7c0f4a96c18f6129c4c8563935022d6d1a86 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 14 Mar 2019 15:20:45 -0300 Subject: [PATCH 571/606] finalize shared event mobile --- frontend/event/shared_event.css | 57 +++++++++++++++++++++++-- frontend/event/shared_event_mobile.html | 20 ++++++--- frontend/post/postDetailsDirective.js | 3 +- frontend/post/post_details.html | 4 +- 4 files changed, 69 insertions(+), 15 deletions(-) diff --git a/frontend/event/shared_event.css b/frontend/event/shared_event.css index 1cba9dadf..ee3193482 100644 --- a/frontend/event/shared_event.css +++ b/frontend/event/shared_event.css @@ -2,13 +2,19 @@ position: relative; } -.shared-event__canceled-box { - position: absolute; - width: 100%; - z-index: 1; +.shared-event__canceled { height: 100%; + width: 100%; + max-width: 100%; background-color: rgba(0,153,141,.85); top: 0; + position: absolute; + z-index: 1; +} + +.shared-event__canceled-box { + padding: 0 16px; + height: 100%; display: grid; color: white; font-weight: bold; @@ -16,6 +22,7 @@ align-items: center; justify-content: center; grid-template-areas: 'icon title' 'icon user'; + grid-column-gap: 10px; } .shared-event__canceled-box__icon { @@ -24,4 +31,46 @@ height: 50px; font-size: 50px; color: white; + margin: 0; +} + +.shared-event__info { + display: grid; + grid-template-columns: max-content 1fr; +} + +.shared-event__info__date { + display: grid; + grid-template-rows: auto auto auto; + justify-content: center; justify-items: center; + align-content: center; + color: white; + background-color: #8CC04E; + padding: 8px; +} + +.shared-event__info__date--active { + background-color: #8CC04E; +} + +.shared-event__info__date--canceled { + background-color: #959595; +} + +.shared-event__info_name { + background-color: #199688; + display: grid; + grid-template-rows: auto auto; + align-content: space-around; + padding: 8px; +} + +.shared-event__info_name--active { + background-color: #199688; + color: white; +} + +.shared-event__info_name--canceled { + background-color: #707070; + color: #B5B5B5; } \ No newline at end of file diff --git a/frontend/event/shared_event_mobile.html b/frontend/event/shared_event_mobile.html index 0557161a1..032935653 100644 --- a/frontend/event/shared_event_mobile.html +++ b/frontend/event/shared_event_mobile.html @@ -3,14 +3,20 @@ -
    - cancel -

    ESTE EVENTO FOI CANCELADO

    -

    por Administrador do CIS * Ontem às 22:32

    +
    +
    + cancel +

    ESTE EVENTO FOI CANCELADO

    +

    + {{eventDetailsCtrl.event.last_modified_by == eventDetailsCtrl.event.author ? 'por' : 'pelo administrador'}} + {{eventDetailsCtrl.event.last_modified_by}} + {{eventDetailsCtrl.event.last_modified_date | amUtc | amLocal | amCalendar:referenceTime:formats }}. +

    +
    -
    -
    +
    +

    {{eventDetailsCtrl.event.start_time | amUtc | amLocal | amDateFormat:'DD'}} A {{eventDetailsCtrl.event.end_time | amUtc | amLocal | amDateFormat:'DD' | uppercase}}

    @@ -27,7 +33,7 @@

    {{eventDetailsCtrl.event.start_time | amUtc | amLocal | amDateFormat:'MMMM' | uppercase}}

    -
    +
    {{ eventDetailsCtrl.event.title | uppercase}} diff --git a/frontend/post/postDetailsDirective.js b/frontend/post/postDetailsDirective.js index 17a684e58..e86c7519d 100644 --- a/frontend/post/postDetailsDirective.js +++ b/frontend/post/postDetailsDirective.js @@ -125,8 +125,7 @@ postDetailsCtrl.showSharedEvent = function showSharedEvent() { return postDetailsCtrl.post.shared_event && - !postDetailsCtrl.isDeleted(postDetailsCtrl.post) && - !postDetailsCtrl.isDeleted(postDetailsCtrl.post.shared_event); + !postDetailsCtrl.isDeleted(postDetailsCtrl.post); }; postDetailsCtrl.showSurvey = function showSurvey() { diff --git a/frontend/post/post_details.html b/frontend/post/post_details.html index b8040d889..9807fd075 100644 --- a/frontend/post/post_details.html +++ b/frontend/post/post_details.html @@ -104,8 +104,8 @@ - - + From 337dbd59f154bbbdc59309fe7eaa18bc23bf293e Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Mar 2019 15:32:46 -0300 Subject: [PATCH 572/606] fixed tests --- .../specs/invites/inviteInstitutionControllerSpec.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/frontend/test/specs/invites/inviteInstitutionControllerSpec.js b/frontend/test/specs/invites/inviteInstitutionControllerSpec.js index 5e34e152c..48a235c6d 100644 --- a/frontend/test/specs/invites/inviteInstitutionControllerSpec.js +++ b/frontend/test/specs/invites/inviteInstitutionControllerSpec.js @@ -1,6 +1,6 @@ 'use strict'; -(describe('Test InviteInstitutionController', function() { +(fdescribe('Test InviteInstitutionController', function() { var inviteinstitutionCtrl, httpBackend, scope, inviteService, createCtrl, state, instService, mdDialog, requestInvitationService; let stateLinkRequestService, states, stateLinks; @@ -33,6 +33,11 @@ status: 'sent', } + const form = { + '$setPristine': () => {}, + '$setUntouched': () => {} + }; + var INSTITUTION_SEARCH_URI = '/api/search/institution?value='; var invite = new Invite({invitee: "user@gmail.com", suggestion_institution_name : "New Institution", key: '123'}, 'institution', institution.key); @@ -72,6 +77,7 @@ state.params.institutionKey = institution.key; inviteinstitutionCtrl = createCtrl(); inviteinstitutionCtrl.$onInit(); + inviteinstitutionCtrl.inviteInstForm = form; httpBackend.flush(); })); @@ -100,6 +106,7 @@ } }; }); + spyOn(inviteinstitutionCtrl, 'resetForm'); inviteinstitutionCtrl.invite = invite; }); @@ -108,6 +115,7 @@ var promise = inviteinstitutionCtrl.sendInstInvite(invite); promise.then(function() { expect(inviteService.sendInviteInst).toHaveBeenCalledWith(invite); + expect(inviteinstitutionCtrl.resetForm).toHaveBeenCalled(); done(); }); }); From d01d45f76292d12d1c078a0599480cff8fe994ec Mon Sep 17 00:00:00 2001 From: ruanres Date: Thu, 14 Mar 2019 15:33:13 -0300 Subject: [PATCH 573/606] removed focus from test --- frontend/test/specs/invites/inviteInstitutionControllerSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/test/specs/invites/inviteInstitutionControllerSpec.js b/frontend/test/specs/invites/inviteInstitutionControllerSpec.js index 48a235c6d..96f14b021 100644 --- a/frontend/test/specs/invites/inviteInstitutionControllerSpec.js +++ b/frontend/test/specs/invites/inviteInstitutionControllerSpec.js @@ -1,6 +1,6 @@ 'use strict'; -(fdescribe('Test InviteInstitutionController', function() { +(describe('Test InviteInstitutionController', function() { var inviteinstitutionCtrl, httpBackend, scope, inviteService, createCtrl, state, instService, mdDialog, requestInvitationService; let stateLinkRequestService, states, stateLinks; From 701258067a33126da90f495fad673ae000be5625 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Thu, 14 Mar 2019 15:35:30 -0300 Subject: [PATCH 574/606] Fixing behavior of search event --- backend/search_module/search_event.py | 8 +++++--- frontend/event/eventCard.component.js | 18 ++++++++++++------ frontend/search/search_event.html | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/backend/search_module/search_event.py b/backend/search_module/search_event.py index c3f0b9b8e..74a407077 100644 --- a/backend/search_module/search_event.py +++ b/backend/search_module/search_event.py @@ -54,7 +54,8 @@ def createDocument(self, event): 'institution_key': event.institution_key.urlsafe(), 'photo_url': event.photo_url, 'institution_acronym': event.institution_acronym, - 'start_time': get_date_string(event.start_time), + 'start_time': event.start_time.isoformat(), + 'date': get_date_string(event.start_time), 'address': event.address and json.dumps(dict(event.address)), 'country': event.address and event.address.country, 'federal_state': event.address and event.address.federal_state, @@ -74,6 +75,7 @@ def createDocument(self, event): search.TextField(name='photo_url', value=content['photo_url']), search.TextField(name='institution_acronym', value=content['institution_acronym']), search.TextField(name='start_time', value=content['start_time']), + search.TextField(name='date', value=content['date']), search.TextField(name='address', value=content['address']), search.TextField(name='country', value=content['country']), search.TextField(name='federal_state', value=content['federal_state']), @@ -90,7 +92,7 @@ def getDocuments(self, value, state): index = search.Index(self.index_name) query_options = search.QueryOptions( returned_fields=['state', 'title', 'institution_key', 'photo_url', 'institution_name', - 'institution_acronym', 'start_time', 'address', 'country', 'federal_state', 'city'] + 'institution_acronym', 'start_time', 'address'] ) query = search.Query( query_string=query_string, options=query_options) @@ -131,7 +133,7 @@ def create_field_values_string(self, value): and the fields won't be considered. """ # add a new field here - fields = ['state', 'institution_name', 'start_time', + fields = ['state', 'institution_name', 'date', 'institution_acronym', 'country', 'federal_state', 'city'] fields_values = [] diff --git a/frontend/event/eventCard.component.js b/frontend/event/eventCard.component.js index a7f5669c5..d7f1a71d7 100644 --- a/frontend/event/eventCard.component.js +++ b/frontend/event/eventCard.component.js @@ -1,8 +1,9 @@ "use strict"; (function() { + const app = angular.module("app"); - function EventCardController(AuthService) { + app.controller("EventCardController", function EventCardController(AuthService) { const eventCardCtrl = this; eventCardCtrl.user = AuthService.getCurrentUser(); @@ -16,13 +17,18 @@ }); return _.get(_.first(profile), 'color', 'teal'); }; - }; - angular - .module("app") - .component("eventCard", { + eventCardCtrl.$onInit = () => { + const address = eventCardCtrl.event.address; + if (_.isString(address)) { + eventCardCtrl.event.address = JSON.parse(address); + } + }; + }); + + app.component("eventCard", { templateUrl: 'app/event/event_card.html', - controller: ['AuthService', EventCardController], + controller: 'EventCardController', controllerAs: 'eventCardCtrl', bindings: { event: '<', diff --git a/frontend/search/search_event.html b/frontend/search/search_event.html index cd50060ed..589380b53 100644 --- a/frontend/search/search_event.html +++ b/frontend/search/search_event.html @@ -39,7 +39,7 @@ + class="search-by-mobile" ng-disabled="searchCtrl.isAnotherCountry() || !searchCtrl.searchState"> {{city}} From 7033aaafc982e653ab2b83adcfa9e2560a670c59 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 14 Mar 2019 15:38:05 -0300 Subject: [PATCH 575/606] Remove unused classes --- frontend/invites/new_invite_mobile.css | 35 -------------------------- 1 file changed, 35 deletions(-) diff --git a/frontend/invites/new_invite_mobile.css b/frontend/invites/new_invite_mobile.css index fdbc4cd91..58efa4002 100644 --- a/frontend/invites/new_invite_mobile.css +++ b/frontend/invites/new_invite_mobile.css @@ -35,42 +35,7 @@ img.mobile-invite-logo { justify-items: start; } -.ec-list-item { - display: grid; - grid-auto-flow: column; - grid-template-columns: 1fr 3fr; - background: #ddd; - margin-bottom: 1em; - align-content: center; - align-items: center; - justify-items: center; - padding: 0.8em; -} - -.ec-list-description { - width: 100%; - display: grid; - justify-content: left; - grid-auto-flow: row; -} - -.ec-list-description p { - margin: 0.2em; -} - -.ec-list-fade-text { - color: #888; -} - -.ec-list-avatar { - width: 2.8em; - height: 2.8em; - border-radius: 50%; - margin: -0.6em 0 0 -0.6em; -} - #invite-back-button { justify-self: center; margin-bottom: -2.5em; - /* margin-top: 2em; */ } From a4e521aad6da359547bcb3047791407baace178e Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 14 Mar 2019 15:43:55 -0300 Subject: [PATCH 576/606] Increase margin on form title --- frontend/institution/create_inst_form_mobile.css | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/institution/create_inst_form_mobile.css b/frontend/institution/create_inst_form_mobile.css index d19071479..b34dd0f82 100644 --- a/frontend/institution/create_inst_form_mobile.css +++ b/frontend/institution/create_inst_form_mobile.css @@ -93,6 +93,7 @@ md-content.grid-fill-screen { #form-switch { width: 100%; + margin-top: 0.6em; } #create-inst-content button.md-primary { From 2b7714a31b109eb14d2053aa491751d386e64a6f Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Thu, 14 Mar 2019 15:47:50 -0300 Subject: [PATCH 577/606] Removing unnecessary inject --- frontend/search/searchController.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/search/searchController.js b/frontend/search/searchController.js index b162025aa..ae2571107 100644 --- a/frontend/search/searchController.js +++ b/frontend/search/searchController.js @@ -4,7 +4,7 @@ var app = angular.module('app'); app.controller("SearchController", function SearchController($state, InstitutionService, - brCidadesEstados, HttpService, $mdDialog, $window, STATES, $http, AuthService, EventService) { + brCidadesEstados, HttpService, $mdDialog, $window, STATES, AuthService, EventService) { var searchCtrl = this; @@ -195,8 +195,8 @@ } function loadCountries() { - $http.get('app/institution/countries.json').then(function success(response) { - searchCtrl.countries = response.data; + HttpService.get('app/institution/countries.json').then(function success(response) { + searchCtrl.countries = response; }); } From f6f436763737b15220dd784cc420ea01030f6cb3 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 14 Mar 2019 15:50:30 -0300 Subject: [PATCH 578/606] Fix screen when invite is already processed --- frontend/invites/newInviteController.js | 2 +- frontend/invites/new_invite_page.html | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/frontend/invites/newInviteController.js b/frontend/invites/newInviteController.js index f4fa2cb2b..2acd052da 100644 --- a/frontend/invites/newInviteController.js +++ b/frontend/invites/newInviteController.js @@ -155,7 +155,7 @@ } newInviteCtrl.showMobileInstInviteScreen = () => { - return Utils.isMobileScreen() && !newInviteCtrl.isInviteUser(); + return Utils.isMobileScreen() && !newInviteCtrl.isInviteUser() && !newInviteCtrl.isAlreadyProcessed; }; function showAlert(event) { diff --git a/frontend/invites/new_invite_page.html b/frontend/invites/new_invite_page.html index 1fef46492..dde4994ab 100644 --- a/frontend/invites/new_invite_page.html +++ b/frontend/invites/new_invite_page.html @@ -154,21 +154,4 @@

    {{ newInviteCtrl.invite.suggestion_institution_name }}

    keyboard_arrow_left - - - - -
    - -
    -
    -

    Este convite já foi processado!

    -
    -     - - - VOLTAR - - -     From ebfd744bdab1e5acc015362ff511934679763557 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Thu, 14 Mar 2019 16:09:50 -0300 Subject: [PATCH 579/606] Removing wrong call function --- frontend/event/events_mobile.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index 7b5716f6f..a38755dba 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -20,9 +20,7 @@ ng-if="eventCtrl.events.length > 0" class="events-grid events-grid-position">
    {{events.day}} -

    - {{events.events[0].start_time | amUtc | amDateFormat:'ddd' }} -

    +

    {{events.events[0].start_time | amUtc | amDateFormat:'ddd'}}

    From e807f19f4fbe5660e34ccb17175b2a1af3dad969 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 14 Mar 2019 16:15:46 -0300 Subject: [PATCH 580/606] Add check if is mobile screen --- frontend/event/events.html | 4 ++-- frontend/event/shared_event.css | 13 +++++++++++++ frontend/event/shared_event_mobile.html | 8 ++++---- frontend/post/post_details.html | 6 +++--- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/frontend/event/events.html b/frontend/event/events.html index 940e5a702..44950e2f1 100644 --- a/frontend/event/events.html +++ b/frontend/event/events.html @@ -40,8 +40,8 @@

    Nenhum evento a ser exibido.

    share
    -
    - +
    +
    diff --git a/frontend/event/shared_event.css b/frontend/event/shared_event.css index ee3193482..ce4102413 100644 --- a/frontend/event/shared_event.css +++ b/frontend/event/shared_event.css @@ -73,4 +73,17 @@ .shared-event__info_name--canceled { background-color: #707070; color: #B5B5B5; +} + +.shared-event__info_name-event { + color: white; + display: -webkit-box; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; +} + +.shared-event__info_name-inst { + color: white; } \ No newline at end of file diff --git a/frontend/event/shared_event_mobile.html b/frontend/event/shared_event_mobile.html index 032935653..052f14e5e 100644 --- a/frontend/event/shared_event_mobile.html +++ b/frontend/event/shared_event_mobile.html @@ -1,6 +1,6 @@
    -
    - +
    @@ -35,9 +35,9 @@

    - {{ eventDetailsCtrl.event.title | uppercase}} + {{ eventDetailsCtrl.event.title | uppercase}} - Organizado por {{eventDetailsCtrl.event.institution_name}} + Organizado por {{eventDetailsCtrl.event.institution_name}}
    \ No newline at end of file diff --git a/frontend/post/post_details.html b/frontend/post/post_details.html index 9807fd075..eb7ecba35 100644 --- a/frontend/post/post_details.html +++ b/frontend/post/post_details.html @@ -104,9 +104,9 @@ - - + + + From 9a4f539e466857d66868adfaa14e1fe213c80db9 Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 14 Mar 2019 16:38:00 -0300 Subject: [PATCH 581/606] Undo --- frontend/event/events.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/event/events.html b/frontend/event/events.html index 44950e2f1..940e5a702 100644 --- a/frontend/event/events.html +++ b/frontend/event/events.html @@ -40,8 +40,8 @@

    Nenhum evento a ser exibido.

    share
    -
    - +
    +
    From b97a66597ffdef8add59baff0cb2ed28dc0eb5a1 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Thu, 14 Mar 2019 16:40:19 -0300 Subject: [PATCH 582/606] Changing color of institution name field --- frontend/search/search.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frontend/search/search.css b/frontend/search/search.css index 61edab3f4..e5ee3ee3f 100644 --- a/frontend/search/search.css +++ b/frontend/search/search.css @@ -106,10 +106,9 @@ margin-top: -1.2em; } -.search-event-title, .search-event-select-menu { - color: #004D40; - font-size: 0.8em; - margin-top: -0.1em; +.search-event-title { + color: #009688; + font-size: 0.96em; } .search-event-title { From 44ec24ec57fcad5f373ffa7b7b6be1c3eb6a1bb3 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 14 Mar 2019 16:41:07 -0300 Subject: [PATCH 583/606] Fix typos on Instituicao --- frontend/institution/createInvitedInstitutionController.js | 2 +- frontend/institution/forms/institution_form.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index 17b4b67ba..c5206bee8 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -108,7 +108,7 @@ get: function() { const labels = { 0: 'Dados Cadastrais', - 1: 'Dados da Instituiçao', + 1: 'Dados da Instituição', 2: 'Finalizar Cadastro', } return labels[ctrl.currentStep]; diff --git a/frontend/institution/forms/institution_form.html b/frontend/institution/forms/institution_form.html index ba6ef747f..bca6cbada 100644 --- a/frontend/institution/forms/institution_form.html +++ b/frontend/institution/forms/institution_form.html @@ -13,7 +13,7 @@ style='margin-bottom: 1em'> - + Date: Thu, 14 Mar 2019 16:42:55 -0300 Subject: [PATCH 584/606] Increase form title size, add required description --- frontend/institution/create_inst_form_mobile.css | 4 ++-- frontend/institution/forms/forms.css | 2 ++ frontend/institution/forms/last_info_form.html | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/frontend/institution/create_inst_form_mobile.css b/frontend/institution/create_inst_form_mobile.css index b34dd0f82..201a5b755 100644 --- a/frontend/institution/create_inst_form_mobile.css +++ b/frontend/institution/create_inst_form_mobile.css @@ -75,7 +75,7 @@ md-content.grid-fill-screen { } #create-inst-card-content > h1 { - font-size: 1em; + font-size: 1.2em; font-weight: 500; text-transform: uppercase; justify-self: start; @@ -93,7 +93,7 @@ md-content.grid-fill-screen { #form-switch { width: 100%; - margin-top: 0.6em; + margin-top: 1em; } #create-inst-content button.md-primary { diff --git a/frontend/institution/forms/forms.css b/frontend/institution/forms/forms.css index 274e3e3c5..d56f60acd 100644 --- a/frontend/institution/forms/forms.css +++ b/frontend/institution/forms/forms.css @@ -67,6 +67,8 @@ last-info-form #last-info-form { border: 1px solid; border-color: #ccc; border-radius: 0.4em; + margin-top: 1em; + margin-bottom: 1em; } #last-info-form #description textarea { diff --git a/frontend/institution/forms/last_info_form.html b/frontend/institution/forms/last_info_form.html index 34fec5711..ab71cd814 100644 --- a/frontend/institution/forms/last_info_form.html +++ b/frontend/institution/forms/last_info_form.html @@ -1,15 +1,16 @@
    - + + maxlength="1100" + required> - + From 4b5e5de7937da26b6de9a37b7e46910871c2a49a Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 14 Mar 2019 16:54:38 -0300 Subject: [PATCH 585/606] fix-issues --- frontend/event/shared_event.css | 28 ++++++++++++++++++++++++- frontend/event/shared_event_mobile.html | 17 +++++++-------- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/frontend/event/shared_event.css b/frontend/event/shared_event.css index ce4102413..bca3b409c 100644 --- a/frontend/event/shared_event.css +++ b/frontend/event/shared_event.css @@ -2,6 +2,11 @@ position: relative; } +.shared-event__image-container__img { + width: 100%; + background-color: white; +} + .shared-event__canceled { height: 100%; width: 100%; @@ -21,7 +26,7 @@ align-content: center; align-items: center; justify-content: center; - grid-template-areas: 'icon title' 'icon user'; + grid-template-areas: 'icon title' 'icon body'; grid-column-gap: 10px; } @@ -34,6 +39,17 @@ margin: 0; } +.shared-event__canceled-box__title { + grid-area: title; + margin: 0; +} + +.shared-event__canceled-box__body { + grid-area: body; + margin: 0; + font-size: 11px; +} + .shared-event__info { display: grid; grid-template-columns: max-content 1fr; @@ -49,6 +65,16 @@ padding: 8px; } +.shared-event__info__date > h3 { + margin: 0; +} + +.shared-event__info__date__divider { + border: 1px; + border-style: solid; + width: 100%; +} + .shared-event__info__date--active { background-color: #8CC04E; } diff --git a/frontend/event/shared_event_mobile.html b/frontend/event/shared_event_mobile.html index 052f14e5e..3b6028ab8 100644 --- a/frontend/event/shared_event_mobile.html +++ b/frontend/event/shared_event_mobile.html @@ -1,13 +1,12 @@
    - +
    cancel -

    ESTE EVENTO FOI CANCELADO

    -

    +

    ESTE EVENTO FOI CANCELADO

    +

    {{eventDetailsCtrl.event.last_modified_by == eventDetailsCtrl.event.author ? 'por' : 'pelo administrador'}} {{eventDetailsCtrl.event.last_modified_by}} {{eventDetailsCtrl.event.last_modified_date | amUtc | amLocal | amCalendar:referenceTime:formats }}. @@ -17,19 +16,19 @@

    -

    +

    {{eventDetailsCtrl.event.start_time | amUtc | amLocal | amDateFormat:'DD'}} A {{eventDetailsCtrl.event.end_time | amUtc | amLocal | amDateFormat:'DD' | uppercase}}

    -

    +

    {{eventDetailsCtrl.event.start_time | amUtc | amLocal | amDateFormat:'DD'}}

    - + -

    +

    {{eventDetailsCtrl.event.start_time | amUtc | amLocal | amDateFormat:'MMM' | uppercase}} | {{eventDetailsCtrl.event.end_time | amUtc | amLocal | amDateFormat:'MMM' | uppercase}}

    -

    +

    {{eventDetailsCtrl.event.start_time | amUtc | amLocal | amDateFormat:'MMMM' | uppercase}}

    From fb9a9d5ea6fd752807a34e8c4528c45e963a417f Mon Sep 17 00:00:00 2001 From: Luiz-FS Date: Thu, 14 Mar 2019 17:24:27 -0300 Subject: [PATCH 586/606] fix issues --- frontend/event/sharedEvent.component.js | 6 ++++++ frontend/event/shared_event.css | 4 ++++ frontend/event/shared_event_mobile.html | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/frontend/event/sharedEvent.component.js b/frontend/event/sharedEvent.component.js index 7bf2bcee2..d692f0112 100644 --- a/frontend/event/sharedEvent.component.js +++ b/frontend/event/sharedEvent.component.js @@ -3,6 +3,12 @@ const app = angular.module('app'); + /** + * Shared event mobile component + * + * @example + * + */ app.component('sharedEvent', { templateUrl: 'app/event/shared_event_mobile.html', controller: 'EventDetailsController', diff --git a/frontend/event/shared_event.css b/frontend/event/shared_event.css index bca3b409c..1b6286307 100644 --- a/frontend/event/shared_event.css +++ b/frontend/event/shared_event.css @@ -2,6 +2,10 @@ position: relative; } +.shared-event__image-container--canceled { + min-height: 100px; +} + .shared-event__image-container__img { width: 100%; background-color: white; diff --git a/frontend/event/shared_event_mobile.html b/frontend/event/shared_event_mobile.html index 3b6028ab8..7b4b4fe71 100644 --- a/frontend/event/shared_event_mobile.html +++ b/frontend/event/shared_event_mobile.html @@ -1,5 +1,5 @@
    -
    +
    From 3c48d79b61e8b591af3a4a8a863f7c22635d1098 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Thu, 14 Mar 2019 17:30:46 -0300 Subject: [PATCH 587/606] Moving functions to controller --- frontend/search/search.css | 4 ++++ frontend/search/searchController.js | 7 +++++++ frontend/search/search_event.html | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/frontend/search/search.css b/frontend/search/search.css index e5ee3ee3f..02c89daf3 100644 --- a/frontend/search/search.css +++ b/frontend/search/search.css @@ -172,4 +172,8 @@ .search-event-header { margin-top: 1.2em; +} + +.search-event-scroll { + overflow: scroll; } \ No newline at end of file diff --git a/frontend/search/searchController.js b/frontend/search/searchController.js index ae2571107..9ef036796 100644 --- a/frontend/search/searchController.js +++ b/frontend/search/searchController.js @@ -126,6 +126,13 @@ searchCtrl.isAnotherCountry = () => searchCtrl.searchCountry !== "Brasil"; + searchCtrl.closeSearchResult = () => { + searchCtrl.search_keyword = ''; + searchCtrl.hasNotSearched = true; + searchCtrl.clearFilters(); + searchCtrl.refreshPreviousKeyword(); + }; + /** * A simple function that works like a controller to the * search_dialog.html. diff --git a/frontend/search/search_event.html b/frontend/search/search_event.html index 589380b53..0a388b5da 100644 --- a/frontend/search/search_event.html +++ b/frontend/search/search_event.html @@ -4,11 +4,11 @@
    Pesquisa avançada + ng-click="searchCtrl.closeSearchResult()"> arrow_drop_down
    -
    +

    INSTITUIÇÃO

    Date: Thu, 14 Mar 2019 17:33:03 -0300 Subject: [PATCH 588/606] Changing controller to simple function --- frontend/event/eventCard.component.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/event/eventCard.component.js b/frontend/event/eventCard.component.js index d7f1a71d7..60b8e9e32 100644 --- a/frontend/event/eventCard.component.js +++ b/frontend/event/eventCard.component.js @@ -1,9 +1,8 @@ "use strict"; (function() { - const app = angular.module("app"); - app.controller("EventCardController", function EventCardController(AuthService) { + function EventCardController(AuthService) { const eventCardCtrl = this; eventCardCtrl.user = AuthService.getCurrentUser(); @@ -20,15 +19,16 @@ eventCardCtrl.$onInit = () => { const address = eventCardCtrl.event.address; - if (_.isString(address)) { + if (_.isString(address)) eventCardCtrl.event.address = JSON.parse(address); - } }; - }); + }; - app.component("eventCard", { + angular + .module("app") + .component("eventCard", { templateUrl: 'app/event/event_card.html', - controller: 'EventCardController', + controller: ['AuthService', EventCardController], controllerAs: 'eventCardCtrl', bindings: { event: '<', From 0a49a447560575a24574f948b3e69562db9048a8 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Thu, 14 Mar 2019 19:22:20 -0300 Subject: [PATCH 589/606] Counting working --- frontend/sw.js | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/frontend/sw.js b/frontend/sw.js index e0f7e8dbf..f828a8dde 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,9 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'dev'; + const CACHE_SUFIX = 'merging-push-notifications'; + + const openedNotifications = {}; let messaging; @@ -58,21 +60,25 @@ }; const body = JSON.parse(options.body); - options.body = body.data; + options.tag = body.type; + options.vibrate = [100, 50, 100]; + options.badge = options.icon; + + if(!openedNotifications[options.tag]) { + openedNotifications[options.tag] = 1; + } else { + openedNotifications[options.tag] +=1 + } + + options.body = `${body.data} (${openedNotifications[options.tag]})`; + + event.waitUntil(self.registration.showNotification(options.title, options)); } - options.vibrate = [100, 50, 100]; - options.badge = options.icon; - console.log(event.data.json()); - console.log(event.data.json().notification); - - console.log(options.tag); - self.registration.getNotifications().then(data => { - console.log(data); - }); - - event.waitUntil(self.registration.showNotification(options.title, options)); + + + }); /** @@ -85,11 +91,13 @@ const { notification } = event; const { action } = event; + if(action !== 'close') { const { url } = notification.data; clients.openWindow(url); } - + + openedNotifications[notification.tag] = 0; notification.close(); }); From 643a75efe7bc9e191c13aa009f46d920dbb4fe9c Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 15 Mar 2019 10:03:57 -0300 Subject: [PATCH 590/606] Add z-index: 10 to sidemenu --- frontend/styles/custom.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css index a9901f4ae..385434eda 100644 --- a/frontend/styles/custom.css +++ b/frontend/styles/custom.css @@ -1194,4 +1194,8 @@ md-input-container:not(.md-input-invalid).md-input-focused .green-input, #post-content > div { max-height: 100%; overflow-y: auto; -} \ No newline at end of file +} + +side-menu { + z-index: 10; +} From a48fbfbe1057c54dcde360ee516cf2483bfbfd02 Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 15 Mar 2019 11:05:09 -0300 Subject: [PATCH 591/606] Remove width and add justify-self to inst cover --- frontend/institution/registered_institution.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/registered_institution.css b/frontend/institution/registered_institution.css index 026a47f61..a51d78301 100644 --- a/frontend/institution/registered_institution.css +++ b/frontend/institution/registered_institution.css @@ -20,7 +20,7 @@ .registered-institution-cover div img { height: 5.5em; - width: 100%; + justify-self: center; } #registered-institution-img { From 458de334f81eab7d4de8e105341bc696a2bf43f0 Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 15 Mar 2019 11:15:28 -0300 Subject: [PATCH 592/606] Add white background to inst profile image --- frontend/institution/registered_institution.css | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/institution/registered_institution.css b/frontend/institution/registered_institution.css index a51d78301..476d699d8 100644 --- a/frontend/institution/registered_institution.css +++ b/frontend/institution/registered_institution.css @@ -36,6 +36,7 @@ height: 3em; width: 3em; border-radius: 50%; + background: white; } .registered-institution-content { From c94d17a78935089c5fd5fb3190afb71ce50a1446 Mon Sep 17 00:00:00 2001 From: ruanres Date: Fri, 15 Mar 2019 11:29:34 -0300 Subject: [PATCH 593/606] created dialog --- frontend/index.html | 1 + .../invites/inviteInstitutionController.js | 7 +- .../request_institution_processing_mobile.css | 97 +++++++++++++++++++ ...request_institution_processing_mobile.html | 49 ++++++++++ 4 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 frontend/requests/request_institution_processing_mobile.css create mode 100644 frontend/requests/request_institution_processing_mobile.html diff --git a/frontend/index.html b/frontend/index.html index c1cb045f5..a9ee2613f 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -86,6 +86,7 @@ + diff --git a/frontend/invites/inviteInstitutionController.js b/frontend/invites/inviteInstitutionController.js index cc52ac5fa..d730281bd 100644 --- a/frontend/invites/inviteInstitutionController.js +++ b/frontend/invites/inviteInstitutionController.js @@ -111,8 +111,13 @@ }; inviteInstCtrl.showPendingRequestDialog = function showPendingRequestDialog(event, request) { + const template = Utils.selectFieldBasedOnScreenSize( + "app/requests/request_institution_processing.html", + "app/requests/request_institution_processing_mobile.html", + SCREEN_SIZES.SMARTPHONE + ); $mdDialog.show({ - templateUrl: "app/requests/request_institution_processing.html", + templateUrl: template, controller: "RequestProcessingController", controllerAs: "requestCtrl", parent: angular.element(document.body), diff --git a/frontend/requests/request_institution_processing_mobile.css b/frontend/requests/request_institution_processing_mobile.css new file mode 100644 index 000000000..1a3d5195a --- /dev/null +++ b/frontend/requests/request_institution_processing_mobile.css @@ -0,0 +1,97 @@ +.pending-inst-request { + display: grid; + grid-row-gap: 1em; + padding: 1em; + max-width: 70%; + overflow-y: hidden; +} + +.pending-inst-request > .title { + font-size: 1.1em; + font-weight: 500; +} + +.pending-inst-request > .inst-data { + max-height: 20em; + background: white; + padding-right: 0.3em; + display: grid; + grid-template-columns: 1fr 1fr; + grid-template-rows: auto; + grid-template-areas: + 'name name' + 'actuation actuation' + 'nature nature' + 'country state' + 'street street' + 'neighbourhood number' + 'email email' + 'leader leader'; + align-items: initial; +} + +.inst-data p { + font-size: 0.7em; + font-weight: 500; + margin-bottom: 0.2em; + color: #004D40; +} + +.inst-data span { + font-size: 0.8em; + color: grey; +} + +.name_container { + grid-area: name; +} + +.name_container .name { + font-weight: 500; +} + +.actuation-containter { + grid-area: actuation; +} + +.nature-container { + grid-area: nature; +} + +.country-container { + grid-area: country; +} + +.state-container { + grid-area: state; +} + +.street-container { + grid-area: street; +} + +.neighbourhood-container { + grid-area: neighbourhood; +} + +.number-container { + grid-area: number; +} + +.email-container { + grid-area: email; +} + +.leader-container { + grid-area: leader; +} + +.pending-inst-request .btns-container { + text-align: end; + padding-top: 1em; +} + +.pending-inst-request .button { + color: #07988B; + margin: auto; +} diff --git a/frontend/requests/request_institution_processing_mobile.html b/frontend/requests/request_institution_processing_mobile.html new file mode 100644 index 000000000..41f3da548 --- /dev/null +++ b/frontend/requests/request_institution_processing_mobile.html @@ -0,0 +1,49 @@ + + Informações institucionais + +
    +

    Nome

    + {{ requestCtrl.parent.name }} +
    +
    +

    Áreas de Atuação

    + {{ requestCtrl.instActuationArea }} +
    +
    +

    Natureza Jurídica

    + {{ requestCtrl.instLegalNature }} +
    +
    +

    País

    + {{ requestCtrl.parent.address.country }} +
    +
    +

    Estado

    + {{ requestCtrl.parent.address.federal_state }} +
    +
    +

    Rua

    + {{ requestCtrl.parent.address.street }} +
    +
    +

    Bairro

    + {{ requestCtrl.parent.address.neighbourhood }} +
    +
    +

    Número

    + {{ requestCtrl.parent.address.number }} +
    + +
    +

    Responsável

    + {{ requestCtrl.parent.leader }} +
    +     +
    + RECUSAR + ACEITAR +
    +     \ No newline at end of file From ef8ae50fb37034bcda83a8d7d261b3de70a924fe Mon Sep 17 00:00:00 2001 From: MaianaB Date: Fri, 15 Mar 2019 12:09:57 -0300 Subject: [PATCH 594/606] Changed function getEvents according page --- frontend/event/event.css | 2 +- frontend/event/eventController.js | 25 +++++++++++++------- frontend/institution/institution_events.html | 3 ++- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/frontend/event/event.css b/frontend/event/event.css index 1da876404..f2d351e8e 100644 --- a/frontend/event/event.css +++ b/frontend/event/event.css @@ -144,7 +144,7 @@ } .centralized-event-content { - display: flex; + display: grid; justify-content: center; } diff --git a/frontend/event/eventController.js b/frontend/event/eventController.js index 2c81fd45d..83e82e915 100644 --- a/frontend/event/eventController.js +++ b/frontend/event/eventController.js @@ -21,12 +21,20 @@ eventCtrl.institutionsFilter = []; eventCtrl.loadMoreEvents = function loadMoreEvents() { - if (eventCtrl._moreEvents) { - const getEventsFunction = EventService.getEvents; - return eventCtrl._loadEvents(getEventsFunction, - _.get(eventCtrl.selectedMonth, 'month'), - eventCtrl.selectedYear); + const getEventsFunction = (eventCtrl.institutionKey) ? + EventService.getInstEvents : EventService.getEvents; + const params = (eventCtrl.institutionKey) ? + { + page: eventCtrl._actualPage, + institutionKey:eventCtrl.institutionKey + } : + { + page: eventCtrl._actualPage, + month: _.get(eventCtrl.selectedMonth, 'month'), + year: eventCtrl.selectedYear + }; + return eventCtrl._loadEvents(getEventsFunction, params); } return $q.when(); }; @@ -37,12 +45,11 @@ * Get events from backend * @param {*} deferred The promise to resolve before get events from backend * @param {*} getEvents The function received to call and get events - * @param {*} month The month to filter the get of events - * @param {*} year The year to filter the get of events + * @param {*} params The params used of service * @private */ - eventCtrl._loadEvents = (getEvents, month, year) => { - return getEvents({ page: eventCtrl._actualPage, month: month, year: year}) + eventCtrl._loadEvents = (getEvents, params) => { + return getEvents(params) .then(function success(response) { eventCtrl._actualPage += 1; eventCtrl._moreEvents = response.next; diff --git a/frontend/institution/institution_events.html b/frontend/institution/institution_events.html index daff1d888..a4925c4df 100644 --- a/frontend/institution/institution_events.html +++ b/frontend/institution/institution_events.html @@ -9,7 +9,8 @@

    Essa instituição não possui eventos.

    -
    +
    Date: Fri, 15 Mar 2019 12:40:24 -0300 Subject: [PATCH 595/606] set default prop value to address data --- frontend/requests/requestProcessingController.js | 2 ++ .../requests/request_institution_processing_mobile.html | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/requests/requestProcessingController.js b/frontend/requests/requestProcessingController.js index 5ef0e3fee..f1679a4cc 100644 --- a/frontend/requests/requestProcessingController.js +++ b/frontend/requests/requestProcessingController.js @@ -152,6 +152,8 @@ }); } + requestController.showProperty = prop => Utils.showProperty(prop); + (function main () { if(request.status == 'sent') loadInstitution(); })(); diff --git a/frontend/requests/request_institution_processing_mobile.html b/frontend/requests/request_institution_processing_mobile.html index 41f3da548..48a20f5e6 100644 --- a/frontend/requests/request_institution_processing_mobile.html +++ b/frontend/requests/request_institution_processing_mobile.html @@ -19,19 +19,19 @@

    Estado

    - {{ requestCtrl.parent.address.federal_state }} + {{ requestCtrl.showProperty(requestCtrl.parent.address.federal_state) }}

    Rua

    - {{ requestCtrl.parent.address.street }} + {{ requestCtrl.showProperty(requestCtrl.parent.address.street) }}

    Bairro

    - {{ requestCtrl.parent.address.neighbourhood }} + {{ requestCtrl.showProperty(requestCtrl.parent.address.neighbourhood) }}

    Número

    - {{ requestCtrl.parent.address.number }} + {{ requestCtrl.showProperty(requestCtrl.parent.address.number) }}
    - + RECUSAR @@ -51,18 +51,6 @@

    Informações institucionais

    APROVAR     - -

    Rejeitar Instituição

    -

    Tem certeza que deseja rejeitar?

    -     - - - CANCELAR - - - CONFIRMAR - -
    diff --git a/frontend/requests/request_institution_processing_mobile.html b/frontend/requests/request_institution_processing_mobile.html index 48a20f5e6..98f1400f2 100644 --- a/frontend/requests/request_institution_processing_mobile.html +++ b/frontend/requests/request_institution_processing_mobile.html @@ -43,7 +43,7 @@
    - RECUSAR - ACEITAR + RECUSAR + ACEITAR
    \ No newline at end of file From 4b48f2b001ebc489a96adf1b90f0bd71b6a56de8 Mon Sep 17 00:00:00 2001 From: ruanres Date: Fri, 15 Mar 2019 14:13:56 -0300 Subject: [PATCH 597/606] fixed tests --- .../invites/inviteInstitutionController.js | 4 +- .../inviteInstitutionControllerSpec.js | 40 ++++++++++++----- .../requestProcessingControllerSpec.js | 44 +++++++++++++++---- 3 files changed, 67 insertions(+), 21 deletions(-) diff --git a/frontend/invites/inviteInstitutionController.js b/frontend/invites/inviteInstitutionController.js index 62a1d3160..54d150a23 100644 --- a/frontend/invites/inviteInstitutionController.js +++ b/frontend/invites/inviteInstitutionController.js @@ -125,14 +125,14 @@ clickOutsideToClose:true, locals: { "request": request, - "updateRequest": updateRequest + "updateRequest": inviteInstCtrl._updateRequest }, openFrom: '#fab-new-post', closeTo: angular.element(document.querySelector('#fab-new-post')) }); }; - const updateRequest = (request, status) => { + inviteInstCtrl._updateRequest = (request, status) => { request.status = status; _.remove(inviteInstCtrl.sent_requests, (req) => request.key === req.key); } diff --git a/frontend/test/specs/invites/inviteInstitutionControllerSpec.js b/frontend/test/specs/invites/inviteInstitutionControllerSpec.js index 96f14b021..7674f884c 100644 --- a/frontend/test/specs/invites/inviteInstitutionControllerSpec.js +++ b/frontend/test/specs/invites/inviteInstitutionControllerSpec.js @@ -216,22 +216,42 @@ } }; }); - inviteinstitutionCtrl.sent_requests = [request]; inviteinstitutionCtrl.showPendingRequestDialog('$event', request); expect(mdDialog.show).toHaveBeenCalled(); - expect(request.status).toBe('accepted'); + }); + }); + + describe('updateRequest', () => { + beforeEach(() => { + inviteinstitutionCtrl.sent_requests = [request]; + }); + + afterEach(() => { expect(inviteinstitutionCtrl.sent_requests).toEqual([]); + }) + + it(`should set the request status to 'rejected' + and remove it from the requests sent`, () => { + inviteinstitutionCtrl._updateRequest(request, "rejected"); + expect(request.status).toBe('rejected'); + }); + + it(`should set the request status to 'accepted' + and remove it from the requests sent`, () => { + inviteinstitutionCtrl._updateRequest(request, "accepted"); + expect(request.status).toBe('accepted'); }); }); - }); - describe('$onInit', function () { - it('should call showLinkRequestDialog if in mobile screen', function () { - spyOn(inviteinstitutionCtrl, '_loadSentRequests'); - spyOn(inviteinstitutionCtrl, '_loadSentInvitations'); - inviteinstitutionCtrl.$onInit(); - expect(inviteinstitutionCtrl._loadSentRequests).toHaveBeenCalled(); - expect(inviteinstitutionCtrl._loadSentInvitations).toHaveBeenCalled(); + describe('$onInit', function () { + it('should call showLinkRequestDialog if in mobile screen', function () { + spyOn(inviteinstitutionCtrl, '_loadSentRequests'); + spyOn(inviteinstitutionCtrl, '_loadSentInvitations'); + inviteinstitutionCtrl.$onInit(); + expect(inviteinstitutionCtrl._loadSentRequests).toHaveBeenCalled(); + expect(inviteinstitutionCtrl._loadSentInvitations).toHaveBeenCalled(); + }); }); }); + })); \ No newline at end of file diff --git a/frontend/test/specs/request/requestProcessingControllerSpec.js b/frontend/test/specs/request/requestProcessingControllerSpec.js index d7230bb19..a9af64c26 100644 --- a/frontend/test/specs/request/requestProcessingControllerSpec.js +++ b/frontend/test/specs/request/requestProcessingControllerSpec.js @@ -19,8 +19,8 @@ "PRIVATE_COMPANY": "Empresa Privada", }; - var requestInvitationService, institutionService, requestCtrl, scope, httpBackend; - var authService, userService, messageService, request; + var requestInvitationService, institutionService, requestCtrl, scope, httpBackend, mdDialog; + var authService, userService, messageService, request, deferred; var newRequest = { key: 'request-key', @@ -56,6 +56,10 @@ } ]; + const updateRequest = (req, status) => { + req.status = status; + }; + function callFake() { return { then: function(calback) { @@ -66,8 +70,8 @@ beforeEach(module('app')); - beforeEach(inject(function($controller, $rootScope, $httpBackend, AuthService, - RequestInvitationService, InstitutionService, UserService, MessageService) { + beforeEach(inject(function($controller, $rootScope, $httpBackend, AuthService, $q, + RequestInvitationService, InstitutionService, UserService, MessageService, $mdDialog) { requestInvitationService = RequestInvitationService; institutionService = InstitutionService; @@ -76,6 +80,8 @@ httpBackend = $httpBackend; authService = AuthService; scope = $rootScope.$new(); + mdDialog = $mdDialog; + deferred = $q.defer(); AuthService.login(user); request = Object.assign({}, newRequest); @@ -91,7 +97,8 @@ AuthService: authService, UserService: UserService, MessageService: messageService, - request: request + request: request, + updateRequest: updateRequest }); httpBackend.flush(); @@ -164,10 +171,29 @@ describe('rejectRequest()', function() { - it('should set isRejecting to true', function() { - expect(requestCtrl.isRejecting).toBe(false); - requestCtrl.rejectRequest(); - expect(requestCtrl.isRejecting).toBe(true); + beforeEach(() => { + spyOn(mdDialog, 'confirm').and.callThrough(); + spyOn(mdDialog, 'show').and.returnValue(deferred.promise); + spyOn(requestCtrl, 'confirmReject'); + spyOn(requestCtrl, 'cancelReject'); + }); + + it('should confirm the dialog and call confirmReject', function() { + deferred.resolve(); + requestCtrl.rejectRequest({}); + scope.$apply(); + expect(mdDialog.confirm).toHaveBeenCalled(); + expect(mdDialog.show).toHaveBeenCalled(); + expect(requestCtrl.confirmReject).toHaveBeenCalled(); + }); + + it('should cancel the dialog and call cancelReject', function() { + deferred.reject(); + requestCtrl.rejectRequest({}); + scope.$apply(); + expect(mdDialog.confirm).toHaveBeenCalled(); + expect(mdDialog.show).toHaveBeenCalled(); + expect(requestCtrl.cancelReject).toHaveBeenCalled(); }); }); From 5dabb67826e99381c66013824b5cb0e70ca588ee Mon Sep 17 00:00:00 2001 From: MaianaB Date: Fri, 15 Mar 2019 15:06:14 -0300 Subject: [PATCH 598/606] fix tests --- frontend/event/event.css | 5 +++++ frontend/event/events_mobile.html | 2 +- frontend/institution/institution_events.html | 3 +-- frontend/test/specs/event/eventControllerSpec.js | 10 ++++++++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/frontend/event/event.css b/frontend/event/event.css index f2d351e8e..9c5ab4bd0 100644 --- a/frontend/event/event.css +++ b/frontend/event/event.css @@ -144,6 +144,11 @@ } .centralized-event-content { + display: flex; + justify-content: center; +} + +.centralized-event-content-grid { display: grid; justify-content: center; } diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index 550add828..75837878e 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -3,7 +3,7 @@
    -
    +
    Essa instituição não possui eventos.

    -
    +
    { spyOn(eventCtrl, '_loadEvents'); + const params = { + page: eventCtrl._actualPage, month: december, year: testYear + } eventCtrl.institutionKey = null; eventCtrl.loadMoreEvents(); expect(eventCtrl._loadEvents) - .toHaveBeenCalledWith(eventService.getEvents, december, testYear); + .toHaveBeenCalledWith(eventService.getEvents, params); }); it("Should call _loadEvents with eventService.getEvents when key isn't null", () => { spyOn(eventCtrl, '_loadEvents'); eventCtrl.institutionKey = institution.key; + const params = { + page: eventCtrl._actualPage, institutionKey: eventCtrl.institutionKey + } eventCtrl.loadMoreEvents(); expect(eventCtrl._loadEvents) - .toHaveBeenCalledWith(eventService.getEvents, december, testYear); + .toHaveBeenCalledWith(eventService.getInstEvents, params); }); }); From 74bfc733e76d52616b110227f7dfd509d4ceb364 Mon Sep 17 00:00:00 2001 From: MaianaB Date: Fri, 15 Mar 2019 15:30:35 -0300 Subject: [PATCH 599/606] create css class --- frontend/event/event.css | 3 +-- frontend/event/events_mobile.html | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/event/event.css b/frontend/event/event.css index 9c5ab4bd0..b6555e71a 100644 --- a/frontend/event/event.css +++ b/frontend/event/event.css @@ -148,9 +148,8 @@ justify-content: center; } -.centralized-event-content-grid { +.event-content-grid { display: grid; - justify-content: center; } #menu-button { diff --git a/frontend/event/events_mobile.html b/frontend/event/events_mobile.html index 75837878e..775f1006f 100644 --- a/frontend/event/events_mobile.html +++ b/frontend/event/events_mobile.html @@ -3,7 +3,7 @@
    -
    +
    Date: Fri, 15 Mar 2019 17:04:20 -0300 Subject: [PATCH 600/606] Moving search by event to other controller --- frontend/app.js | 4 +- frontend/index.html | 1 + frontend/search/searchController.js | 50 +----- frontend/search/searchEventController.js | 169 ++++++++++++++++++ frontend/search/search_event.html | 12 +- .../test/specs/search/searchControllerSpec.js | 1 - 6 files changed, 186 insertions(+), 51 deletions(-) create mode 100644 frontend/search/searchEventController.js diff --git a/frontend/app.js b/frontend/app.js index 880d2059f..62ab0b26f 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -63,11 +63,11 @@ } }) .state(STATES.SEARCH_EVENT, { - url: "/search_event/:search_keyword", + url: "/search_event", views: { user_content: { templateUrl: "app/search/search_event.html", - controller: "SearchController as searchCtrl" + controller: "SearchEventController as searchCtrl" } } }) diff --git a/frontend/index.html b/frontend/index.html index bd113bc7f..78338f421 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -302,6 +302,7 @@ + diff --git a/frontend/search/searchController.js b/frontend/search/searchController.js index 9ef036796..94ffdcf89 100644 --- a/frontend/search/searchController.js +++ b/frontend/search/searchController.js @@ -4,7 +4,7 @@ var app = angular.module('app'); app.controller("SearchController", function SearchController($state, InstitutionService, - brCidadesEstados, HttpService, $mdDialog, $window, STATES, AuthService, EventService) { + brCidadesEstados, HttpService, $mdDialog, $window, STATES, AuthService) { var searchCtrl = this; @@ -12,7 +12,6 @@ // This field allows the controller know when it has to go to the server to make the search. searchCtrl.previous_keyword = searchCtrl.search_keyword; searchCtrl.institutions = []; - searchCtrl.events = []; searchCtrl.actuationAreas = []; searchCtrl.legalNature = []; var actuationAreas; @@ -24,11 +23,10 @@ searchCtrl.makeSearch = function makeSearch(value, type) { searchCtrl.loading = false; - const valueOrKeyword = value ? value : (searchCtrl.search_keyword || ""); - let promise = type === "event" ? EventService.searchEvents(valueOrKeyword, "published", type) - : InstitutionService.searchInstitutions(valueOrKeyword, "active", type); + var valueOrKeyword = value ? value : (searchCtrl.search_keyword || ""); + var promise = InstitutionService.searchInstitutions(valueOrKeyword, "active", type); promise.then(function success(response) { - type === "event" ? searchCtrl.events = response : searchCtrl.institutions = response; + searchCtrl.institutions = response; searchCtrl.loading = true; searchCtrl.hasChanges = true; }); @@ -43,11 +41,7 @@ searchCtrl.searchActuation = ""; searchCtrl.searchNature = ""; searchCtrl.searchState = ""; - searchCtrl.searchDate = ""; - searchCtrl.searchCoutry = ""; - searchCtrl.searchCity = ""; searchCtrl.institutions = []; - searchCtrl.events = []; }; /** @@ -60,9 +54,9 @@ * @param {Event} ev : The event that is useful to deal with the mdDialog. * When the user isn't in a mobile its value is undefined. */ - searchCtrl.search = function search(ev, type) { + searchCtrl.search = function search(ev) { if (searchCtrl.search_keyword) { - let promise = searchCtrl.makeSearch(searchCtrl.search_keyword, type || 'institution'); + let promise = searchCtrl.makeSearch(searchCtrl.search_keyword, 'institution'); promise.then(() => { searchCtrl.setupResultsInMobile(); }); @@ -80,9 +74,9 @@ } }; - searchCtrl.searchBy = function searchBy(search, type) { + searchCtrl.searchBy = function searchBy(search) { if (keywordHasChanges()) { - searchCtrl.makeSearch(search, type || 'institution'); + searchCtrl.makeSearch(search, 'institution'); refreshPreviousKeyword(); } }; @@ -116,23 +110,6 @@ return Utils.isMobileScreen(); }; - /** - * Go to the page of a specific event - * @param {object} event - The current event - */ - searchCtrl.goToEvent = (event) => { - event.state !== 'deleted' && $state.go(STATES.EVENT_DETAILS, { eventKey: event.id }); - }; - - searchCtrl.isAnotherCountry = () => searchCtrl.searchCountry !== "Brasil"; - - searchCtrl.closeSearchResult = () => { - searchCtrl.search_keyword = ''; - searchCtrl.hasNotSearched = true; - searchCtrl.clearFilters(); - searchCtrl.refreshPreviousKeyword(); - }; - /** * A simple function that works like a controller to the * search_dialog.html. @@ -201,16 +178,6 @@ } } - function loadCountries() { - HttpService.get('app/institution/countries.json').then(function success(response) { - searchCtrl.countries = response; - }); - } - - searchCtrl.getCitiesByState = () => { - searchCtrl.cities = brCidadesEstados.buscarCidadesPorSigla(searchCtrl.searchState.sigla); - }; - function loadBrazilianFederalStates() { searchCtrl.brazilianFederalStates = brCidadesEstados.estados; } @@ -232,7 +199,6 @@ getLegalNatures(); loadSearch(); loadBrazilianFederalStates(); - loadCountries(); })(); }); })(); \ No newline at end of file diff --git a/frontend/search/searchEventController.js b/frontend/search/searchEventController.js new file mode 100644 index 000000000..0f1c488bf --- /dev/null +++ b/frontend/search/searchEventController.js @@ -0,0 +1,169 @@ +'use strict'; + +(function () { + var app = angular.module('app'); + + app.controller("SearchEventController", function SearchEventController(brCidadesEstados, HttpService, + $window, STATES, AuthService, EventService) { + + var searchCtrl = this; + + searchCtrl.search_keyword = ''; + searchCtrl.previous_keyword = searchCtrl.search_keyword; + searchCtrl.events = []; + searchCtrl.loading = false; + searchCtrl.hasChanges = false; + searchCtrl.hasNotSearched = true; + searchCtrl.user = AuthService.getCurrentUser(); + + searchCtrl.makeSearch = function makeSearch(value, type) { + searchCtrl.loading = false; + const valueOrKeyword = value ? value : (searchCtrl.search_keyword || ""); + let promise = EventService.searchEvents(valueOrKeyword, "published", type); + promise.then(function success(response) { + searchCtrl.events = response; + searchCtrl.loading = true; + searchCtrl.hasChanges = true; + }); + return promise; + }; + + searchCtrl.setHasChanges = () => { + searchCtrl.hasChanges = Boolean(searchCtrl.search_keyword); + }; + + searchCtrl.clearFilters = function clearFilters() { + searchCtrl.searchState = ""; + searchCtrl.searchDate = ""; + searchCtrl.searchCountry = ""; + searchCtrl.searchCity = ""; + searchCtrl.events = []; + }; + + /** + * First of all it checks if there is a search + * keyword before make the search to avoid unecessary requests. + * Then, make search is called and the result is stored in + * searchCtrl.institutions. If the user is using a mobile + * showSearchFromMobile is called to open a mdDialog with the + * search's result. + * @param {Event} ev : The event that is useful to deal with the mdDialog. + * When the user isn't in a mobile its value is undefined. + */ + searchCtrl.search = function search() { + if (searchCtrl.search_keyword) { + let promise = searchCtrl.makeSearch(searchCtrl.search_keyword, 'event'); + promise.then(() => { + searchCtrl.setupResultsInMobile(); + }); + refreshPreviousKeyword(); + return promise; + } else { + searchCtrl.setupResultsInMobile(); + } + }; + + searchCtrl.searchBy = function searchBy(search) { + if (keywordHasChanges()) { + searchCtrl.makeSearch(search, 'event'); + refreshPreviousKeyword(); + } + }; + + /** + * Change the title position and the flag that decides + * if the results gotta be shown or not. + */ + searchCtrl.setupResultsInMobile = () => { + if (searchCtrl.isMobileScreen()) { + const title = document.getElementById('search-title'); + if (title) { + title.style.marginTop = '1em'; + } + + searchCtrl.hasNotSearched = false; + } + }; + + /** + * Go back to the previous state. + */ + searchCtrl.leaveMobileSearchPage = () => { + $window.history.back(); + }; + + /** + * Check if the user is in a mobile or not. + */ + searchCtrl.isMobileScreen = () => { + return Utils.isMobileScreen(); + }; + + /** + * Go to the page of a specific event + * @param {object} event - The current event + */ + searchCtrl.goToEvent = (event) => { + event.state !== 'deleted' && $state.go(STATES.EVENT_DETAILS, { eventKey: event.id }); + }; + + searchCtrl.isAnotherCountry = () => searchCtrl.searchCountry !== "Brasil"; + + searchCtrl.closeSearchResult = () => { + searchCtrl.hasNotSearched = true; + searchCtrl.clearFilters(); + refreshPreviousKeyword(); + searchCtrl.search_keyword = ''; + }; + + /** + * This function verifies if there is any changes in the search_keyword. + * If it has changes, the search will be made in the server and the + * previous_keyword will be updated. Otherwise, the search is just a filtering + * in the controller's institutions field. + */ + function keywordHasChanges() { + var keywordHasChanged = searchCtrl.search_keyword !== searchCtrl.previous_keyword; + return _.isEmpty(searchCtrl.institutions) || keywordHasChanged || !searchCtrl.search_keyword; + } + + /** + * Refreshes the previous_keyword field. It is called + * when the controller goes to the server to make the search, + * in other words, when the search_keywords changes. + */ + function refreshPreviousKeyword() { + searchCtrl.previous_keyword = searchCtrl.search_keyword; + } + + searchCtrl.isLoading = function isLoading() { + return !searchCtrl.loading && searchCtrl.search_keyword; + }; + + function loadSearch() { + if (searchCtrl.search_keyword) { + searchCtrl.makeSearch(searchCtrl.search_keyword, 'institution'); + } + } + + function loadCountries() { + HttpService.get('app/institution/countries.json').then(function success(response) { + searchCtrl.countries = response; + }); + } + + searchCtrl.getCitiesByState = () => { + searchCtrl.cities = brCidadesEstados.buscarCidadesPorSigla(searchCtrl.searchState.sigla); + }; + + function loadBrazilianFederalStates() { + searchCtrl.brazilianFederalStates = brCidadesEstados.estados; + } + + (function main() { + loadSearch(); + loadBrazilianFederalStates(); + loadCountries(); + })(); + }); +})(); \ No newline at end of file diff --git a/frontend/search/search_event.html b/frontend/search/search_event.html index 0a388b5da..6e2a254c7 100644 --- a/frontend/search/search_event.html +++ b/frontend/search/search_event.html @@ -1,6 +1,6 @@ -
    +
    Pesquisa avançada + ng-change="searchCtrl.searchBy(searchCtrl.searchDate.toISOString().split('T')[0])"/> - + {{country.nome_pais}} @@ -31,7 +31,7 @@ + ng-click="searchCtrl.searchBy(state.nome)"> {{state.nome}} @@ -40,7 +40,7 @@ - + {{city}} @@ -50,7 +50,7 @@ CANCELAR - + PESQUISAR
    diff --git a/frontend/test/specs/search/searchControllerSpec.js b/frontend/test/specs/search/searchControllerSpec.js index a7b57e02e..23b8241ab 100644 --- a/frontend/test/specs/search/searchControllerSpec.js +++ b/frontend/test/specs/search/searchControllerSpec.js @@ -53,7 +53,6 @@ "PRIVATE_NON-PROFIT": "Privada sem fins lucrativos", "PUBLIC": "Pública" }); - httpBackend.expectGET('app/institution/countries.json').respond({}); httpBackend.when('GET', "main/main.html").respond(200); httpBackend.when('GET', "error/user_inactive.html").respond(200); httpBackend.when('GET', "home/home.html").respond(200); From 2ff991b8d602d8dec932aa8dc43fb03efe678328 Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Fri, 15 Mar 2019 17:17:11 -0300 Subject: [PATCH 601/606] Adding update to old events in updateHandler --- backend/admin.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backend/admin.py b/backend/admin.py index bceac5523..8deeeb0cc 100644 --- a/backend/admin.py +++ b/backend/admin.py @@ -575,6 +575,11 @@ def get(self): institution.creation_date = datetime.now() institution.put() + existing_events = Event.query().fetch() + + for event in existing_events: + event.put() + self.response.write("worked") From aeed371b9bc974a4bd329da54d8aaf02774115ab Mon Sep 17 00:00:00 2001 From: ruanres Date: Fri, 15 Mar 2019 17:37:46 -0300 Subject: [PATCH 602/606] increased the dialog height --- frontend/requests/request_institution_processing_mobile.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/requests/request_institution_processing_mobile.css b/frontend/requests/request_institution_processing_mobile.css index 1a3d5195a..556cd070b 100644 --- a/frontend/requests/request_institution_processing_mobile.css +++ b/frontend/requests/request_institution_processing_mobile.css @@ -1,6 +1,5 @@ .pending-inst-request { display: grid; - grid-row-gap: 1em; padding: 1em; max-width: 70%; overflow-y: hidden; @@ -12,7 +11,6 @@ } .pending-inst-request > .inst-data { - max-height: 20em; background: white; padding-right: 0.3em; display: grid; @@ -88,7 +86,7 @@ .pending-inst-request .btns-container { text-align: end; - padding-top: 1em; + padding-top: 0.3em; } .pending-inst-request .button { From c458ef62986f2695bc0d4cef61cc83af1171c4bd Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Sat, 16 Mar 2019 10:48:55 -0300 Subject: [PATCH 603/606] fixing tests --- .../push_notification_service_test.py | 16 ++++++++-------- frontend/sw.js | 10 +++------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/backend/test/util_modules_tests/push_notification_service_test.py b/backend/test/util_modules_tests/push_notification_service_test.py index 88cfeea04..de24b6079 100644 --- a/backend/test/util_modules_tests/push_notification_service_test.py +++ b/backend/test/util_modules_tests/push_notification_service_test.py @@ -33,8 +33,8 @@ def test_like_post_notification(self): self.assertEqual(notification_props['title'], 'Publicação curtida', "The notification's title wasn't the expected one") self.assertEqual( - notification_props['body'], 'Uma publicação de seu interesse foi curtida', - "The notification's body wasn't the expected one") + notification_props['body_message'], 'Uma publicação de seu interesse foi curtida', + "The notification's body_message wasn't the expected one") self.assertEqual(notification_props['click_action'], url, "The click_action's url wasn't the expected one") @@ -61,8 +61,8 @@ def test_comment_notification(self): self.assertEqual(notification_props['title'], 'Publicação comentada', "The notification's title wasn't the expected one") self.assertEqual( - notification_props['body'], 'Uma publicação do seu interesse foi comentada', - "The notification's body wasn't the expected one") + notification_props['body_message'], 'Uma publicação do seu interesse foi comentada', + "The notification's body_message wasn't the expected one") self.assertEqual(notification_props['click_action'], url, "The click_action wasn't the expected one") @@ -88,9 +88,9 @@ def test_invite_user_notification(self): self.assertEqual(notification_props['title'], 'Novo convite', "The notification's title wasn't the expected one") - self.assertEqual(notification_props['body'], + self.assertEqual(notification_props['body_message'], 'Você recebeu um novo convite para ser membro de uma instituição', - "The notification's body wasn't the expected one") + "The notification's body_message wasn't the expected one") self.assertEqual(notification_props['click_action'], url, "The click_action wasn't the expected one") @@ -103,8 +103,8 @@ def test_invite_user_adm_notification(self): self.assertEqual(notification_props['title'], 'Novo convite', "The notification's title wasn't the expected one") - self.assertEqual(notification_props['body'], + self.assertEqual(notification_props['body_message'], 'Você recebeu um novo convite para ser administrador de uma instituição', - "The notification's body wasn't the expected one") + "The notification's body_message wasn't the expected one") self.assertEqual(notification_props['click_action'], url, "The click_action wasn't the expected one") diff --git a/frontend/sw.js b/frontend/sw.js index f828a8dde..8ac468170 100644 --- a/frontend/sw.js +++ b/frontend/sw.js @@ -7,7 +7,7 @@ importScripts('app/firebase-config.js'); importScripts('app/config.js'); // if the line number of the code below changes, modify the /ecis script. - const CACHE_SUFIX = 'merging-push-notifications'; + const CACHE_SUFIX = 'master'; const openedNotifications = {}; @@ -74,11 +74,7 @@ options.body = `${body.data} (${openedNotifications[options.tag]})`; event.waitUntil(self.registration.showNotification(options.title, options)); - } - - - - + } }); /** @@ -91,7 +87,7 @@ const { notification } = event; const { action } = event; - + if(action !== 'close') { const { url } = notification.data; clients.openWindow(url); From 0336f3355cc859aab26337dd84089618974ad686 Mon Sep 17 00:00:00 2001 From: Raoni Smaneoto Date: Sat, 16 Mar 2019 14:41:16 -0300 Subject: [PATCH 604/606] creating tests --- .../push_notification_service_test.py | 183 ++++++++++++++++++ 1 file changed, 183 insertions(+) diff --git a/backend/test/util_modules_tests/push_notification_service_test.py b/backend/test/util_modules_tests/push_notification_service_test.py index de24b6079..d79165429 100644 --- a/backend/test/util_modules_tests/push_notification_service_test.py +++ b/backend/test/util_modules_tests/push_notification_service_test.py @@ -20,7 +20,10 @@ def setUp(cls): cls.test.init_memcache_stub() cls.f_user = mocks.create_user() cls.inst = mocks.create_institution() + cls.inst.admin = cls.f_user.key + cls.inst.put() cls.post = mocks.create_post(cls.f_user.key, cls.inst.key) + cls.event = mocks.create_event(cls.f_user, cls.inst) def test_like_post_notification(self): @@ -108,3 +111,183 @@ def test_invite_user_adm_notification(self): "The notification's body_message wasn't the expected one") self.assertEqual(notification_props['click_action'], url, "The click_action wasn't the expected one") + + def test_link_notification(self): + """Test if the properties for LINK + notification are the expected.""" + url = "/institution/%s/inviteInstitution" % self.inst.key.urlsafe() + + notification_props = get_notification_props(NotificationType('LINK'), self.inst) + + self.assertEqual(notification_props['title'], 'Solicitação de vínculo', + "The notification's title wasn't the expected one") + self.assertEqual(notification_props['body_message'], + 'Uma instituição que você administra recebeu uma nova solicitação de vínculo', + "The notification's body_message wasn't the expected one") + self.assertEqual(notification_props['click_action'], url, + "The click_action wasn't the expected one") + + def test_delete_member_notification(self): + """Test if the properties for DELETE_MEMBER + notification are the expected.""" + url = '/institution/%s/home' %self.inst.key.urlsafe() + + notification_props = get_notification_props(NotificationType('DELETE_MEMBER'), self.inst) + + self.assertEqual(notification_props['title'], 'Remoção de vínculo', + "The notification's title wasn't the expected one") + self.assertEqual(notification_props['body_message'], + 'Você foi removido da instituição %s' %self.inst.name, + "The notification's body_message wasn't the expected one") + self.assertEqual(notification_props['click_action'], url, + "The click_action wasn't the expected one") + + def test_remove_inst_link_notification(self): + """Test if the properties for REMOVE_INSTITUTION_LINK + notification are the expected.""" + url = '/institution/%s/inviteInstitution' %self.inst.key.urlsafe() + + notification_props = get_notification_props(NotificationType('REMOVE_INSTITUTION_LINK'), self.inst) + + self.assertEqual(notification_props['title'], 'Remoção de vínculo', + "The notification's title wasn't the expected one") + self.assertEqual(notification_props['body_message'], + 'A instituição %s teve um de seus vínculos removidos' %self.inst.name, + "The notification's body_message wasn't the expected one") + self.assertEqual(notification_props['click_action'], url, + "The click_action wasn't the expected one") + + def test_create_post_notification(self): + """Test if the properties for CREATE_POST + notification are the expected.""" + url = '/posts/%s' %self.post.key.urlsafe() + + notification_props = get_notification_props(NotificationType('CREATE_POST'), self.post) + + self.assertEqual(notification_props['title'], 'Novo post criado', + "The notification's title wasn't the expected one") + self.assertEqual(notification_props['body_message'], + '%s criou um novo post' %self.post.author.urlsafe(), + "The notification's body_message wasn't the expected one") + self.assertEqual(notification_props['click_action'], url, + "The click_action wasn't the expected one") + + def test_delete_post_notification(self): + """Test if the properties for DELETE_POST + notification are the expected.""" + url = "/" + + notification_props = get_notification_props(NotificationType('DELETE_POST'), self.post) + + self.assertEqual(notification_props['title'], 'Post deletado', + "The notification's title wasn't the expected one") + self.assertEqual(notification_props['body_message'], + '%s deletou seu post' %self.f_user.name, + "The notification's body_message wasn't the expected one") + self.assertEqual(notification_props['click_action'], url, + "The click_action wasn't the expected one") + + def test_reply_comment_notification(self): + """Test if the properties for REPLY_COMMENT + notification are the expected.""" + url = '/posts/%s' %self.post.key.urlsafe() + + notification_props = get_notification_props(NotificationType('REPLY_COMMENT'), self.post) + + self.assertEqual(notification_props['title'], 'Novo comentário', + "The notification's title wasn't the expected one") + self.assertEqual(notification_props['body_message'], + 'Seu comentário tem uma nova resposta', + "The notification's body_message wasn't the expected one") + self.assertEqual(notification_props['click_action'], url, + "The click_action wasn't the expected one") + + def test_deleted_user_notification(self): + """Test if the properties for DELETED_USER + notification are the expected.""" + url = "/" + + notification_props = get_notification_props(NotificationType('DELETED_USER'), self.f_user) + + self.assertEqual(notification_props['title'], 'Usuário inativo', + "The notification's title wasn't the expected one") + self.assertEqual(notification_props['body_message'], + '%s não está mais ativo na plataforma' %self.f_user.name, + "The notification's body_message wasn't the expected one") + self.assertEqual(notification_props['click_action'], url, + "The click_action wasn't the expected one") + + def test_left_institution_notification(self): + """Test if the properties for LEFT_INSTITUTION + notification are the expected.""" + url = "/" + + notification_props = get_notification_props(NotificationType('LEFT_INSTITUTION'), self.f_user) + + self.assertEqual(notification_props['title'], 'Remoção de vínculo de membro', + "The notification's title wasn't the expected one") + self.assertEqual(notification_props['body_message'], + '%s removeu o vínculo com uma das instituições que você administra' %self.f_user.name, + "The notification's body_message wasn't the expected one") + self.assertEqual(notification_props['click_action'], url, + "The click_action wasn't the expected one") + + def test_invite_notification(self): + """Test if the properties for INVITE + notification are the expected.""" + url = '%s/new_invite' %self.inst.key.urlsafe() + + notification_props = get_notification_props(NotificationType('INVITE'), self.inst) + + self.assertEqual(notification_props['title'], 'Novo convite', + "The notification's title wasn't the expected one") + self.assertEqual(notification_props['body_message'], + 'Você tem um novo convite', + "The notification's body_message wasn't the expected one") + self.assertEqual(notification_props['click_action'], url, + "The click_action wasn't the expected one") + + def test_deleted_institution_notification(self): + """Test if the properties for DELETED_INSTITUTION + notification are the expected.""" + url = "/" + + notification_props = get_notification_props(NotificationType('DELETED_INSTITUTION'), self.inst) + + self.assertEqual(notification_props['title'], 'Instituição removida', + "The notification's title wasn't the expected one") + self.assertEqual(notification_props['body_message'], + 'A instituição %s foi removida' %self.inst.name, + "The notification's body_message wasn't the expected one") + self.assertEqual(notification_props['click_action'], url, + "The click_action wasn't the expected one") + + def test_deleted_event_notification(self): + """Test if the properties for DELETED_EVENT + notification are the expected.""" + url = "/" + + notification_props = get_notification_props(NotificationType('DELETED_EVENT'), self.event) + + self.assertEqual(notification_props['title'], 'Evento removido', + "The notification's title wasn't the expected one") + self.assertEqual(notification_props['body_message'], + 'O evento %s foi removido' %self.event.title, + "The notification's body_message wasn't the expected one") + self.assertEqual(notification_props['click_action'], url, + "The click_action wasn't the expected one") + + def test_updated_event_notification(self): + """Test if the properties for UPDATED_EVENT + notification are the expected.""" + url = '/event/%s/details' %self.event.key.urlsafe() + + notification_props = get_notification_props(NotificationType('UPDATED_EVENT'), self.event) + + self.assertEqual(notification_props['title'], 'Evento editado', + "The notification's title wasn't the expected one") + self.assertEqual(notification_props['body_message'], + 'O evento %s foi editado' %self.event.title, + "The notification's body_message wasn't the expected one") + self.assertEqual(notification_props['click_action'], url, + "The click_action wasn't the expected one") From 0cdb7e6bbc8fcf38e1d534615702381218bb0a61 Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 18 Mar 2019 07:23:33 -0300 Subject: [PATCH 605/606] Fix typo on "ja se encontra" --- frontend/institution/createInvitedInstitutionController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/institution/createInvitedInstitutionController.js b/frontend/institution/createInvitedInstitutionController.js index c5206bee8..6cdaca390 100644 --- a/frontend/institution/createInvitedInstitutionController.js +++ b/frontend/institution/createInvitedInstitutionController.js @@ -185,7 +185,7 @@ const message = _.isEqual(ctrl.invite.type_of_invite, 'INSTITUTION_PARENT') ? 'Estamos processando suas permissões hierárquicas. Em breve você receberá uma notificação e ficará habilitado para administrar a instituição e toda sua hierarquia na Plataforma Virtual CIS.' : - 'A instituição foi criada e ja se encontra habilitada na Plataforma Virtual CIS.' + 'A instituição foi criada e já se encontra habilitada na Plataforma Virtual CIS.' return AuthService.reload().then(() => { return $state.go(STATES.HOME).then(() => { From fbfbd2c5baba69cfa2d4b45e8539a4d5592c368c Mon Sep 17 00:00:00 2001 From: tiagolimpe Date: Mon, 18 Mar 2019 16:14:43 -0300 Subject: [PATCH 606/606] Moving function to inside of promise --- frontend/search/searchEventController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/search/searchEventController.js b/frontend/search/searchEventController.js index 0f1c488bf..670010c24 100644 --- a/frontend/search/searchEventController.js +++ b/frontend/search/searchEventController.js @@ -55,8 +55,8 @@ let promise = searchCtrl.makeSearch(searchCtrl.search_keyword, 'event'); promise.then(() => { searchCtrl.setupResultsInMobile(); + refreshPreviousKeyword(); }); - refreshPreviousKeyword(); return promise; } else { searchCtrl.setupResultsInMobile();