cambios para el boton de 'ves mas'

ahora el modal que pop-up cuando se presiona el boton de 'ver mas'  usa una variable nueva (modal_content) para la informacion que contiene. asi será mas facil en el futuro cambiar la informacion que contiene el modal.

adminadmin.py

@@ -40,33 +40,44 @@ def admin():
     headers += ','
     headers += '{"nombre":"Editar"}'
     headers += ']'
-    # headers = '[{"nombre":"Nombre"},{"nombre":"Posicion"},{"nombre":"Informacion"},{"nombre":"Editar"}]'
 
     ###### tabla
 
 
+    modal_content = '['
     tabla = '['
     i = 0
     len_result = len(result_db)
     for q in result_db:
         i = i+1
         tabla += '{'
+        modal_content += '{'
         tabla += '"Nombre":"'+escape(q[1])+escape(q[2])+'"'
+        modal_content += '"Nombre":"'+escape(q[1])+escape(q[2])+'"'
         tabla += ','
+        modal_content += ','
 
         query = 'SELECT posicion FROM administracion a WHERE a.user_id = ' + str(q[0])
         posicion = connection.execute(query).fetchall()
 
         tabla += '"Posicion":"'+escape(str(posicion[0][0]))+'"'
-        # tabla += '"ID":"'+str(q[0])+'"'
+        modal_content += '"Posicion":"'+escape(str(posicion[0][0]))+'"'
+
         tabla += ','
+        modal_content += ','
         tabla += '"Email":"'+escape(q[3])+'"'
+        modal_content += '"Email":"'+escape(q[3])+'"'
         tabla += ','
+        modal_content += ','
         tabla += '"user_id":"'+escape(str(q[0]))+'"'
+        modal_content += '"user_id":"'+escape(str(q[0]))+'"'
         tabla += '}'
+        modal_content += '}'
         if i < len_result:
             tabla += ','
+            modal_content += ','
     tabla += ']'
+    modal_content += ']'
 
     ###### info
 
@@ -93,19 +104,8 @@ def admin():
     modal += ','
     modal += '"editName":"/admin/ver/"'
     modal += '}'
-    # modal = '{"yeas":"yes"}'
-
-    # # result = '{'+headers+','+tabla+','+info+','+modal+'}'
-    # result = '{'
-    # result += '"headers":{'+headers+'}'
-    # result += ','
-    # result += '"tabla":{'+tabla+'}'
-    # result += ','
-    # result += '"info":'+info
-    # result += ','
-    # result += '"modal":{'+modal+'}'
-    # result += '}'
-    result = '{"headers":'+headers+',"tabla":'+tabla+',"info":'+info+',"modal":'+modal+'}'
+
+    result = '{"headers":'+headers+',"tabla":'+tabla+',"modal_content":'+modal_content+',"info":'+info+',"modal":'+modal+'}'
 
     # print(result)
     return(result)

adminencargados.py

@@ -40,33 +40,44 @@ def encargados():
     headers += ','
     headers += '{"nombre":"Editar"}'
     headers += ']'
-    # headers = '[{"nombre":"Nombre"},{"nombre":"Posicion"},{"nombre":"Informacion"},{"nombre":"Editar"}]'
 
     ###### tabla
 
 
     tabla = '['
+    modal_content = '['
     i = 0
     len_result = len(result_db)
     for q in result_db:
         i = i+1
         tabla += '{'
+        modal_content += '{'
         tabla += '"Nombre":"'+escape(q[1])+' '+escape(q[2])+'"'
+        modal_content += '"Nombre":"'+escape(q[1])+' '+escape(q[2])+'"'
         tabla += ','
+        modal_content += ','
 
         query = 'SELECT count(*) FROM madres_estudiantes me WHERE me.madre_id = ' + str(q[0])
         total_hijos = connection.execute(query).fetchall()
 
         tabla += '"Hijos Matriculados":"'+str(total_hijos[0][0])+'"'
-        # tabla += '"ID":"'+str(q[0])+'"'
+        modal_content += '"Hijos Matriculados":"'+str(total_hijos[0][0])+'"'
+
         tabla += ','
+        modal_content += ','
         tabla += '"Email":"'+escape(q[3])+'"'
+        modal_content += '"Email":"'+escape(q[3])+'"'
         tabla += ','
+        modal_content += ','
         tabla += '"user_id":"'+str(q[0])+'"'
+        modal_content += '"user_id":"'+str(q[0])+'"'
         tabla += '}'
+        modal_content += '}'
         if i < len_result:
             tabla += ','
+            modal_content += ','
     tabla += ']'
+    modal_content += ']'
 
     ###### info
 
@@ -93,19 +104,8 @@ def encargados():
     modal += ','
     modal += '"editName":"/admin/ver/"'
     modal += '}'
-    # modal = '{"yeas":"yes"}'
-
-    # # result = '{'+headers+','+tabla+','+info+','+modal+'}'
-    # result = '{'
-    # result += '"headers":{'+headers+'}'
-    # result += ','
-    # result += '"tabla":{'+tabla+'}'
-    # result += ','
-    # result += '"info":'+info
-    # result += ','
-    # result += '"modal":{'+modal+'}'
-    # result += '}'
-    result = '{"headers":'+headers+',"tabla":'+tabla+',"info":'+info+',"modal":'+modal+'}'
+
+    result = '{"headers":'+headers+',"tabla":'+tabla+',"modal_content":'+modal_content+',"info":'+info+',"modal":'+modal+'}'
 
     # print(result)
     return(result)

adminenfermeria.py

@@ -40,33 +40,44 @@ def enfermeria():
     headers += ','
     headers += '{"nombre":"Editar"}'
     headers += ']'
-    # headers = '[{"nombre":"Nombre"},{"nombre":"Posicion"},{"nombre":"Informacion"},{"nombre":"Editar"}]'
 
     ###### tabla
 
 
     tabla = '['
+    modal_content = '['
     i = 0
     len_result = len(result_db)
     for q in result_db:
         i = i+1
         tabla += '{'
+        modal_content += '{'
         tabla += '"Nombre":"'+escape(q[1])+' '+escape(q[2])+'"'
+        modal_content += '"Nombre":"'+escape(q[1])+' '+escape(q[2])+'"'
         tabla += ','
+        modal_content += ','
 
         query = 'SELECT especialidad FROM enfermeras e WHERE e.user_id = ' + str(q[0])
         especialidad = connection.execute(query).fetchall()
 
         tabla += '"Especialidad":"'+escape(str(especialidad[0][0]))+'"'
-        # tabla += '"ID":"'+str(q[0])+'"'
+        modal_content += '"Especialidad":"'+escape(str(especialidad[0][0]))+'"'
+
         tabla += ','
+        modal_content += ','
         tabla += '"Email":"'+escape(q[3])+'"'
+        modal_content += '"Email":"'+escape(q[3])+'"'
         tabla += ','
+        modal_content += ','
         tabla += '"user_id":"'+str(q[0])+'"'
+        modal_content += '"user_id":"'+str(q[0])+'"'
         tabla += '}'
+        modal_content += '}'
         if i < len_result:
             tabla += ','
+            modal_content += ','
     tabla += ']'
+    modal_content += ']'
 
     ###### info
 
@@ -93,19 +104,8 @@ def enfermeria():
     modal += ','
     modal += '"editName":"/admin/ver/"'
     modal += '}'
-    # modal = '{"yeas":"yes"}'
-
-    # # result = '{'+headers+','+tabla+','+info+','+modal+'}'
-    # result = '{'
-    # result += '"headers":{'+headers+'}'
-    # result += ','
-    # result += '"tabla":{'+tabla+'}'
-    # result += ','
-    # result += '"info":'+info
-    # result += ','
-    # result += '"modal":{'+modal+'}'
-    # result += '}'
-    result = '{"headers":'+headers+',"tabla":'+tabla+',"info":'+info+',"modal":'+modal+'}'
+
+    result = '{"headers":'+headers+',"tabla":'+tabla+',"modal_content":'+modal_content+',"info":'+info+',"modal":'+modal+'}'
 
     # print(result)
     return(result)

adminestudiantes.py

@@ -46,27 +46,39 @@ def estudiantes():
 
 
     tabla = '['
+    modal_content = '['
     i = 0
     len_result = len(result_db)
     for q in result_db:
         i = i+1
         tabla += '{'
+        modal_content += '{'
         tabla += '"Nombre":"'+escape(q[1])+' '+escape(q[2])+'"'
+        modal_content += '"Nombre":"'+escape(q[1])+' '+escape(q[2])+'"'
         tabla += ','
+        modal_content += ','
 
         query = 'SELECT grado FROM estudiantes e WHERE e.user_id = ' + str(q[0])
         total_hijos = connection.execute(query).fetchall()
 
         tabla += '"Hijos Matriculados":"'+str(total_hijos[0][0])+'"'
-        # tabla += '"ID":"'+str(q[0])+'"'
+        modal_content += '"Hijos Matriculados":"'+str(total_hijos[0][0])+'"'
+
         tabla += ','
+        modal_content += ','
         tabla += '"Email":"'+escape(q[3])+'"'
+        modal_content += '"Email":"'+escape(q[3])+'"'
         tabla += ','
+        modal_content += ','
         tabla += '"user_id":"'+str(q[0])+'"'
+        modal_content += '"user_id":"'+str(q[0])+'"'
         tabla += '}'
+        modal_content += '}'
         if i < len_result:
             tabla += ','
+            modal_content += ','
     tabla += ']'
+    modal_content += ']'
 
     ###### info
 
@@ -93,19 +105,8 @@ def estudiantes():
     modal += ','
     modal += '"editName":"/admin/ver/"'
     modal += '}'
-    # modal = '{"yeas":"yes"}'
-
-    # # result = '{'+headers+','+tabla+','+info+','+modal+'}'
-    # result = '{'
-    # result += '"headers":{'+headers+'}'
-    # result += ','
-    # result += '"tabla":{'+tabla+'}'
-    # result += ','
-    # result += '"info":'+info
-    # result += ','
-    # result += '"modal":{'+modal+'}'
-    # result += '}'
-    result = '{"headers":'+headers+',"tabla":'+tabla+',"info":'+info+',"modal":'+modal+'}'
+
+    result = '{"headers":'+headers+',"tabla":'+tabla+',"modal_content":'+modal_content+',"info":'+info+',"modal":'+modal+'}'
 
     # print(result)
     return(result)

adminfacultad.py

@@ -48,27 +48,39 @@ def facultad():
 
 
     tabla = '['
+    modal_content = '['
     i = 0
     len_result = len(result_db)
     for q in result_db:
         i = i+1
         tabla += '{'
+        modal_content += '{'
         tabla += '"Nombre":"'+escape(q[1])+' '+escape(q[2])+'"'
+        modal_content += '"Nombre":"'+escape(q[1])+' '+escape(q[2])+'"'
         tabla += ','
+        modal_content += ','
 
         query = 'SELECT f.especialidad FROM facultad f WHERE f.user_id =' + str(q[0])
         total_hijos = connection.execute(query).fetchall()
 
         tabla += '"Hijos Matriculados":"'+str(total_hijos[0][0])+'"'
-        # tabla += '"ID":"'+str(q[0])+'"'
+        modal_content += '"Hijos Matriculados":"'+str(total_hijos[0][0])+'"'
+
         tabla += ','
+        modal_content += ','
         tabla += '"Email":"'+escape(q[3])+'"'
+        modal_content += '"Email":"'+escape(q[3])+'"'
         tabla += ','
+        modal_content += ','
         tabla += '"user_id":"'+str(q[0])+'"'
+        modal_content += '"user_id":"'+str(q[0])+'"'
         tabla += '}'
+        modal_content += '}'
         if i < len_result:
             tabla += ','
+            modal_content += ','
     tabla += ']'
+    modal_content += ']'
 
     ###### info
 
@@ -95,19 +107,8 @@ def facultad():
     modal += ','
     modal += '"editName":"/admin/ver/"'
     modal += '}'
-    # modal = '{"yeas":"yes"}'
-
-    # # result = '{'+headers+','+tabla+','+info+','+modal+'}'
-    # result = '{'
-    # result += '"headers":{'+headers+'}'
-    # result += ','
-    # result += '"tabla":{'+tabla+'}'
-    # result += ','
-    # result += '"info":'+info
-    # result += ','
-    # result += '"modal":{'+modal+'}'
-    # result += '}'
-    result = '{"headers":'+headers+',"tabla":'+tabla+',"info":'+info+',"modal":'+modal+'}'
+
+    result = '{"headers":'+headers+',"tabla":'+tabla+',"modal_content":'+modal_content+',"info":'+info+',"modal":'+modal+'}'
 
     # print(result)
     return(result)

dash-run.py

@@ -12,6 +12,7 @@ sys.setdefaultencoding('UTF8')
 ##############################################
 
 import adminadmin, adminfacultad, adminenfermeria, adminencargados, adminestudiantes
+import enfermeria
 
 
 app = Flask(__name__)
@@ -38,6 +39,11 @@ def perfil(perfil, pagina=None):
             return render_template('dash.html', jscript="admin.js", pagina=pagina)
         if(pagina in ['admin','facultad','enfermeria','encargados','estudiantes']):
             return render_template('table.html', jscript="adminver.js", pagina=pagina)
+    if (perfil=='enfermeria'):
+        if (pagina==None):
+            return render_template('dash.html', jscript="enfermeria.js", pagina=pagina)
+        if(pagina in ['visitas']):
+            return render_template('table.html', jscript="enfermeriaver.js", pagina=pagina)
     return render_template('error.html')
 
 # @app.route("/<perfil>/editar/<pagina>/", methods=['GET', 'POST'])
@@ -64,6 +70,9 @@ def datos(perfil, pagina=None):
             return adminencargados.encargados()
         if(pagina=="estudiantes"):
             return adminestudiantes.estudiantes()
+    if(perfil=="enfermeria"):
+        if(pagina=="visitas"):
+            return enfermeria.visitas()
 #################################
         if(pagina=="users"):
             return adminusers.users()

enfermeria.py

@@ -0,0 +1,118 @@
+# coding=utf-8
+# from sqlalchemy import metadata
+import sqlalchemy as db
+
+#########################
+# stack overflow:
+    # Python sanitizing html from a string
+def escape(htmlstring):
+    escapes = {'\"': '"',
+               '\'': ''',
+               '<': '&lt;',
+               '>': '&gt;'}
+    # This is done first to prevent escaping other escapes.
+    htmlstring = htmlstring.replace('&', '&amp;')
+    for seq, esc in escapes.iteritems():
+        htmlstring = htmlstring.replace(seq, esc)
+    return htmlstring
+#########################
+
+# connect to server
+engine = db.create_engine('mysql+pymysql://root:@0.0.0.0/registro_escolar_1')
+
+connection = engine.connect()
+# estudiantes = db.Table('estudiantes', metadata, autoload=True, autoload_with=engine)
+# usuarios = db.Table('usuarios', metadata, autoload=True, autoload_with=engine)
+
+def visitas():
+    query ='SELECT t1.id, t2.nombres e_nombre, t2.apellidos e_apellido,\
+                t1.nombres p_nombre, t1.apellidos p_apellido, t1.razon, t1.acciones\
+            FROM (SELECT v.id, u.nombres, u.apellidos,v.razon, v.acciones\
+                  	FROM visitas_enfermeria v, usuarios u\
+                  	WHERE v.estudiante_id = u.id) t1,\
+            	 (SELECT v.id, u.nombres, u.apellidos\
+                  	FROM visitas_enfermeria v, usuarios u\
+                  	WHERE v.enfermera_id = u.id) t2\
+            WHERE t1.id=t2.id'
+    result_db = connection.execute(query).fetchall()
+
+    ###### headers
+
+    headers = '['
+    headers += '{"nombre":"Nombre Enfermera"}'
+    headers += ','
+    headers += '{"nombre":"Nombre Estudiante"}'
+    headers += ','
+    headers += '{"nombre":"Razon"}'
+    headers += ','
+    headers += '{"nombre":"Informacion"}'
+    headers += ','
+    headers += '{"nombre":"Editar"}'
+    headers += ']'
+
+    ###### tabla
+
+    modal_content = '['
+    tabla = '['
+    i = 0
+    len_result = len(result_db)
+    for q in result_db:
+        i = i+1
+        tabla           += '{'
+        modal_content   += '{'
+        tabla           += '"Nombre Enfermera":"'+escape(q[1])+' '+escape(q[2])+'"'
+        modal_content   += '"Nombre Enfermera":"'+escape(q[1])+' '+escape(q[2])+'"'
+        tabla           += ','
+        modal_content   += ','
+        tabla           += '"Nombre Estudiante":"'+escape(q[3])+' '+escape(q[4])+'"'
+        modal_content   += '"Nombre Estudiante":"'+escape(q[3])+' '+escape(q[4])+'"'
+        tabla           += ','
+        modal_content   += ','
+
+        tabla           += '"Razon":"'+escape(q[5])+'"'
+        modal_content   += '"Razon":"'+escape(q[5])+'"'
+        modal_content   += ','
+        modal_content   += '"Explicación":"'+escape(q[6])+'"'
+
+
+        tabla           += ','
+        modal_content   += ','
+        tabla           += '"user_id":"'+str(q[0])+'"'
+        modal_content   += '"user_id":"'+str(q[0])+'"'
+        tabla           += '}'
+        modal_content   += '}'
+        if i < len_result:
+            tabla        += ','
+            modal_content+= ','
+    tabla               += ']'
+    modal_content       += ']'
+
+    ###### info
+
+    info = '{'
+    info += '"dash_name":"Manejar Encargados"'
+    info += ','
+    info += '"dash_link":"/admin/ver/"'
+    info += ','
+    info += '"dash_sub_name":"Encargados Registrados"'
+    info += ','
+    info += '"add":"Anadir Encargados"'
+    info += ','
+    info += '"add_link":"#"'
+    info += ','
+    info += '"dir1":"#"'
+    info += ','
+    info += '"dir2":"#"'
+    info += '}'
+
+    ###### modal
+    modal = '{'
+    modal += '"infoName":"Ver informacion"'
+    modal += ','
+    modal += '"editName":"/admin/ver/"'
+    modal += '}'
+
+    result = '{"headers":'+headers+',"tabla":'+tabla+',"modal_content":'+modal_content+',"info":'+info+',"modal":'+modal+'}'
+
+    # print(result)
+    return(result)

static/adminver.js

@@ -11,6 +11,7 @@ table.controller('tableController', function tableController($http, $scope, pagi
     $scope.tabla = response.data.tabla;
     $scope.info = response.data.info;
     $scope.modal = response.data.modal;
+    $scope.modal_content = response.data.modal_content;
     console.log(response.data);
     // document.write(response.data.headers);
     // document.write(response.data.tabla);

static/enfermeria.js

@@ -0,0 +1,18 @@
+var dash = angular.module('dash',[]);
+
+dash.controller('dashController', function($scope){
+  $scope.opciones = [
+    {
+      nombre:'Mi info',
+      dir:'#info',//info
+    }
+    ,{
+      nombre:'Manejar Visitas',
+      dir:'visitas',//maestros
+    }
+  ];
+  $scope.info = {
+      dash_name:'Dashboard de Administracion',
+      dash_link:'/',
+    };
+});

static/enfermeriaver.js

@@ -0,0 +1,21 @@
+var table = angular.module('table',['ngSanitize']);
+// var table = angular.module('table',[]);
+
+table.controller('tableController', function tableController($http, $scope, pagina){
+
+  var url = '/enfermeria/datos/'+pagina+'/'
+  console.log(',datos,admin,'+pagina);
+
+  $http.get(url).then(function(response) {
+    $scope.headers = response.data.headers;
+    $scope.tabla = response.data.tabla;
+    $scope.info = response.data.info;
+    $scope.modal = response.data.modal;
+    $scope.modal_content = response.data.modal_content;
+    console.log(response.data);
+    // document.write(response.data.headers);
+    // document.write(response.data.tabla);
+    // document.write(response.data.info);
+    // document.write(response.data.modal);
+  });
+});

templates/table.html

@@ -30,6 +30,7 @@
     <!-- {{tabla}} -->
     <!-- {{info}} -->
     <!-- {{modal}} -->
+    <!-- {{modal_content}} -->
     {% endraw %}
 
   </head>
@@ -81,7 +82,7 @@
 
   <!-- comienza modal -->
   {% raw %}
-  <div ng-repeat="row in tabla" id="myModalv{{row.user_id}}" class="modal fade">
+  <div ng-repeat="row in modal_content" id="myModalv{{row.user_id}}" class="modal fade">
     <div class="modal-dialog">
 
       <!-- Modal content-->