From 871e2002f457549e96115d17f5c4ec84811d36f1 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Sat, 23 Feb 2013 16:10:00 +0100
Subject: [PATCH] Aggiunta la data azione alla ricerca atti del registro
 dell'albo.

---
 data/messi/form/trovaregistro.form |  14 ++++
 data/messi/gui/messi.gui           | 119 ++++++++++++++++++++++++-----
 src/registro.c                     |  16 ++++
 3 files changed, 128 insertions(+), 21 deletions(-)

diff --git a/data/messi/form/trovaregistro.form b/data/messi/form/trovaregistro.form
index 6549621..d29e4db 100644
--- a/data/messi/form/trovaregistro.form
+++ b/data/messi/form/trovaregistro.form
@@ -1,6 +1,20 @@
 <?xml version="1.0"?>
 <gtkform>
 
+	<widget type="entry" name="entry16" label="label27">
+		<field type="datetime" name="azione_da_data">
+			<datetime-type>date</datetime-type>
+			<display-format>%d/%m/%Y</display-format>
+		</field>
+	</widget>
+
+	<widget type="entry" name="entry17" label="label28">
+		<field type="datetime" name="azione_a_data">
+			<datetime-type>date</datetime-type>
+			<display-format>%d/%m/%Y</display-format>
+		</field>
+	</widget>
+
 	<widget type="entry" name="entry12" label="label23">
 		<field type="text" name="numero">
 		</field>
diff --git a/data/messi/gui/messi.gui b/data/messi/gui/messi.gui
index 1faae60..cde443a 100644
--- a/data/messi/gui/messi.gui
+++ b/data/messi/gui/messi.gui
@@ -2273,7 +2273,7 @@
           <object class="GtkTable" id="table1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="n_rows">6</property>
+            <property name="n_rows">7</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
@@ -2285,8 +2285,8 @@
                 <property name="label" translatable="yes">Tipo</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -2300,8 +2300,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
@@ -2314,8 +2314,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
@@ -2327,8 +2327,8 @@
                 <property name="label" translatable="yes">Ufficio</property>
               </object>
               <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -2341,8 +2341,8 @@
                 <property name="label" translatable="yes">Pubblicazione - da data</property>
               </object>
               <packing>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -2405,8 +2405,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
@@ -2418,6 +2418,8 @@
                 <property name="label" translatable="yes">Numero</property>
               </object>
               <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -2437,6 +2439,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
@@ -2448,8 +2452,8 @@
                 <property name="label" translatable="yes">Ricezione - da data</property>
               </object>
               <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -2512,8 +2516,8 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
@@ -2525,8 +2529,8 @@
                 <property name="label" translatable="yes">Oggetto</property>
               </object>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
@@ -2546,8 +2550,81 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label27">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Azione - da data</property>
+              </object>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox5">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkEntry" id="entry16">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="max_length">10</property>
+                    <property name="invisible_char">●</property>
+                    <property name="invisible_char_set">True</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                    <property name="primary_icon_sensitive">True</property>
+                    <property name="secondary_icon_sensitive">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label28">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">a data</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="entry17">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="max_length">10</property>
+                    <property name="invisible_char">●</property>
+                    <property name="invisible_char_set">True</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                    <property name="primary_icon_sensitive">True</property>
+                    <property name="secondary_icon_sensitive">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
diff --git a/src/registro.c b/src/registro.c
index bc02e59..430e2ce 100644
--- a/src/registro.c
+++ b/src/registro.c
@@ -257,6 +257,22 @@ registro_carica (Registro *registro)
 
 	if (priv->parametri_ricerca != NULL)
 		{
+			gval = (GValue *)g_hash_table_lookup (priv->parametri_ricerca, "azione_da_data");
+			if (gval != NULL && (gdtval = (GDateTime *)g_value_get_pointer (gval)) != NULL)
+				{
+					sql_where = g_strconcat (sql_where, " AND r.azione_data >= '",
+					                         g_date_time_format (gdtval, "%F"),
+					                         " 00:00:00'",
+					                         NULL);
+				}
+			gval = (GValue *)g_hash_table_lookup (priv->parametri_ricerca, "azione_a_data");
+			if (gval != NULL && (gdtval = (GDateTime *)g_value_get_pointer (gval)) != NULL)
+				{
+					sql_where = g_strconcat (sql_where, " AND r.azione_data <= '",
+					                         g_date_time_format (gdtval, "%F"),
+					                         " 23:59:59'",
+					                         NULL);
+				}
 			gval = (GValue *)g_hash_table_lookup (priv->parametri_ricerca, "numero");
 			if (gval != NULL && g_strcmp0 (g_value_get_string (gval), "") != 0)
 				{
-- 
2.49.0