diff --git a/wscacicneo/__init__.py b/wscacicneo/__init__.py
index 17279c2..e76df07 100644
--- a/wscacicneo/__init__.py
+++ b/wscacicneo/__init__.py
@@ -52,6 +52,7 @@ def main(global_config, **settings):
config.add_route('put_user', 'put_user')
config.add_route('edituser', 'usuario/editar/{matricula}')
config.add_route('favoritos', 'usuario/favoritos/{matricula}')
+ config.add_route('edit_favoritos', 'edit_favoritos')
config.add_route('listuser', 'usuario/lista')
config.add_route('delete_user', 'usuario/delete/{matricula}')
#
diff --git a/wscacicneo/model/user.py b/wscacicneo/model/user.py
index a0386f4..64a7cf7 100644
--- a/wscacicneo/model/user.py
+++ b/wscacicneo/model/user.py
@@ -133,6 +133,15 @@ class UserBase(WSCacicNeo):
multivalued=True,
required=False
))
+ itens = Field(**dict(
+ name='itens',
+ alias='itens',
+ description='Itens do Usuário',
+ datatype='Text',
+ indices=['Textual'],
+ multivalued=True,
+ required=False
+ ))
base_metadata = BaseMetadata(
name='users',
@@ -149,6 +158,7 @@ class UserBase(WSCacicNeo):
content_list.append(permissao)
content_list.append(senha)
content_list.append(favoritos)
+ content_list.append(itens)
lbbase = Base(
metadata=base_metadata,
@@ -252,7 +262,15 @@ class User(user_base.metaclass):
return results
- def edit_user(self, id, doc):
+ def create_favoritos(self, id, path, value):
+ """
+ altera um doc ou path do doc
+ """
+ results = self.documentrest.create_path(id, path, value)
+
+ return results
+
+ def edit_user(self, id, value):
"""
altera um doc ou path do doc
"""
diff --git a/wscacicneo/templates/favoritos.pt b/wscacicneo/templates/favoritos.pt
index be60247..7a50293 100644
--- a/wscacicneo/templates/favoritos.pt
+++ b/wscacicneo/templates/favoritos.pt
@@ -5,41 +5,19 @@
@@ -60,7 +38,7 @@
@@ -69,9 +47,38 @@
+
diff --git a/wscacicneo/templates/list_orgao.pt b/wscacicneo/templates/list_orgao.pt
index 7747eea..e887720 100644
--- a/wscacicneo/templates/list_orgao.pt
+++ b/wscacicneo/templates/list_orgao.pt
@@ -58,7 +58,6 @@
diff --git a/wscacicneo/templates/orgao.pt b/wscacicneo/templates/orgao.pt
index 7bf00ef..7d568f9 100644
--- a/wscacicneo/templates/orgao.pt
+++ b/wscacicneo/templates/orgao.pt
@@ -75,7 +75,7 @@
}
$.ajax({
type: "POST",
- url: "post_orgao",
+ url: "${request.route_url('root')}post_orgao",
data: data,
success: function(){ alert('aaaaaaaaaaaaaaaaaaaaaa') },
error: function(){ alert('ooooooooooooooooooooooooo') },
diff --git a/wscacicneo/templates/user.pt b/wscacicneo/templates/user.pt
index dcfbb0d..e5e42a3 100644
--- a/wscacicneo/templates/user.pt
+++ b/wscacicneo/templates/user.pt
@@ -102,7 +102,14 @@
'setor' : $('#setor').val(),
'permissao' : $('#permissao').val(),
'senha' : $('#senha').val(),
- 'favoritos': 'Relatórios'
+ 'favoritos': 'Relatórios',
+ 'cadastro_orgao': 'Cadastro de Órgãos',
+ 'lista_orgao': 'Lista de Órgãos',
+ 'cadastro_user': 'Cadastro de Usuario',
+ 'lista_user': 'Lista de Usuarios',
+ 'relatorios': 'Relatorios',
+ 'coleta': 'Questionar Coleta',
+ 'notify': 'Notificações'
}
if (data.email.indexOf("gov.br") > -1 == false){
setTimeout(function() {noty({text: 'O e-mail tem que ser institucional',layout:'topRight',type:'error',timeout:5000});}, 100);
diff --git a/wscacicneo/views.py b/wscacicneo/views.py
index ebe5197..676be67 100644
--- a/wscacicneo/views.py
+++ b/wscacicneo/views.py
@@ -119,7 +119,10 @@ def favoritos(request):
)
search = user_obj.search_user(matricula)
favoritos = search.results[0].favoritos
- return {'favoritos': favoritos }
+ return {
+ 'favoritos': search.results[0].favoritos,
+ 'itens': search.results[0].itens
+ }
@view_config(route_name='config', renderer='templates/config.pt')
def config(request):
@@ -318,7 +321,7 @@ def post_user(request):
doc = request.params
document = doc['favoritos']
favoritos = [document]
- print(type(favoritos))
+ itens = [doc['lista_orgao'], doc['cadastro_orgao'], doc['lista_user'], doc['cadastro_user'], doc['relatorios'], doc['coleta'], doc['notify']]
user_obj = User(
nome = doc['nome'],
matricula = doc['matricula'],
@@ -329,7 +332,8 @@ def post_user(request):
setor = doc['setor'],
permissao = doc['permissao'],
senha = doc['senha'],
- favoritos = favoritos
+ favoritos = favoritos,
+ itens = itens
)
print(user_obj)
id_doc = user_obj.create_user()
@@ -440,3 +444,30 @@ def delete_user(request):
id = search.results[0]._metadata.id_doc
delete = user_obj.delete_user(id)
return Response(delete)
+
+@view_config(route_name='edit_favoritos')
+def edit_favoritos(request):
+ """
+ Editar do Favoritos
+ """
+ doc = request.params
+ value = doc['value']
+ matricula = doc['matricula']
+ path = [doc['path']]
+ user_obj = User(
+ nome = 'asdasd',
+ matricula = 'asdasd',
+ email = 'asdsad',
+ orgao = 'asdsad',
+ telefone = 'sdasd',
+ cargo = 'asdasdasd',
+ setor = 'asdasd',
+ permissao = 'asdasd',
+ senha = 'sadasdasd',
+ favoritos = ['asdasdasdasd']
+ )
+ search = user_obj.search_user(matricula)
+ id = search.results[0]._metadata.id_doc
+ update= user_obj.create_favoritos(id, path, value)
+
+ return Response(update)
--
libgit2 0.21.2