Commit 0dda9506ad5dff42a03873dcae67f7ce09538876
Exists in
master
Merge branch 'master' of https://github.com/lightbase/WSCacicNeo
Showing
4 changed files
with
33 additions
and
21 deletions
Show diff stats
27 KB
7.06 KB
wscacicneo/utils/utils.py
wscacicneo/views.py
| ... | ... | @@ -9,6 +9,7 @@ from .models import ( |
| 9 | 9 | DBSession, |
| 10 | 10 | SistemaOperacional, |
| 11 | 11 | ) |
| 12 | +from wscacicneo.utils.utils import Utils | |
| 12 | 13 | from wscacicneo.model.orgao import Orgao |
| 13 | 14 | from wscacicneo.model.orgao import OrgaoBase |
| 14 | 15 | from wscacicneo.model.user import User |
| ... | ... | @@ -328,27 +329,32 @@ def post_user(request): |
| 328 | 329 | rest_url = REST_URL |
| 329 | 330 | userbase = UserBase().lbbase |
| 330 | 331 | doc = request.params |
| 331 | - document = doc['favoritos'] | |
| 332 | - favoritos = [document] | |
| 333 | - itens = [doc['lista_orgao'], doc['cadastro_orgao'], doc['lista_user'], doc['cadastro_user'], doc['relatorios'], doc['coleta'], doc['notify']] | |
| 334 | - user_obj = User( | |
| 335 | - nome = doc['nome'], | |
| 336 | - matricula = doc['matricula'], | |
| 337 | - email = doc['email'], | |
| 338 | - orgao = doc['orgao'], | |
| 339 | - telefone = doc['telefone'], | |
| 340 | - cargo = doc['cargo'], | |
| 341 | - setor = doc['setor'], | |
| 342 | - permissao = doc['permissao'], | |
| 343 | - senha = doc['senha'], | |
| 344 | - favoritos = favoritos, | |
| 345 | - itens = itens | |
| 346 | - ) | |
| 347 | - print(user_obj) | |
| 348 | - id_doc = user_obj.create_user() | |
| 349 | - print(id_doc) | |
| 350 | - | |
| 351 | - return Response(str(id_doc)) | |
| 332 | + email_user = doc['email'] | |
| 333 | + email_is_institucional = Utils.verifica_email_institucional(email_user) | |
| 334 | + if(email_is_institucional): | |
| 335 | + document = doc['favoritos'] | |
| 336 | + favoritos = [document] | |
| 337 | + itens = [doc['lista_orgao'], doc['cadastro_orgao'], doc['lista_user'], doc['cadastro_user'], doc['relatorios'], doc['coleta'], doc['notify']] | |
| 338 | + user_obj = User( | |
| 339 | + nome = doc['nome'], | |
| 340 | + matricula = doc['matricula'], | |
| 341 | + email = doc['email'], | |
| 342 | + orgao = doc['orgao'], | |
| 343 | + telefone = doc['telefone'], | |
| 344 | + cargo = doc['cargo'], | |
| 345 | + setor = doc['setor'], | |
| 346 | + permissao = doc['permissao'], | |
| 347 | + senha = doc['senha'], | |
| 348 | + favoritos = favoritos, | |
| 349 | + itens = itens | |
| 350 | + ) | |
| 351 | + print(user_obj) | |
| 352 | + id_doc = user_obj.create_user() | |
| 353 | + print(id_doc) | |
| 354 | + | |
| 355 | + return Response(str(id_doc)) | |
| 356 | + else: | |
| 357 | + return {"yololo":"yololo"} | |
| 352 | 358 | |
| 353 | 359 | @view_config(route_name='edituser', renderer='templates/editaruser.pt') |
| 354 | 360 | def edituser(request): | ... | ... |