Download as
Browse Code »

Commit a1454feb4541f60bde65a7192f871a00bb39d799

Authored by Macieski
1 parent a8feb0b7
Exists in master

correçoes nas rotas

Showing 6 changed files with 15 additions and 28 deletions   Show diff stats
wscacicneo/__init__.py
  Diff comments   View file @a1454fe
... ... @@ -13,10 +13,10 @@ def main(global_config, **settings):
13 13 config.add_route('graficop', 'graficop')
14 14 config.add_route('notifications', 'notifications')
15 15 config.add_route('admin', 'admin')
  16 + config.add_route('reports', 'reports')
16 17 config.add_route('busca', 'busca')
17 18 config.add_route('gestor', 'gestor')
18 19 config.add_route('diagnostic', 'diagnostic')
19   - config.add_route('reports', 'reports')
20 20 config.add_route('sobre', 'sobre')
21 21 config.add_route('perfil', 'perfil')
22 22 config.scan()
... ...
wscacicneo/static/reports.js
  Diff comments   View file @a1454fe
1 1 /*GRAFICO DE ORGÃOS*/
2 2  
3 3  
4   -
5 4 Ext.define('User',{
6 5 extend: 'Ext.data.Model',
7 6 fields: [ 'codigo', 'orgao', 'date' ]
... ... @@ -61,7 +60,6 @@ table = Ext.create('Ext.grid.Panel', {
61 60 flex: 1,
62 61 dataIndex: 'date'
63 62 },
64   -
65 63 ]
66 64 });
67 65  
... ... @@ -92,9 +90,6 @@ Ext.onReady(function(){
92 90 });
93 91  
94 92  
95   -
96   -
97   -
98 93 // **** FILTRO DE ITENS ****
99 94  
100 95 Ext.define('User1',{
... ...
wscacicneo/static/sobre.js
  Diff comments   View file @a1454fe
1   - var html = "<div style='padding: 25px ; font-size: 14px; text-align: justify;'><div style='width: 29%; height: 100px; float: left;'><img src='static/caciclogo.jpg'> </div><div style='width: 70%; float: right'>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse turpis eros, accumsan in dignissim nec, rhoncus sed nunc. Integer sit amet venenatis ante, id lacinia velit. Fusce a elit purus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam aliquam lacus accumsan cursus tempus. Suspendisse ante ipsum, mollis eget ultrices eget, cursus sed quam. Fusce eget dui ut felis scelerisque sodales. Maecenas pellentesque dolor ac erat fringilla, ut vehicula mi viverra. In non turpis a massa auctor accumsan.i</div></div>";
  1 + var html = "<div style='padding: 25px ; font-size: 14px; text-align: justify;'><div style='width: 29%; height: 100px; float: left;'><img src='static/caciclogo.jpg'> </div><div style='width: 70%; float: right'>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse turpis eros, accumsan in dignissim nec, rhoncus sed nunc. Integer sit amet venenatis ante, id lacinia velit. Fusce a elit purus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam aliquam lacus accumsan cursus tempus. Suspendisse ante ipsum, mollis eget ultrices eget, cursus sed quam. Fusce eget dui ut felis scelerisque sodales. Maecenas pellentesque dolor ac erat fringilla, ut vehicula mi viverra. In non turpis a massa auctor accumsan.</div></div>";
2 2  
3 3  
4 4 Ext.onReady(function(){
... ...
wscacicneo/templates/master.pt
  Diff comments   View file @a1454fe
... ... @@ -46,7 +46,6 @@
46 46 <a href="home">Home</a> |
47 47 <a href="notifications">Notificações</a> |
48 48 <a href="admin">Administração</a> |
49   - <a href="diagnostic">Diagnosticos</a> |
50 49 <a href="sobre">Sobre</a>
51 50 </div>
52 51 <div id="desenvolvido">
... ...
wscacicneo/templates/reports.pt
  Diff comments   View file @a1454fe
1 1 <metal:main use-macro="load: master.pt">
2 2 <!-- Insere JavaScript -->
3   -<<<<<<< HEAD
4   -<!-- <script metal:fill-slot="javascript" type="text/javascript" src="static/relatorio.pt"></script>-->
5   -<script metal:fill-slot="javascript" type="text/javascript" src="static/relatorio.js"></script>
6   -=======
7   -<!-- <script metal:fill-slot="javascript" type="text/javascript" src="static/reports.js"></script>-->
8   -<script metal:fill-slot="javascript" type="text/javascript" src="static/reports.js"></script>
9   ->>>>>>> 73f912e7d45ff7875582ce79e586334964b55fb4
  3 + <script metal:fill-slot="javascript" type="text/javascript" src="static/reports.js"></script>
10 4  
11 5 <div metal:fill-slot="conteudo" id="widgets"></div>
12 6 </metal:main>
13   -
... ...
wscacicneo/views.py
  Diff comments   View file @a1454fe
... ... @@ -19,16 +19,24 @@ def master(request):
19 19 def home(request):
20 20 return {'project': 'WSCacicNeo'}
21 21  
  22 +@view_config(route_name='reports', renderer='templates/reports.pt')
  23 +def reports(request):
  24 + return {'project': 'WSCacicNeo'}
  25 +
  26 +@view_config(route_name='perfil', renderer='templates/perfil.pt')
  27 +def perfil(request):
  28 + return {'project': 'WSCacicNeo'}
  29 +
22 30 @view_config(route_name='graficop', renderer='templates/graficop.pt')
23 31 def graficop(request):
24 32 return {'project': 'WSCacicNeo'}
25 33  
26 34 @view_config(route_name='gestor', renderer='templates/gestor.pt')
27   -def graficop(request):
  35 +def gestor(request):
28 36 return {'project': 'WSCacicNeo'}
29 37  
30 38 @view_config(route_name='notifications', renderer='templates/dashboard.pt')
31   -def dashboard(request):
  39 +def notifications(request):
32 40 return {'project': 'WSCacicNeo'}
33 41  
34 42 @view_config(route_name='admin', renderer='templates/admin.pt')
... ... @@ -39,16 +47,8 @@ def admin(request):
39 47 def diagnostic(request):
40 48 return {'project': 'WSCacicNeo'}
41 49  
42   -@view_config(route_name='reports', renderer='templates/reports.pt')
43   -def reports(request):
44   - return {'project': 'WSCacicNeo'}
45   -
46 50 @view_config(route_name='sobre', renderer='templates/sobre.pt')
47   -def reports(request):
48   - return {'project': 'WSCacicNeo'}
49   -
50   -@view_config(route_name='perfil', renderer='templates/perfil.pt')
51   -def reports(request):
  51 +def sobre(request):
52 52 return {'project': 'WSCacicNeo'}
53 53  
54 54  
... ... @@ -57,7 +57,7 @@ def my_view8(request):
57 57 query = session.query(SistemaOperacional).all()
58 58 data = dict()
59 59 #data = {'items': []}
60   - ptdata["items"] = list()
  60 + data["items"] = list()
61 61 wc = 0
62 62 uc = 0
63 63 dc = 0
... ...