Changeset 753b19a in observatorio

Timestamp:

Sep 18, 2014, 10:52:40 AM (10 years ago)

Author:

Jose Ruiz <joseruiz@…>

Branches:

master

Children:

8f0070d

Parents:

a6740ed

Message:

Modificación del generador de Grafos de la matriz insumo productos utilizando el wrapper del script en c++

Location:

procesos

Files:

• apps/productos/ajax.py (modified) (2 diffs)
• extapps/chains/_svg_activities_builder.so (added)
• templates/productos/grafico.html (modified) (1 diff)

procesos/apps/productos/ajax.py

@@ -8 +8 @@
 
 import os
+import sys
+
+#Importar wrapper constructor de cadenas
+extapps_path = os.path.join(settings.PATH, "extapps/chains/")
+
+if not extapps_path in sys.path:
+    sys.path.insert(1, extapps_path)
+del extapps_path
+import _svg_activities_builder
+
+
 
 def generateGraph(request):
         dajax = Dajax()
         codigo = str(request.POST['codigo'])
-        narriba = str(request.POST['narriba'])
-        nabajo = str(request.POST['nabajo'])
+        narriba = int(request.POST['narriba'])
+        nabajo = int(request.POST['nabajo'])
 
-        os.system("cd "+os.path.join(settings.PATH, "tmp/")+";"+os.path.join(settings.PATH, "extapps/chains/print_prod_chain_act")+" --host="+settings.DATABASES['default']['HOST']+" --port="+settings.DATABASES['default']['PORT']+" --username="+settings.DATABASES['default']['USER']+" --password="+settings.DATABASES['default']['PASSWORD']+" --dbname="+settings.DATABASES['default']['NAME']+" --levelsup="+narriba+" --levelsdown="+nabajo+" --output="+str(request.user)+" PROD "+codigo)
-        print "extapps/chains/print_prod_chain_act"+" --host="+settings.DATABASES['default']['HOST']+" --port="+settings.DATABASES['default']['PORT']+" --username="+settings.DATABASES['default']['USER']+" --password="+settings.DATABASES['default']['PASSWORD']+" --dbname="+settings.DATABASES['default']['NAME']+" --levelsup="+narriba+" --levelsdown="+nabajo+" --output="+str(request.user)+" PROD "+codigo
+
+        _svg_activities_builder.buildSvg(narriba,nabajo,settings.DATABASES['default']['HOST'],settings.DATABASES['default']['PORT'],settings.DATABASES['default']['NAME'],settings.DATABASES['default']['USER'],settings.DATABASES['default']['PASSWORD'],os.path.join(settings.PATH, "tmp/")+str(request.user),"PROD",codigo)
+
+#        os.system("cd "+os.path.join(settings.PATH, "tmp/")+";"+os.path.join(settings.PATH, "extapps/chains/print_prod_chain_act")+" --host="+settings.DATABASES['default']['HOST']+" --port="+settings.DATABASES['default']['PORT']+" --username="+settings.DATABASES['default']['USER']+" --password="+settings.DATABASES['default']['PASSWORD']+" --dbname="+settings.DATABASES['default']['NAME']+" --levelsup="+narriba+" --levelsdown="+nabajo+" --output="+str(request.user)+" PROD "+codigo)
+ #       print "extapps/chains/print_prod_chain_act"+" --host="+settings.DATABASES['default']['HOST']+" --port="+settings.DATABASES['default']['PORT']+" --username="+settings.DATABASES['default']['USER']+" --password="+settings.DATABASES['default']['PASSWORD']+" --dbname="+settings.DATABASES['default']['NAME']+" --levelsup="+narriba+" --levelsdown="+nabajo+" --output="+str(request.user)+" PROD "+codigo
 
         ahora = date.today().isoformat()
         
-        dajax.script("window.open('"+settings.BASE_URL+"/Graficar?codigo="+codigo+"&ahora="+ahora+"&arriba="+narriba+"&abajo="+nabajo+"')")
+        dajax.script("window.open('"+settings.BASE_URL+"/Graficar?codigo="+codigo+"&ahora="+ahora+"&arriba="+str(narriba)+"&abajo="+str(nabajo)+"')")
 
         return dajax
@@ -27 +41 @@
         dajax = Dajax()
         codigo = str(request.POST['codigo'])
-        narriba = str(request.POST['narriba'])
-        nabajo = str(request.POST['nabajo'])
-        
-        os.system("cd "+os.path.join(settings.PATH, "tmp/")+";"+os.path.join(settings.PATH, "extapps/chains/print_prod_chain_act")+" --host="+settings.DATABASES['default']['HOST']+" --port="+settings.DATABASES['default']['PORT']+" --username="+settings.DATABASES['default']['USER']+" --password="+settings.DATABASES['default']['PASSWORD']+" --dbname="+settings.DATABASES['default']['NAME']+" --levelsup="+narriba+" --levelsdown="+nabajo+" --output="+str(request.user)+" ACT "+codigo)
+        narriba = int(request.POST['narriba'])
+        nabajo = int(request.POST['nabajo'])
+ 
+        _svg_activities_builder.buildSvg(narriba,nabajo,settings.DATABASES['default']['HOST'],settings.DATABASES['default']['PORT'],settings.DATABASES['default']['NAME'],settings.DATABASES['default']['USER'],settings.DATABASES['default']['PASSWORD'],os.path.join(settings.PATH, "tmp/")+str(request.user),"ACT",codigo)
 
-        dajax.script("window.open('"+settings.BASE_URL+"/Graficar?codigo="+codigo+"&arriba="+narriba+"&abajo="+nabajo+"')")
+        #os.system("cd "+os.path.join(settings.PATH, "tmp/")+";"+os.path.join(settings.PATH, "extapps/chains/print_prod_chain_act")+" --host="+settings.DATABASES['default']['HOST']+" --port="+settings.DATABASES['default']['PORT']+" --username="+settings.DATABASES['default']['USER']+" --password="+settings.DATABASES['default']['PASSWORD']+" --dbname="+settings.DATABASES['default']['NAME']+" --levelsup="+narriba+" --levelsdown="+nabajo+" --output="+str(request.user)+" ACT "+codigo)
+
+        dajax.script("window.open('"+settings.BASE_URL+"/Graficar?codigo="+codigo+"&arriba="+str(narriba)+"&abajo="+str(nabajo)+"')")
 
         return dajax

procesos/templates/productos/grafico.html

@@ -5 +5 @@
                 <title>Gráfico</title>
                 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-                <meta http-equiv="Pragma" content="no-cache">
-                <script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery-1.3.2.min.js"></script>
+                <meta http-equiv="Pragma" content="no-cache">
+                <script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery-1.3.2.min.js"></script>
                 <script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery.svg.js"></script>
                 <script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery.svggraph.js"></script>