diff --git a/wscacicneo/templates/master.pt b/wscacicneo/templates/master.pt index 4840529..67b59a5 100755 --- a/wscacicneo/templates/master.pt +++ b/wscacicneo/templates/master.pt @@ -7,6 +7,7 @@ + @@ -96,7 +97,12 @@
-

Você está em: ${request.path}

+

+   +

+

+ Você está em: ${request.path} +

@@ -124,5 +130,14 @@ + + + + diff --git a/wscacicneo/utils/utils.py b/wscacicneo/utils/utils.py index 73e1ecb..e8d2be0 100755 --- a/wscacicneo/utils/utils.py +++ b/wscacicneo/utils/utils.py @@ -1,5 +1,6 @@ import requests import json +import unicodedata from wscacicneo.model.orgao import Orgao from wscacicneo.model.orgao import OrgaoBase @@ -12,9 +13,15 @@ class Utils: def to_url(*args): return '/'.join(list(args)) + # Retorna verdadeiro para um email passado no qual contenha um e-mail institucional + # no caso, quando o e-mail tiver gov.br def verifica_email_institucional(email): if("gov.br" in email): return True else: return False + # Retorna uma string sem caracteres especiais(sem espaço e acentos). + def format_name(data): + return ''.join(x for x in unicodedata.normalize('NFKD', data) if \ + unicodedata.category(x)[0] == 'L').lower() \ No newline at end of file diff --git a/wscacicneo/views.py b/wscacicneo/views.py index 589e077..3f38fa2 100755 --- a/wscacicneo/views.py +++ b/wscacicneo/views.py @@ -89,7 +89,7 @@ def post_notify(request): def orgao(request): return {'project': 'WSCacicNeo'} -@view_config(route_name='listorgao', renderer='templates/list_orgao.pt', permission="user") +@view_config(route_name='listorgao', renderer='templates/list_orgao.pt', permission="admin") def listorgao(request): orgao_obj = Orgao( nome = 'sahuds', @@ -282,7 +282,7 @@ def edit_favoritos(request): # Reports @view_config(route_name='create_orgao',permission="admin") def create_base(request): - nm_orgao = request.matchdict['nm_orgao'] + nm_orgao = Utils.format_name(request.matchdict['nm_orgao']) coletaManualBase = coleta_manual.ColetaManualBase(nm_orgao) lbbase = coletaManualBase.lbbase retorno = coletaManualBase.create_base() @@ -306,7 +306,7 @@ def conf_report(request): @view_config(route_name='report_itens', renderer='templates/report.pt', permission="admin") def report_itens(request): - nm_orgao = request.matchdict['nm_orgao'] + nm_orgao = Utils.format_name(request.matchdict['nm_orgao']) attr = request.matchdict['attr'] child = request.matchdict['child'] data = Reports(nm_orgao).count_attribute(attr, child) -- libgit2 0.21.2