From 8c8e9851b8ce4b3a8f06108a54e3b24cc599bf36 Mon Sep 17 00:00:00 2001
From: Chris Cromer <chris@cromer.cl>
Date: Sun, 14 Jul 2019 12:22:00 -0400
Subject: [PATCH] finish queries and change to spanish

---
 data/ui/main.window.ui  | 28 ++++++----------------------
 data/ui/query.window.ui | 10 +++++-----
 src/db/q1.vala          |  4 ++--
 src/queries.vala        |  4 ++--
 src/query_window.vala   |  4 ++--
 5 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/data/ui/main.window.ui b/data/ui/main.window.ui
index 4f86b7b..fc2c2da 100644
--- a/data/ui/main.window.ui
+++ b/data/ui/main.window.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1
+<!-- Generated with glade 3.22.1 
 
 Copyright 2019 Chris Cromer
 
@@ -38,33 +38,17 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
               <object class="GtkMenuItem">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Menu</property>
+                <property name="label" translatable="yes">_Menú</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkMenuItem" id="tours">
+                      <object class="GtkMenuItem" id="asignaturas">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Tours</property>
-                        <signal name="activate" handler="on_activate_menu" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="staff">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Staff</property>
-                        <signal name="activate" handler="on_activate_menu" swapped="no"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="tourists">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Tourists</property>
+                        <property name="label" translatable="yes">Asignaturas</property>
                         <signal name="activate" handler="on_activate_menu" swapped="no"/>
                       </object>
                     </child>
@@ -78,7 +62,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                       <object class="GtkMenuItem" id="quit">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Quit</property>
+                        <property name="label" translatable="yes">Salir</property>
                         <signal name="activate" handler="on_activate_menu" swapped="no"/>
                       </object>
                     </child>
@@ -90,7 +74,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
               <object class="GtkMenuItem">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Views</property>
+                <property name="label" translatable="yes">_Consultas</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu">
diff --git a/data/ui/query.window.ui b/data/ui/query.window.ui
index 910d8aa..b9c6de6 100644
--- a/data/ui/query.window.ui
+++ b/data/ui/query.window.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1
+<!-- Generated with glade 3.22.1 
 
 Copyright 2019 Chris Cromer
 
@@ -63,7 +63,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
             <property name="spacing">25</property>
             <child>
               <object class="GtkButton" id="close_query">
-                <property name="label" translatable="yes">Close</property>
+                <property name="label" translatable="yes">Cerrar</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -81,7 +81,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
             </child>
             <child>
               <object class="GtkButton" id="run_query">
-                <property name="label" translatable="yes">Run</property>
+                <property name="label" translatable="yes">Correr</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -123,7 +123,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                     <property name="margin_right">5</property>
                     <property name="margin_top">5</property>
                     <property name="margin_bottom">5</property>
-                    <property name="label" translatable="yes">Statement</property>
+                    <property name="label" translatable="yes">Enunciado</property>
                     <attributes>
                       <attribute name="font-desc" value="Sans Bold 6"/>
                     </attributes>
@@ -153,7 +153,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                     <property name="margin_right">5</property>
                     <property name="margin_top">5</property>
                     <property name="margin_bottom">5</property>
-                    <property name="label" translatable="yes">View and Query</property>
+                    <property name="label" translatable="yes">Vista y Consulta</property>
                     <attributes>
                       <attribute name="font-desc" value="Sans Bold 6"/>
                     </attributes>
diff --git a/src/db/q1.vala b/src/db/q1.vala
index b921e82..44d3dc4 100644
--- a/src/db/q1.vala
+++ b/src/db/q1.vala
@@ -5,9 +5,9 @@ namespace Colegio {
 			public string apoderado { get; set; default = ""; }
 			public string curso { get; set; default = ""; }
 			public string jefe { get; set; default = ""; }
-			public string asistente { get; set; default = ""; }
+			public string ?asistente { get; set; default = ""; }
 
-			public Q1 (string alumno = "", string apoderado = "", string curso = "", string jefe = "", string asistente = "") {
+			public Q1 (string alumno = "", string apoderado = "", string curso = "", string jefe = "", string ?asistente = "") {
 				this.alumno = alumno;
 				this.apoderado = apoderado;
 				this.curso = curso;
diff --git a/src/queries.vala b/src/queries.vala
index bc6a6f1..d87b24a 100644
--- a/src/queries.vala
+++ b/src/queries.vala
@@ -51,8 +51,8 @@ JOIN apoderado AP ON (AP.rut_apoderado = AL.rut_apoderado)
 JOIN cursar CU ON (CU.rut_alumno = AL.rut_alumno)
 JOIN curso CO ON (CO.id_curso = CU.id_curso)
 JOIN profesor PJ ON (PJ.rut_profesor = CO.rut_profesor)
-JOIN asistente ASI ON (ASI.id_curso = CO.id_curso)
-JOIN profesor PA ON (PA.rut_profesor = ASI.rut_profesor)
+LEFT JOIN asistente ASI ON (ASI.id_curso = CO.id_curso)
+LEFT JOIN profesor PA ON (PA.rut_profesor = ASI.rut_profesor)
 JOIN ciudad C ON (C.id_ciudad = AL.id_ciudad)
 JOIN region R ON (R.id_region = C.id_region)
 WHERE (
diff --git a/src/query_window.vala b/src/query_window.vala
index e23b580..70cec9c 100644
--- a/src/query_window.vala
+++ b/src/query_window.vala
@@ -98,8 +98,8 @@ JOIN apoderado AP ON (AP.rut_apoderado = AL.rut_apoderado)
 JOIN cursar CU ON (CU.rut_alumno = AL.rut_alumno)
 JOIN curso CO ON (CO.id_curso = CU.id_curso)
 JOIN profesor PJ ON (PJ.rut_profesor = CO.rut_profesor)
-JOIN asistente ASI ON (ASI.id_curso = CO.id_curso)
-JOIN profesor PA ON (PA.rut_profesor = ASI.rut_profesor)
+LEFT JOIN asistente ASI ON (ASI.id_curso = CO.id_curso)
+LEFT JOIN profesor PA ON (PA.rut_profesor = ASI.rut_profesor)
 JOIN ciudad C ON (C.id_ciudad = AL.id_ciudad)
 JOIN region R ON (R.id_region = C.id_region)
 WHERE (