Commit e16fea426437bc15775ebea65c2672382a352114
1 parent
0b6ec00a
Exists in
master
cadastro de órgãos
Showing
5 changed files
with
11 additions
and
19 deletions
Show diff stats
wscacicneo/model/orgao.py
@@ -95,17 +95,9 @@ class OrgaoBase(WSCacicNeo): | @@ -95,17 +95,9 @@ class OrgaoBase(WSCacicNeo): | ||
95 | required=True | 95 | required=True |
96 | )) | 96 | )) |
97 | 97 | ||
98 | - base_metadata = BaseMetadata(**dict( | 98 | + base_metadata = BaseMetadata( |
99 | name='orgaos', | 99 | name='orgaos', |
100 | - description='Órgãos da administração pública', | ||
101 | - password='123456', | ||
102 | - idx_exp=False, | ||
103 | - idx_exp_url='index_url', | ||
104 | - idx_exp_time=300, | ||
105 | - file_ext=True, | ||
106 | - file_ext_time=300, | ||
107 | - color='#FFFFFF' | ||
108 | - )) | 100 | + ) |
109 | 101 | ||
110 | content_list = Content() | 102 | content_list = Content() |
111 | content_list.append(nome) | 103 | content_list.append(nome) |
@@ -153,12 +145,12 @@ class OrgaoBase(WSCacicNeo): | @@ -153,12 +145,12 @@ class OrgaoBase(WSCacicNeo): | ||
153 | else: | 145 | else: |
154 | raise IOError('Error excluding base from LB') | 146 | raise IOError('Error excluding base from LB') |
155 | 147 | ||
156 | -orgao = OrgaoBase().metaclass | 148 | +OrgaoMetaClass = OrgaoBase().metaclass |
157 | 149 | ||
158 | 150 | ||
159 | -class Orgao(orgao): | 151 | +class Orgao(OrgaoMetaClass): |
160 | """ | 152 | """ |
161 | Classe genérica de órgãos | 153 | Classe genérica de órgãos |
162 | """ | 154 | """ |
163 | def __init__(self, **args): | 155 | def __init__(self, **args): |
164 | - super(Orgao, self).__init__(**args) | ||
165 | \ No newline at end of file | 156 | \ No newline at end of file |
157 | + super(Orgao, self).__init__(**args) |
wscacicneo/static/js/orgao.js
@@ -97,7 +97,7 @@ Ext.onReady(function(){ | @@ -97,7 +97,7 @@ Ext.onReady(function(){ | ||
97 | $('#button-1017-btnIconEl').click(function(){ | 97 | $('#button-1017-btnIconEl').click(function(){ |
98 | var nome = $('#textfield-1010-inputEl').val() | 98 | var nome = $('#textfield-1010-inputEl').val() |
99 | sigla = $('#textfield-1011-inputEl').val() | 99 | sigla = $('#textfield-1011-inputEl').val() |
100 | - gestor = $('#textfield-1012-inputEl').val() | 100 | + cargo = $('#textfield-1012-inputEl').val() |
101 | telefone = $('#textfield-1013-inputEl').val() | 101 | telefone = $('#textfield-1013-inputEl').val() |
102 | email = $('#textfield-1014-inputEl').val() | 102 | email = $('#textfield-1014-inputEl').val() |
103 | end = $('#textfield-1015-inputEl').val() | 103 | end = $('#textfield-1015-inputEl').val() |
@@ -105,7 +105,7 @@ $('#button-1017-btnIconEl').click(function(){ | @@ -105,7 +105,7 @@ $('#button-1017-btnIconEl').click(function(){ | ||
105 | var reg = { | 105 | var reg = { |
106 | 'nome' : nome, | 106 | 'nome' : nome, |
107 | 'sigla': sigla, | 107 | 'sigla': sigla, |
108 | - 'gestor': gestor, | 108 | + 'gestor': cargo, |
109 | 'telefone': telefone, | 109 | 'telefone': telefone, |
110 | 'email': email, | 110 | 'email': email, |
111 | 'end': end, | 111 | 'end': end, |
wscacicneo/templates/master.pt
@@ -53,11 +53,11 @@ | @@ -53,11 +53,11 @@ | ||
53 | </div> | 53 | </div> |
54 | 54 | ||
55 | <LINK href="static/ext-js/resources/css/ext-all-gray.css" type="text/css" rel="stylesheet"> | 55 | <LINK href="static/ext-js/resources/css/ext-all-gray.css" type="text/css" rel="stylesheet"> |
56 | - <LINK href="static/main.css" type="text/css" rel="stylesheet"> | 56 | + <LINK href="static/css/main.css" type="text/css" rel="stylesheet"> |
57 | <LINK href="static/layout.css" type="text/css" rel="stylesheet"> | 57 | <LINK href="static/layout.css" type="text/css" rel="stylesheet"> |
58 | <!-- <LINK href="static/bootstrap/bootstrap/css/bootstrap.css" type="text/css" rel="stylesheet"> --> | 58 | <!-- <LINK href="static/bootstrap/bootstrap/css/bootstrap.css" type="text/css" rel="stylesheet"> --> |
59 | <script type="text/javascript" src="static/ext-js/ext-all.js"></script> | 59 | <script type="text/javascript" src="static/ext-js/ext-all.js"></script> |
60 | - <script type="text/javascript" src="static/main.js"></script> | 60 | + <script type="text/javascript" src="static/js/main.js"></script> |
61 | <script type="text/javascript" src="static/jquery-2.0.3.min.js"></script> | 61 | <script type="text/javascript" src="static/jquery-2.0.3.min.js"></script> |
62 | <!-- <script type="text/javascript" src="static/bootstrap/bootstrap/js/bootstrap.js"></script> --> | 62 | <!-- <script type="text/javascript" src="static/bootstrap/bootstrap/js/bootstrap.js"></script> --> |
63 | 63 |
wscacicneo/templates/orgao.pt
1 | <metal:main use-macro="load: master.pt"> | 1 | <metal:main use-macro="load: master.pt"> |
2 | <!-- Insere JavaScript --> | 2 | <!-- Insere JavaScript --> |
3 | - <script metal:fill-slot="javascript" type="text/javascript" src="static/orgao.js"></script> | 3 | + <script metal:fill-slot="javascript" type="text/javascript" src="static/js/orgao.js"></script> |
4 | 4 | ||
5 | <div metal:fill-slot="conteudo" id="widgets"> | 5 | <div metal:fill-slot="conteudo" id="widgets"> |
6 | </div> | 6 | </div> |
wscacicneo/views.py
@@ -203,7 +203,7 @@ def post_orgao(request): | @@ -203,7 +203,7 @@ def post_orgao(request): | ||
203 | """ | 203 | """ |
204 | Post doc órgãos | 204 | Post doc órgãos |
205 | """ | 205 | """ |
206 | - rest_url = 'http://api.brlight.net/api' | 206 | + rest_url = REST_URL |
207 | orgaobase = OrgaoBase().lbbase | 207 | orgaobase = OrgaoBase().lbbase |
208 | doc = request.params | 208 | doc = request.params |
209 | orgao_obj = Orgao( | 209 | orgao_obj = Orgao( |