From a1454feb4541f60bde65a7192f871a00bb39d799 Mon Sep 17 00:00:00 2001
From: Eduardo <eduardo.gcr12@gmail.com>
Date: Wed, 9 Jul 2014 15:04:16 -0300
Subject: [PATCH] correçoes nas rotas

---
 wscacicneo/__init__.py          |  2 +-
 wscacicneo/static/reports.js    |  5 -----
 wscacicneo/static/sobre.js      |  2 +-
 wscacicneo/templates/master.pt  |  1 -
 wscacicneo/templates/reports.pt |  9 +--------
 wscacicneo/views.py             | 24 ++++++++++++------------
 6 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/wscacicneo/__init__.py b/wscacicneo/__init__.py
index 9265c38..38cd794 100644
--- a/wscacicneo/__init__.py
+++ b/wscacicneo/__init__.py
@@ -13,10 +13,10 @@ def main(global_config, **settings):
     config.add_route('graficop', 'graficop')
     config.add_route('notifications', 'notifications')
     config.add_route('admin', 'admin')
+    config.add_route('reports', 'reports')
     config.add_route('busca', 'busca')
     config.add_route('gestor', 'gestor')
     config.add_route('diagnostic', 'diagnostic')
-    config.add_route('reports', 'reports')
     config.add_route('sobre', 'sobre')
     config.add_route('perfil', 'perfil')
     config.scan()
diff --git a/wscacicneo/static/reports.js b/wscacicneo/static/reports.js
index ec48741..fccf175 100644
--- a/wscacicneo/static/reports.js
+++ b/wscacicneo/static/reports.js
@@ -1,7 +1,6 @@
 /*GRAFICO DE ORGÃOS*/
 
 
-
 Ext.define('User',{
     extend: 'Ext.data.Model',
     fields: [ 'codigo', 'orgao', 'date' ]
@@ -61,7 +60,6 @@ table = Ext.create('Ext.grid.Panel', {
             flex: 1,
             dataIndex: 'date'
         },
-      
     ]
 });
 
@@ -92,9 +90,6 @@ Ext.onReady(function(){
 });
 
 
-
-
-
 // **** FILTRO DE ITENS ****
 
 Ext.define('User1',{
diff --git a/wscacicneo/static/sobre.js b/wscacicneo/static/sobre.js
index 5ee301d..0e48fd6 100644
--- a/wscacicneo/static/sobre.js
+++ b/wscacicneo/static/sobre.js
@@ -1,4 +1,4 @@
- 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>";
+ 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>";
 
 
 Ext.onReady(function(){
diff --git a/wscacicneo/templates/master.pt b/wscacicneo/templates/master.pt
index 6314c20..42c0d4d 100644
--- a/wscacicneo/templates/master.pt
+++ b/wscacicneo/templates/master.pt
@@ -46,7 +46,6 @@
 			   <a href="home">Home</a> |
 			   <a href="notifications">Notificações</a> |
 			   <a href="admin">Administração</a> |
-			   <a href="diagnostic">Diagnosticos</a> |
 			   <a href="sobre">Sobre</a>
 		   </div>
 		   <div id="desenvolvido">
diff --git a/wscacicneo/templates/reports.pt b/wscacicneo/templates/reports.pt
index 6415870..a35bc29 100644
--- a/wscacicneo/templates/reports.pt
+++ b/wscacicneo/templates/reports.pt
@@ -1,13 +1,6 @@
 <metal:main use-macro="load: master.pt">
  <!-- Insere JavaScript -->
-<<<<<<< HEAD
-<!-- <script metal:fill-slot="javascript" type="text/javascript" src="static/relatorio.pt"></script>-->
-<script metal:fill-slot="javascript" type="text/javascript" src="static/relatorio.js"></script>
-=======
-<!-- <script metal:fill-slot="javascript" type="text/javascript" src="static/reports.js"></script>-->
-<script metal:fill-slot="javascript" type="text/javascript" src="static/reports.js"></script>
->>>>>>> 73f912e7d45ff7875582ce79e586334964b55fb4
+ <script metal:fill-slot="javascript" type="text/javascript" src="static/reports.js"></script>
 
  <div metal:fill-slot="conteudo" id="widgets"></div>
 </metal:main>
-
diff --git a/wscacicneo/views.py b/wscacicneo/views.py
index c30daa9..3cd3e77 100644
--- a/wscacicneo/views.py
+++ b/wscacicneo/views.py
@@ -19,16 +19,24 @@ def master(request):
 def home(request):
     return {'project': 'WSCacicNeo'}
 
+@view_config(route_name='reports', renderer='templates/reports.pt')
+def reports(request):
+    return {'project': 'WSCacicNeo'}
+
+@view_config(route_name='perfil', renderer='templates/perfil.pt')
+def perfil(request):
+    return {'project': 'WSCacicNeo'}
+
 @view_config(route_name='graficop', renderer='templates/graficop.pt')
 def graficop(request):
     return {'project': 'WSCacicNeo'}
 
 @view_config(route_name='gestor', renderer='templates/gestor.pt')
-def graficop(request):
+def gestor(request):
     return {'project': 'WSCacicNeo'}
 
 @view_config(route_name='notifications', renderer='templates/dashboard.pt')
-def dashboard(request):
+def notifications(request):
     return {'project': 'WSCacicNeo'}
 
 @view_config(route_name='admin', renderer='templates/admin.pt')
@@ -39,16 +47,8 @@ def admin(request):
 def diagnostic(request):
     return {'project': 'WSCacicNeo'}
 
-@view_config(route_name='reports', renderer='templates/reports.pt')
-def reports(request):
-    return {'project': 'WSCacicNeo'}
-
 @view_config(route_name='sobre', renderer='templates/sobre.pt')
-def reports(request):
-    return {'project': 'WSCacicNeo'}
-
-@view_config(route_name='perfil', renderer='templates/perfil.pt')
-def reports(request):
+def sobre(request):
     return {'project': 'WSCacicNeo'}
 
 
@@ -57,7 +57,7 @@ def my_view8(request):
     query = session.query(SistemaOperacional).all()
     data = dict()
     #data = {'items': []}
-    ptdata["items"] = list()
+    data["items"] = list()
     wc = 0
     uc = 0
     dc = 0
--
libgit2 0.21.2