From: Ricardo Markiewicz <gazer.arg@gmail.com>
Date: Mon, 4 Jul 2005 05:18:21 +0000 (+0000)
Subject:  * Muchos cambios , ahi va andando, no me esta tomando las relaciones
X-Git-Tag: svn_import~66
X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/commitdiff_plain/827da8e0d8b4cf9a8a35a85c0cb921667721475a?ds=sidebyside

 * Muchos cambios , ahi va andando, no me esta tomando las relaciones
 con los titulares, en algun me estoy comiendo algo, mañana lo veo :P
---

diff --git a/demo/glade/registrar_visitas.glade b/demo/glade/registrar_visitas.glade
index 8aabae8..1d2f035 100644
--- a/demo/glade/registrar_visitas.glade
+++ b/demo/glade/registrar_visitas.glade
@@ -18,6 +18,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -76,6 +77,9 @@
 		  <property name="rules_hint">False</property>
 		  <property name="reorderable">False</property>
 		  <property name="enable_search">True</property>
+		  <property name="fixed_height_mode">False</property>
+		  <property name="hover_selection">False</property>
+		  <property name="hover_expand">False</property>
 		</widget>
 	      </child>
 	    </widget>
@@ -162,7 +166,9 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">True</property>
+  <signal name="response" handler="OnDialogResponse" last_modification_time="Mon, 04 Jul 2005 04:52:47 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
@@ -244,6 +250,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -268,6 +278,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -292,6 +306,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -316,6 +334,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -340,6 +362,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -364,6 +390,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -506,6 +536,8 @@
 LC
 LE
 CI</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -612,6 +644,10 @@ CI</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="type">label_item</property>
@@ -666,6 +702,10 @@ CI</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -690,6 +730,10 @@ CI</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -714,6 +758,10 @@ CI</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">2</property>
@@ -738,6 +786,10 @@ CI</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">4</property>
@@ -762,6 +814,10 @@ CI</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -778,6 +834,8 @@ CI</property>
 			  <property name="visible">True</property>
 			  <property name="items" translatable="yes">Rio Negro
 Neuquen</property>
+			  <property name="add_tearoffs">False</property>
+			  <property name="focus_on_click">True</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>
@@ -801,6 +859,10 @@ Neuquen</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">4</property>
@@ -825,6 +887,10 @@ Neuquen</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
@@ -979,6 +1045,10 @@ Neuquen</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="type">label_item</property>
diff --git a/demo/src/Controlador/AfiliadoSolicitanteController.cs b/demo/src/Controlador/AfiliadoSolicitanteController.cs
index b243964..00a2bcb 100644
--- a/demo/src/Controlador/AfiliadoSolicitanteController.cs
+++ b/demo/src/Controlador/AfiliadoSolicitanteController.cs
@@ -42,9 +42,7 @@ public class AfiliadoSolicitanteController : Controller
 		query.descend("_pendiente").constrain(false);
 		query.descend("_titular").constrain(s);
 
-		Console.WriteLine (query);
 		ObjectSet result = query.execute();
-		Console.WriteLine (result);
 		ArrayList lst = ObjectSetToArrayList (result);
 
 		return lst;
diff --git a/demo/src/Controlador/RegistrarVisitasController.cs b/demo/src/Controlador/RegistrarVisitasController.cs
index 5949704..5556d89 100644
--- a/demo/src/Controlador/RegistrarVisitasController.cs
+++ b/demo/src/Controlador/RegistrarVisitasController.cs
@@ -86,7 +86,7 @@ public class RegistrarVisitasController : Controller
 
 		return s.Familiares;
 	}
-
+	
 	public void CargarFamiliar (
 		ETipoDocumento tipoTitular, int nroTitular, ETipoDocumento tipoDoc, int nroDoc, string nombre, string apellido, string email,
 		DateTime fechaNac, string calle, int numero, int piso, string dpto, string telefono,
@@ -116,6 +116,7 @@ public class RegistrarVisitasController : Controller
 
 		s.Direccion = d;
 
+		Console.WriteLine ("Se guarda {0} {1}", s.TipoDocumento, s.NroDocumento);
 		c.SaveSolicitante (s);
 		c.Dispose ();
 	}
diff --git a/demo/src/Main.cs b/demo/src/Main.cs
index 3f1e69d..6c6b44a 100644
--- a/demo/src/Main.cs
+++ b/demo/src/Main.cs
@@ -5,6 +5,8 @@ using Gtk;
 using Glade;
 using Dominio.Afiliados;
 using Dominio.Planes;
+using com.db4o;
+using com.db4o.query;
 
 public class App
 {
@@ -29,6 +31,23 @@ public class App
 
 	static public void Main (string[] args)
 	{
+		ObjectContainer db;
+		db = Db4o.openFile("os.yap");
+		
+		Query query = db.query();
+    query.constrain(typeof(Persona));
+		ObjectSet result = query.execute();
+
+		Persona s; 
+		Console.WriteLine (result);
+		Console.WriteLine ("--");
+		while ((s = (Persona)result.next ()) != null)	{
+			Console.Write (" -- ");
+			Console.WriteLine ("{0} {1} {2} {3}", s.TipoDocumento, s.NroDocumento, s.Nombre, s.Apellido);
+		}
+		Console.WriteLine ("--");
+
+		db.close ();
 		if ( args.Length > 0) {
 			if (args[0].Equals ("--test")) {
 				EjecutarTests();
diff --git a/demo/src/Vistas/AgregarAfiliado.cs b/demo/src/Vistas/AgregarAfiliado.cs
index bec4450..717449a 100644
--- a/demo/src/Vistas/AgregarAfiliado.cs
+++ b/demo/src/Vistas/AgregarAfiliado.cs
@@ -50,7 +50,6 @@ public class VAgregarAfiliado
 	{
 		TreeStore store = (TreeStore)lista.Model;
 		ArrayList familiares = c.ObtenerFamiliaresAfiliar (spadre);
-		Console.WriteLine ("{0} {1} -> {2}", spadre.TipoDocumento, spadre.NroDocumento, familiares.Count);
 
 		foreach (Solicitante s in familiares) {
 			TreeIter iter = store.AppendValues (padre, s.TipoDocumento.ToString (), s.NroDocumento, s.Nombre, s.Apellido);
diff --git a/demo/src/Vistas/AgregarFamiliar.cs b/demo/src/Vistas/AgregarFamiliar.cs
index 38dbc12..c2d0b17 100644
--- a/demo/src/Vistas/AgregarFamiliar.cs
+++ b/demo/src/Vistas/AgregarFamiliar.cs
@@ -36,9 +36,11 @@ public class VAgregarFamiliar
 
 	ETipoDocumento tipoTitular;
 	int nroTitular;
+	RegistrarVisitasController c;
 
-	public VAgregarFamiliar(int n, int t, ETipoDocumento td_titular, int doc_titular)
+	public VAgregarFamiliar(int n, int t, ETipoDocumento td_titular, int doc_titular, RegistrarVisitasController c)
 	{
+		this.c = c;
 		xml = new Glade.XML (null, "registrar_visitas.glade", "agregar_familiar", null);
 		xml.Autoconnect (this);
 		actual = n;
@@ -50,8 +52,8 @@ public class VAgregarFamiliar
 	public void OnDialogResponse (object o, ResponseArgs args)
 	{
 		TreeIter iter;
-		if (args.ResponseId == ResponseType.Cancel)
-			return;	
+		/*if (args.ResponseId == ResponseType.Cancel)
+			return;	*/
 
 		ETipoDocumento _tipoDoc;
 		int _nroDoc;
@@ -67,9 +69,6 @@ public class VAgregarFamiliar
 		EProvincia _provincia;
 		string _telefono;
 
-		/* Acept presionado, guardo */
-		RegistrarVisitasController c = new RegistrarVisitasController (null);
-
 		tipoDoc.GetActiveIter (out iter);
 		_tipoDoc = (ETipoDocumento)Enum.Parse (typeof (ETipoDocumento), (string)tipoDoc.Model.GetValue (iter, 0), true);
 		_nroDoc = Int32.Parse (nroDoc.Text);
@@ -95,8 +94,6 @@ public class VAgregarFamiliar
 			tipoTitular, nroTitular, _tipoDoc, _nroDoc, _nombre, _apellido, _email,
 			_fechaNac, _calle, _numero, _piso,  _dpto, _telefono, 
 			_sexo);
-
-		c.Dispose ();
 	}
 
 	public void OnSeleccionarFechaClicked (object o, EventArgs args)
diff --git a/demo/src/Vistas/RegistrarVisitas.cs b/demo/src/Vistas/RegistrarVisitas.cs
index 9390248..590055f 100644
--- a/demo/src/Vistas/RegistrarVisitas.cs
+++ b/demo/src/Vistas/RegistrarVisitas.cs
@@ -126,7 +126,7 @@ public class VRegistrarVisitas
 
 		if (familiares > 0) {
 			for (int i=0; i<familiares; i++) {
-				AgregarFamiliar (i+1, familiares, tipoDoc, nroDoc);
+				AgregarFamiliar (i+1, familiares, tipoDoc, nroDoc, c);
 			}
 		}
 
@@ -136,9 +136,9 @@ public class VRegistrarVisitas
 		store.Remove (ref iter);
 	}
 
-	private void AgregarFamiliar (int n, int total, ETipoDocumento tipo, int nro)
+	private void AgregarFamiliar (int n, int total, ETipoDocumento tipo, int nro, RegistrarVisitasController c)
 	{
-		VAgregarFamiliar w = new VAgregarFamiliar (n, total, tipo, nro);
+		VAgregarFamiliar w = new VAgregarFamiliar (n, total, tipo, nro, c);
 		w.Run ();
 	}