Merge lp:~phcteam/clinica-project/dnd into lp:clinica-project/trunk

[Leonardo Robol]

Added basilare event support, with drag and dropping from patients.
Small cleanup even in the database upgrade.

=== modified file 'clinica/Clinica.vala'
--- clinica/Clinica.vala	2011-09-22 19:27:52 +0000
+++ clinica/Clinica.vala	2011-10-06 07:06:24 +0000
@@ -60,6 +60,7 @@
         
             /* Init resource manager and connect error function
              * to a message display for the user */
+            Gdk.threads_enter ();
             var resources = new ResourceManager (args[0], Utils.show_error_message);
             
             /* Init gettext translation system */
@@ -83,7 +84,6 @@
             var user_interface = new UserInterface (resources);
             
             /* Actually start the application */
-            Gdk.threads_enter ();
             user_interface.start ();
             Gdk.threads_leave ();
             

=== modified file 'clinica/wscript'
--- clinica/wscript	2011-09-22 23:25:12 +0000
+++ clinica/wscript	2011-10-06 07:06:24 +0000
@@ -24,6 +24,3 @@
 
 	# Extra includes
 	prog.includes = [ '.', '../libclinica' ]
-
-	# Enable threading
-	prog.threading = True

=== modified file 'libclinica/Calendar.vala'
--- libclinica/Calendar.vala	2011-09-22 19:27:52 +0000
+++ libclinica/Calendar.vala	2011-10-06 07:06:24 +0000
@@ -25,6 +25,7 @@
 	
 		public DateHandler handler { get; private set; }
 		private CalendarView calendar_view;
+		private ResourceManager resource_manager { get; set; }
 		
 		internal Day[] days;
 		
@@ -35,12 +36,13 @@
 			}
 		}
 	
-		public Calendar (CalendarView view) {
+		public Calendar (ResourceManager resources, CalendarView view) {
+		    this.resource_manager = resources;
 		    this.calendar_view = view;
 		
 			handler = new DateHandler ();
 		
-			// Gtk.Table properties
+			/* Gtk.Table properties */
 			n_rows = 6;
 			n_columns = 7;
 			column_spacing = 0;
@@ -57,10 +59,10 @@
 				}
 			update_month ();
 			
-			// Signals and handlers
+			/* Signals and handlers */
 			handler.changed.connect (update_month);
 			
-			// Change today when it changes
+			/* Change today when it changes */
 			var today = new DateTime.now_local ();		
 			var tomorrow = today.add_full (0, 0, 1, -today.get_hour (), -today.get_minute (), -today.get_second ());
 			var difference = tomorrow.to_unix() - today.to_unix();
@@ -83,6 +85,8 @@
 				return false;
 			});
 			
+			resource_manager.event_list_store.event_added.connect (on_event_added);
+			resource_manager.event_list_store.event_removed.connect (on_event_removed);
 			realize.connect (() => set_date (today));
 		}
 		
@@ -91,15 +95,13 @@
 		}
 		
 		public void set_date (DateTime date) {
-		
 			if (handler.current_month != date.get_month () || handler.current_year != date.get_year ())
 				handler.add_full_offset (date.get_month () - handler.current_month, date.get_year () - handler.current_year);
 				
 			days[date_to_index (date.get_day_of_month ())].grab_focus ();
 		}
 		
-		private void update_month () {
-		
+		internal void update_month () {
 			var today = new DateTime.now_local ();
 			int month = handler.current_month;
 			int year = handler.current_year;
@@ -107,6 +109,16 @@
 			var date = new DateTime.local (year, month, 1, 0, 0, 0).add_days (-days_to_prepend);
 			
 			foreach (var day in days) {
+				/* Fill events of the day */
+			    day.reset_events ();
+			    foreach (var visit in Visit.for_day (resource_manager, date)) {
+			        /* Display visits in the day */
+			        day.add_visit (visit);
+			    }
+			    foreach (var event in Event.for_day (resource_manager, date)) {
+			        day.add_event (event);
+			    }
+			
 				if (date.get_day_of_year () == today.get_day_of_year () && date.get_year () == today.get_year ()) {
 					day.name = "today";
 					day.can_focus = true;
@@ -126,12 +138,36 @@
 			}
 		}
 		
-		
-		
 		private int date_to_index (int day_of_month) {
 			return days_to_prepend + day_of_month - 1;
 		}
 		
+		/**
+		 * @brief Callback called when an event is pushed to the EventListStore
+		 *
+		 * It should find the day of the event, if present in the view, and 
+		 * insert the events in it.
+		 */
+		private void on_event_added (Event event) {
+		    DateTime event_date = event.date;
+		    if (event_date.get_month () != handler.current_month)
+		        return;
+		    if (event_date.get_year () != handler.current_year)
+		        return;
+		        
+		    /* Otherwise add the event to the right */
+		    days[date_to_index (event_date.get_day_of_month ())].add_event (event);
+		}
+		
+		/**
+		 * @brief Callback called when an event is removed from the EventListStore
+		 *
+		 * It should find the day that contained the event and remove it from the
+		 * view. 
+		 */
+		private void on_event_removed (Event event) {
+		}
+		
 	}
 
 }

=== added file 'libclinica/CalendarEventList.vala'
--- libclinica/CalendarEventList.vala	1970-01-01 00:00:00 +0000
+++ libclinica/CalendarEventList.vala	2011-10-06 07:06:24 +0000
@@ -0,0 +1,49 @@
+/*
+ *   This file is part of Clinica.
+ *
+ *   Clinica is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Clinica is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Clinica.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *   Authors: Leonardo Robol <[e-mail]>
+ *            Gianmarco Brocchi <[e-mail]>
+ */
+ 
+ using Gtk;
+ 
+ namespace Clinica {
+ 
+    public class CalendarEventList : Alignment {
+    
+        private ResourceManager resource_manager { get; private set; }
+    
+        public CalendarEventList (ResourceManager resources) {
+            resource_manager = resources;
+            
+            /* Set the right padding, according to what is set in
+             * the resource_manager */
+            set_padding (resource_manager.PADDING, resource_manager.PADDING, 
+                resource_manager.PADDING, resource_manager.PADDING);
+                
+            /* Create a header for the event list */
+            var title = new Label ("");
+            title.set_markup (_("<b>What's next:</b>"));
+            
+            /* Pack all the widgets together */
+            var box = new VBox (false, 0);
+            box.pack_start (title, false);
+            add (box);
+
+            set_size_request (250, -1);
+        }
+    }
+ }

=== modified file 'libclinica/CalendarToolbar.vala'
--- libclinica/CalendarToolbar.vala	2011-09-22 19:27:52 +0000
+++ libclinica/CalendarToolbar.vala	2011-10-06 07:06:24 +0000
@@ -25,15 +25,30 @@
 
     public class CalendarToolbar : Gtk.Toolbar {
     
+        /**
+         * @brief Switcher for the months
+         */
         internal DateSwitcher month_switcher;
+        
+        /**
+         * @brief Switcher for the years.
+         */
         internal DateSwitcher year_switcher;
-        private CalendarView calendar_view;
-        
-        public CalendarToolbar (CalendarView view) {
-            this.calendar_view = view;
+        
+        internal Button add_event_button;
+        
+        private ResourceManager resource_manager;
+        
+        public CalendarToolbar (ResourceManager resources) {
+            resource_manager = resources;
             
             /* Get the look of Ubuntu and elementaries toolbars */
             get_style_context ().add_class ("primary-toolbar");
+            
+            add_event_button = new Button.from_stock (Stock.ADD);
+            var add_item = new ToolItem ();
+            add_item.add (add_event_button);
+            add_event_button.clicked.connect (on_add_button_clicked);
 
             /* Request a decent width for the month switcher so it's likely
              * not to resize on month name change */
@@ -45,22 +60,34 @@
             var year_toolitem  = new ToolItem ();
             year_toolitem.add (year_switcher);
             
+            /* The add button first */
+           insert (add_item, 0);
+            
             /* Insert a spacer before and after the month and
              * year switcher so they don't end in a corner */
             var left_spacer = new ToolItem ();
             left_spacer.set_expand (true);
-            insert (left_spacer, 0);
+            insert (left_spacer, 1);
+            insert (month_toolitem, 2);
             
-            insert (month_toolitem, 1);
             /* Even some margin between the two selectors */
             month_toolitem.set_margin_right (10);
-            insert (year_toolitem,  2);
+            insert (year_toolitem,  3);
             
             /* The right spacer that keep our control buttons
              * centered in the toolbar */
             var right_spacer = new ToolItem ();
             right_spacer.set_expand (true);
-            insert (right_spacer, 3);
+            insert (right_spacer, 4);
+        }
+        
+        public void on_add_button_clicked (Button button) {
+            var event_editor = new EventEditor (resource_manager);
+            if (event_editor.run () == EventEditor.Response.SAVE) {
+                event_editor.selected_event.save ();
+                resource_manager.event_list_store.add_event (event_editor.selected_event);
+            }
+            event_editor.destroy ();
         }
     }
 }

=== modified file 'libclinica/CalendarView.vala'
--- libclinica/CalendarView.vala	2011-09-22 19:27:52 +0000
+++ libclinica/CalendarView.vala	2011-10-06 07:06:24 +0000
@@ -61,11 +61,14 @@
 	
 		public CalendarHeader header { get; private set; }
 		public Calendar calendar { get; private set; }
-		public CalendarToolbar toolbar { get; private set; }
 		public CssProvider style_context { get; private set; }
+		public CalendarToolbar toolbar   { get; set; }
+		internal ResourceManager resource_manager { get; private set; }
 	
-		public CalendarView () {
+		public CalendarView (ResourceManager resources, CalendarToolbar toolbar) {
 		    GLib.Object (spacing: 0, homogeneous: false);
+		    resource_manager = resources;
+		    this.toolbar = toolbar;
 		    
 		    /* Create CssProvider */
 			style_context = new CssProvider ();
@@ -76,11 +79,9 @@
     		}
 			
 			/* Create elements of the calendar view */
-			toolbar = new CalendarToolbar (this);
 			header = new CalendarHeader (this);
-			calendar = new Calendar (this);
+			calendar = new Calendar (resource_manager, this);
 			
-			pack_start (toolbar, false, false, 0);
 			pack_start (header, false, false, 0);
 			pack_end (calendar, true, true, 0);
 			
@@ -103,10 +104,6 @@
 	    
             var date = new DateTime.local (year, month, 1, 0, 0, 0).add_days (-calendar.days_to_prepend);
 
-            // Update switcher text
-            toolbar.month_switcher.text = calendar.handler.format ("%B");
-            toolbar.year_switcher.text = calendar.handler.format ("%Y");
-
             foreach (var day in calendar.days) {
                     if (date.get_day_of_year () == today.get_day_of_year () && date.get_year () == today.get_year ()) {
                             day.name = "today";
@@ -125,6 +122,13 @@
                     day.date = date;
                     date = date.add_days (1);
             }
+            
+            /* Update events displayed in the calendar */
+            calendar.update_month ();
+            
+            /* Update switcher text */
+            toolbar.month_switcher.text = calendar.handler.format ("%B");
+            toolbar.year_switcher.text = calendar.handler.format ("%Y");
 		}
 		
 	}

=== added file 'libclinica/CalendarWindow.vala'
--- libclinica/CalendarWindow.vala	1970-01-01 00:00:00 +0000
+++ libclinica/CalendarWindow.vala	2011-10-06 07:06:24 +0000
@@ -0,0 +1,63 @@
+/*
+ *   This file is part of Clinica.
+ *
+ *   Clinica is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Clinica is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Clinica.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *   Authors: Leonardo Robol <[e-mail]>
+ *            Gianmarco Brocchi <[e-mail]>
+ */
+ 
+ using Gtk;
+ 
+ namespace Clinica {
+ 
+    public class CalendarWindow : Gtk.Window {
+    
+        private ResourceManager resource_manager { get; set; }
+        private CalendarView    calendar_view    { get; set; }
+        private CalendarEventList event_widget     { get; set; }
+		public  CalendarToolbar toolbar { get; private set; }
+    
+        public CalendarWindow (ResourceManager resources) {
+            GLib.Object (type: WindowType.TOPLEVEL);
+            resource_manager = resources;
+            
+            set_title (_("Clinica calendar"));
+            
+            /* The Toolbar used to switch */
+            toolbar = new CalendarToolbar (resource_manager);
+            
+            /* Create the calendar view */
+            calendar_view = new CalendarView (resource_manager, toolbar);
+            
+            /* And the widget that display the events present in the calendar.
+             * This is a label that does nothing for the moment being. */
+            event_widget = new CalendarEventList (resource_manager);
+            
+            /* Pack widgets in the box */
+            var main_table = new Table (2, 2, false);
+            main_table.attach (toolbar, 0, 2, 0, 1, AttachOptions.FILL | AttachOptions.EXPAND, 
+                AttachOptions.FILL, 0, 0);
+            main_table.attach (calendar_view, 0, 1, 1, 2, AttachOptions.FILL | AttachOptions.EXPAND, 
+                AttachOptions.EXPAND | AttachOptions.FILL, 0, 0);
+            main_table.attach (event_widget, 1, 2, 1, 2, AttachOptions.FILL,
+                AttachOptions.EXPAND | AttachOptions.FILL, 0, 0);
+            
+            /* Create an alignment to set the right padding of the window */
+            var alignment = new Alignment (0.5F, 0.5F, 1.0F, 1.0F);
+            alignment.add (main_table);
+            add (alignment);
+        }
+    }
+ }

=== modified file 'libclinica/DateHandler.vala'
--- libclinica/DateHandler.vala	2011-09-22 19:27:52 +0000
+++ libclinica/DateHandler.vala	2011-10-06 07:06:24 +0000
@@ -54,7 +54,6 @@
 		}
 		
 		public DateHandler () {
-		
 			date = new DateTime.now_local ();
 		}
 		

=== modified file 'libclinica/Day.vala'
--- libclinica/Day.vala	2011-09-22 19:27:52 +0000
+++ libclinica/Day.vala	2011-10-06 07:06:24 +0000
@@ -32,48 +32,92 @@
 		private DrawingArea area;
 		
 		public DateTime date { get; set; }
-		private CalendarView calendar_view;
+		private CalendarView calendar_view { get; set; }
+		private ResourceManager resource_manager { get; set; }
+		
+		private double highlight_level = 0;
+		
+		private GLib.List<Visit> visit_list;
+		private GLib.List<Event> event_list;
 	 
 		public Day (CalendarView view) {
 		    this.calendar_view = view;
+		    this.resource_manager = view.resource_manager;
 			
 			/* vbox = new VBox (false, 0);
 			label = new Label (""); */
 			area = new DrawingArea ();
 			
-			// EventBox Properties
+			/* EventBox Properties */
 			can_focus = true;
 			set_visible_window (true);
 			events |= EventMask.BUTTON_PRESS_MASK;
 			
             get_style_context ().add_provider (calendar_view.style_context, 600);
 			get_style_context ().add_class ("cell");
-			set_size_request (70,70);
-			
-			/* label.halign = Align.END;
-			label.get_style_context ().add_provider (calendar_view.style_context, 600);
-			label.name = "date";
-			vbox.pack_start (label, false, false, 0); */
-			
-			/* vbox.margin_bottom = vbox.margin_top = vbox.margin_left = vbox.margin_right = 3; */
+			set_size_request (90, 90);
+			
 			area.draw.connect (on_area_draw);
 			add (area);
 			
-			// Signals and handlers
+			/* Signals and handlers */
 			button_press_event.connect (on_button_press);
 			focus_in_event.connect (on_focus_in);
 			focus_out_event.connect (on_focus_out);
 			draw.connect (on_draw);
 			
-			// notify["date"].connect (() => label.label = date.get_day_of_month ().to_string ());
 			notify["date"].connect (on_date_changed);
+			
+			/* Drag and drop support */
+			TargetEntry patient_target = { "PATIENT", 0, 1 };
+			drag_dest_set (this, DestDefaults.ALL | DestDefaults.HIGHLIGHT , 
+			    { patient_target }, DragAction.COPY);
+			drag_drop.connect (on_drag_drop);
+			drag_motion.connect (on_drag_motion);
+			drag_leave.connect ((context, time) => { highlight_level = 0.0; queue_draw (); });
+		}
+		
+		private bool on_drag_drop (Widget widget, Gdk.DragContext context, int x, int y, uint time)
+		{
+            var patient = resource_manager.dragging_patient;
+            if (patient == null) {
+                debug ("Not doing drag and drop since resource_manager.dragging_patient is null");
+                return false;
+            }
+            debug ("You dropped patient: %s on day %s", patient.get_complete_name (),
+                date.format ("%F"));
+		    drag_finish (context, true, false, time);
+		    resource_manager.dragging_patient = null;
+		    
+		    var event_editor = new EventEditor.with_date (resource_manager, date);
+		    event_editor.select_patient (patient);
+            if (event_editor.run () == EventEditor.Response.SAVE) {
+                /* Save the event in the editor */
+                event_editor.selected_event.save ();
+                resource_manager.event_list_store.add_event (event_editor.selected_event);
+            }
+		    event_editor.destroy ();
+		    return true;
+		}
+		
+		private bool on_drag_motion (Widget widget, Gdk.DragContext context, int x, int y, uint time) {
+		    int height = widget.get_allocated_height();
+		    int width = widget.get_allocated_width ();
+		    highlight_level = 16.0 * (1.0 * width - x) * x * y * (height - y) / (width*width) / (height * height);
+		    queue_draw ();
+		    return false;
 		}
 		
 		private void on_date_changed () {
-		    
+		    if (calendar_view.calendar == null)
+		        return;
+		    if (date.get_month () != calendar_view.calendar.handler.current_month)
+		        can_focus = false;
 		}
 		
 		private bool on_area_draw (Widget w, Context ctx) {
+		    TextExtents extents;
+		
 		    /* Get allocation */
 		    var height = w.get_allocated_height ();
 		    var width  = w.get_allocated_width  ();
@@ -89,19 +133,83 @@
 		        ctx.set_source_rgba (0.1, 0.1, 0.1, 0.2);
 		        ctx.rectangle (0, 0, width, height);
 		        ctx.fill ();
+		    } else {
+		        ctx.set_source_rgba (0.1, 0.1, 0.1, 0.07);
+		        ctx.rectangle (0, 0, width, height);
+		        ctx.fill ();
 		    }
 		    
+		    /* Draw the background if dragging over this, red if it is 
+		     * saturday or sunday, blue otherwise! */
+            if (highlight_level != 0 && can_focus) {
+		        if (date.get_day_of_week () > 5) {
+	                ctx.set_source_rgba (0.5 + 0.5 * highlight_level, 0, 0, 0.2 + 0.5 * highlight_level);
+		        }
+		        else {
+		            ctx.set_source_rgba (0, 0,  0.5 * (1 + highlight_level), 0.2 + 0.5 * highlight_level);
+		        }
+                ctx.rectangle (0, 0, width, height);
+                ctx.fill ();
+            }
+		    
 		    /* If we have the focus draw the light :) */
 		    if (has_focus) {
-		        ctx.set_source_rgba (0.1, 0.1, 1, 0.2);
+		        ctx.set_source_rgba (0.1 + 0.9 * highlight_level, 0.1, 1, 0.2);
 		        ctx.rectangle (0, 0, width, height);
 		        ctx.fill ();
 		    }
 		    
+		    /* Draw another green layer if there are events on this day, we should
+		     * also render events in the calendar */
+		    var event_number = visit_list.length () + event_list.length ();
+			if (can_focus && event_number > 0) {
+			
+			    /* Set the color of the day according to how much is busy */
+			    if (event_number < 2)
+    			    ctx.set_source_rgba (0.2, 1.0, 0.2, 0.3);
+    			else if (event_number < 4)
+    			    ctx.set_source_rgba (1.0, 0.55, 0.0, 0.3);
+    			else
+    			    ctx.set_source_rgba (1.0, 0.2 , 0.2, 0.3);
+    			
+			    ctx.rectangle (0, 0, width, height);
+			    ctx.fill ();
+			    
+			    ctx.set_source_rgba (0.1, 0.1, 0.1, 0.7);
+                ctx.set_font_size (12.0);
+                double line_position = 12;
+                double line_height = 15.0;
+                Gee.LinkedList<int> displayed_patients_id = new Gee.LinkedList<int> ();
+    	        ctx.rectangle (0, 0, width - 8, height - 8);
+		        ctx.clip ();
+			    foreach (var visit in visit_list) {
+			        if (visit.patient.get_id () in displayed_patients_id)
+			            continue;
+			        displayed_patients_id.add (visit.patient.get_id ());
+			        string text = visit.patient.get_complete_name ();;
+			        ctx.text_extents (text, out extents);
+			        ctx.move_to (8 -     extents.x_bearing,
+			            line_position + line_height / 2 - extents.y_bearing);
+			        line_position += line_height;
+			        ctx.show_text (text);
+			    }
+			    
+			    foreach (var event in event_list) {
+			        string text = event.title;
+			        ctx.text_extents (text, out extents);
+			        ctx.move_to (8 -     extents.x_bearing,
+			            line_position + line_height / 2 - extents.y_bearing);
+			        line_position += line_height;
+			        ctx.show_text (text);
+			    }
+			    
+			    /* Undo the clipping to make the whole day drawable */
+			    ctx.restore ();
+			}
+		    
 		    /* Draw number with the date with the usual switch on can_focus
-		     * to render properly hiddent date (of the past and future month). */
+		     * to render properly hidden date (of the past and future month). */
 		    string date = date.get_day_of_month ().to_string ();
-		    TextExtents extents;
 		    ctx.set_font_size (12.0);
 		    if (can_focus)
     		    ctx.set_source_rgba (0.1, 0.1, 0.1, 0.7);
@@ -143,14 +251,60 @@
 			cr.set_antialias (Antialias.NONE);
 			cr.stroke ();
 			
-			// Draw inner highlight stroke
+    		cr.set_source_rgba (1.0, 1.0, 1.0, 0.2);
 			cr.rectangle (1.5, 1.5, size.width - 1.5, size.height - 1.5);
-			cr.set_source_rgba (1.0, 1.0, 1.0, 0.2);
 			cr.stroke ();
 			
 			return false;
 		}
 		
+		/**
+		 * @brief Add a new visit for this day
+		 */
+		public void add_visit (Visit visit) {
+		    visit_list.append (visit);
+		    area.queue_draw ();
+		}
+		
+		/** 
+		 * @brief Remove a visit from the list
+		 */
+		public void remove_visit (Visit visit) {
+		    foreach (var v in visit_list) {
+		        if (v.get_id () == visit.get_id ()) {
+		            visit_list.remove (v);
+        		    area.queue_draw ();
+		            return;
+		        }
+		    }
+		}
+		
+		/** 
+		 * @brief Add a new event for this day
+		 */
+		public void add_event (Event event) {
+		    event_list.append (event);
+		    area.queue_draw ();
+		}
+		
+		/**
+		 * @brief Remove an event in the list.
+		 */
+		public void remove_event (Event event) {
+		    foreach (var e in event_list) {
+		        if (e.get_id () == event.get_id ()) {
+		            event_list.remove (e);
+		            area.queue_draw ();
+		            return;
+		        }
+		    }
+		}
+		
+		public void reset_events () {
+		    event_list = new List<Event> ();
+		    visit_list = new List<Visit> ();
+		}
+		
 	}
 	
 }

=== modified file 'libclinica/DoctorListStore.vala'
--- libclinica/DoctorListStore.vala	2011-09-22 19:27:52 +0000
+++ libclinica/DoctorListStore.vala	2011-10-06 07:06:24 +0000
@@ -33,7 +33,7 @@
     
         public signal void error (string message);
         
-		private ResourceManager resource_manager;
+		private ResourceManager resource_manager { get; set; }
        
         public class DoctorListStore (ResourceManager resources) {
             resource_manager = resources;

=== added file 'libclinica/Event.vala'
--- libclinica/Event.vala	1970-01-01 00:00:00 +0000
+++ libclinica/Event.vala	2011-10-06 07:06:24 +0000
@@ -0,0 +1,172 @@
+/*
+ *   This file is part of Clinica.
+ *
+ *   Clinica is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Clinica is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Clinica.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *   Authors: Leonardo Robol <[e-mail]>
+ *            Gianmarco Brocchi <[e-mail]>
+ */
+ 
+namespace Clinica {
+
+    public class EventIterator : SqlDataIterator {
+    
+        private ResourceManager resource_manager { get; set; }
+        
+        public EventIterator (ResourceManager resources) {
+            /* Grab the resource manager and chain the SqlDataIterator constructor,
+             * ordering by date in decreasing order. */
+            base (resources.db, resources.events_table, "date", true);
+            resource_manager = resources;
+        }
+        
+        public EventIterator.with_day (ResourceManager resources, DateTime date) {
+            base.with_like (resources.db, resources.events_table, "date", true, 
+                "date BETWEEN '%s' AND '%s'".printf (SqlDataType.datetime_to_string (date),
+                                                     SqlDataType.datetime_to_string (date.add_days (1).add_minutes(-1))));
+            resource_manager = resources;
+        }
+        
+        public new EventIterator iterator () {
+            return this;
+        }
+        
+        public new Event get () {
+            return new Event.with_id (resource_manager, base.get ());
+        }
+    }
+
+    public class Event : SqlDataType {
+    
+        private ResourceManager resource_manager { get; set; }
+        
+        /* Properties mapped to the database */
+        public string title {
+            get { return get_text ("title"); }
+            set { set_text ("title", value); }
+        }
+        
+        public string description {
+            get { return get_text ("description"); }
+            set { set_text ("description", value); }
+        }
+        
+        public string venue {
+            get { return get_text ("venue"); }
+            set { set_text ("venue", value); }
+        }
+        
+        /** 
+         * @brief Patient associated to this event, if one exists,
+         * or null otherwise
+         */
+        private Patient? _patient;
+        public Patient? patient {
+            get { 
+                int id = get_integer ("patient");
+                if (id == 0) {
+                    return null;
+                }
+                else {
+                    _patient = new Patient.with_id (resource_manager, id);
+                    return _patient;
+                }
+            }
+            set {
+                if (value != null) {
+                    set_integer ("patient", value.get_id ());
+                    _patient = value;
+                }
+                else {
+                    set_integer ("patient", 0);
+                }
+            }
+        }
+        
+        
+        /** 
+         * @brief Visit associated to this event, if one exists,
+         * or null otherwise
+         */
+        private Visit? _visit;
+        public Visit? visit {
+            get { 
+                int id = get_integer ("visit");
+                if (id == 0) {
+                    return null;
+                }
+                else {
+                    _visit = new Visit.with_id (resource_manager, id);
+                    return _visit;
+                }
+            }
+            set {
+                if (value != null) {
+                    set_integer ("visit", value.get_id ());
+                    _visit = value;
+                }
+                else {
+                    set_integer ("visit", 0);
+                }
+            }
+        }
+        
+        /**
+         * @brief Date associated to this event.
+         */
+        private DateTime _date;
+        public DateTime date {
+        	get { 
+        		_date = get_date ("date");
+        		return _date;
+        	}
+        	set {
+        		_date = value;
+        		set_date ("date", _date);
+        	}
+        }
+    
+        public Event (ResourceManager resources) {
+            base (resources.db);
+            resource_manager = resources;
+            error.connect ((t,l) => resources.error_callback(t,l));
+            table_name = resource_manager.events_table;
+            
+            add_text_field ("title");
+            add_text_field ("description");
+            add_text_field ("venue");
+            add_integer_field ("patient");
+            add_integer_field ("visit");
+            add_date_field ("date");
+            
+            init_resources ();
+            
+            visit = null;
+            patient = null;
+        }
+        
+        public Event.with_id (ResourceManager resources, int id) {
+            this (resources);
+            load (id);
+        }
+        
+        public static new EventIterator all (ResourceManager resources) {
+            return new EventIterator (resources);
+        }
+        
+        public static new EventIterator for_day (ResourceManager resources, DateTime date) {
+            return new EventIterator.with_day (resources, date);
+        }
+    }
+}

=== added file 'libclinica/EventEditor.vala'
--- libclinica/EventEditor.vala	1970-01-01 00:00:00 +0000
+++ libclinica/EventEditor.vala	2011-10-06 07:06:24 +0000
@@ -0,0 +1,224 @@
+/*
+ *   This file is part of Clinica.
+ *
+ *   Clinica is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Clinica is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Clinica.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *   Authors: Leonardo Robol <[e-mail]>
+ *            Gianmarco Brocchi <[e-mail]>
+ */
+ 
+ using Gtk;
+ 
+ namespace Clinica {
+ 
+    public class EventEditor : Dialog {
+    
+        enum Response {
+            CANCEL,
+            SAVE,
+        }
+    
+        /**
+         * @brief Resource Manager used to access clinica
+         * resources.
+         */
+        private ResourceManager resource_manager { get; set; }
+    
+        /** 
+         * @brief event that is being edited by the EventEditor
+         */
+        internal Event selected_event { get; private set; }
+        
+        /**
+         * @brief Entry for the title of the event.
+         */
+        private Entry title_entry;
+        
+        /**
+         * @brief Entry for the venue.
+         */
+        private Entry venue_entry;
+        
+        /**
+         * @brief Calendar used in the dialog to select the data of the event
+         */
+        private Gtk.Calendar calendar;
+        
+        /**
+         * @brief Multiline editor for the desription of the event
+         */
+        private TextView description_textview;
+        
+        /**
+         * @brief Boolean value that tells if the user has filled the buffer
+         * of the description, or if it is left with its default hint.
+         *
+         * In the first case the description should be saved, in the latter ignored.
+         */
+        private bool description_inserted = false;
+        
+        /**
+         * @brief Entry used by the user to select the patient
+         */
+        private PatientEntry patient_entry;
+        
+        public EventEditor (ResourceManager resources, Event? event = null) {
+            resource_manager = resources;
+            
+            /* If the event is null, let's create a new one, otherwise
+             * store the event passed for editing. */
+            if (event == null) {
+                selected_event = new Event (resource_manager);
+                set_title (_("Create a new event"));
+            }
+            else {
+                selected_event = event;
+                set_title (_("Editing event: %s").printf (event.title));
+            }
+            
+            /* Add Save and Cancel buttons */
+            add_buttons (Stock.CANCEL, Response.CANCEL, 
+                         Stock.SAVE,   Response.SAVE);
+                         
+            /* A vertical box to contain all the widgets */
+            var structure_box = new VBox (false, resource_manager.PADDING);
+            
+            /* The header, with a picture representing an event and title 
+             * and venue. */
+            var event_picture = new Image.from_file (resource_manager.get_image_file ("calendar.svg"));
+            var header_box = new HBox (false, resource_manager.PADDING);
+            header_box.pack_start (event_picture, false);
+            
+            /* Create the entry for title of the event and venue */
+            var title_label = new Label (_("Title"));
+            var venue_label = new Label (_("Venue"));
+            
+            title_entry = new Entry ();
+            venue_entry = new Entry ();
+            
+            /* Packing them near the image */
+            var table = new Table (2, 2, false);
+            table.attach (title_label, 0, 1, 0, 1, AttachOptions.FILL, AttachOptions.FILL, 
+                resource_manager.PADDING / 2, resource_manager.PADDING / 2);
+            table.attach (venue_label, 0, 1, 1, 2, AttachOptions.FILL, AttachOptions.FILL, 
+                resource_manager.PADDING / 2, resource_manager.PADDING / 2);
+            table.attach (title_entry, 1, 2, 0, 1, AttachOptions.FILL | AttachOptions.EXPAND, 
+                AttachOptions.FILL, resource_manager.PADDING / 2, resource_manager.PADDING / 2);
+            table.attach (venue_entry, 1, 2, 1, 2, AttachOptions.FILL | AttachOptions.EXPAND, 
+                AttachOptions.FILL, resource_manager.PADDING / 2, resource_manager.PADDING / 2);
+                
+            header_box.pack_start (table);
+            structure_box.pack_start (header_box, false);
+            
+            /* Box for calendar and description */
+            var cal_desc_box = new HBox (false, resource_manager.PADDING);
+                
+            /* Create the calendar used to select the date */
+            calendar = new Gtk.Calendar ();
+            cal_desc_box.pack_start (calendar, false);
+                
+            /* Create the field for the description */
+            description_textview = new TextView ();
+            var scroll_w = new ScrolledWindow (null, null);
+            scroll_w.add_with_viewport (description_textview);
+            scroll_w.set_shadow_type (ShadowType.ETCHED_OUT);
+            cal_desc_box.pack_start (scroll_w);
+            description_textview.get_buffer ().set_text (_("Insert the description here..."));
+            
+            /* Make the description view gray until the user select it, then reset
+             * the text in the textview and let the user fill the description. 
+             * 
+             * FIXME: We are assuming here that the default backgroun color is black, and
+             * that's not always the case. I don't get why vala doesn't allow reset_color
+             * to be null that, following Gtk documentation, should reset the color to
+             * its default value.
+             */
+            Gdk.RGBA hint_color = Gdk.RGBA ();
+            hint_color.parse ("#bcbcbc");
+            description_textview.override_color (StateFlags.NORMAL, hint_color);
+            description_textview.focus_in_event.connect ((widget, event) => {
+                Gdk.RGBA reset_color = Gdk.RGBA ();
+                reset_color.parse ("#000000");
+                description_textview.override_color (StateFlags.NORMAL, reset_color);
+                description_textview.get_buffer ().set_text ("");
+                description_inserted = true;
+                return false;
+            });
+            
+            structure_box.pack_start (cal_desc_box);
+            
+            /* Adding entries to select the patient and the visit */
+            var patient_visit_box = new Table (2, 2, false);
+            
+            var patient_label = new Label(_("Patient"));
+            patient_entry = new PatientEntry (resource_manager);
+            patient_visit_box.attach (patient_label, 0, 1, 0, 1, AttachOptions.FILL, 
+                AttachOptions.FILL | AttachOptions.EXPAND, 0, 0);
+            patient_visit_box.attach (patient_entry, 1, 2, 0, 1, AttachOptions.FILL | AttachOptions.EXPAND, 
+                AttachOptions.FILL | AttachOptions.EXPAND, 0, 0);
+            patient_entry.margin_left = resource_manager.PADDING;;
+            structure_box.pack_start (patient_visit_box);
+                
+            /* Pack the table in the dialog, with some alignment */
+            var alignment = new Alignment (0.5F, 0.5F, 1.0F, 1.0F);
+            alignment.set_padding (resource_manager.PADDING, resource_manager.PADDING, 
+                resource_manager.PADDING, resource_manager.PADDING);
+            alignment.add (structure_box);
+            (get_content_area () as Container).add (alignment);
+            alignment.show_all ();
+            
+            set_size_request (520, -1);
+            
+            response.connect (on_response);
+        }
+        
+        /**
+         * @brief Create a new event editor with a preselected date in the calendar.
+         */
+        public EventEditor.with_date (ResourceManager resources, DateTime date) {
+            this (resources);
+            calendar.select_month (date.get_month () - 1, date.get_year ());
+            calendar.select_day (date.get_day_of_month ());
+        }
+        
+        /**
+         * @brief Change selection to the given patient
+         */
+        public void select_patient (Patient patient) {
+            patient_entry.select_patient (patient);
+        }
+        
+        private void on_response () {
+            selected_event.title = title_entry.get_text ();
+            selected_event.venue = venue_entry.get_text ();
+            
+            TextIter start, end;
+            TextBuffer buffer = description_textview.get_buffer ();
+            buffer.get_start_iter (out start);
+            buffer.get_end_iter (out end);
+            if (description_inserted)
+                selected_event.description = buffer.get_text (start, end, false);
+            else
+                selected_event.description = "";
+                
+            /* Select patient if is valid */
+            if (patient_entry.is_valid () && patient_entry.get_patient () != null) {
+                selected_event.patient = patient_entry.get_patient ();
+            }
+            
+            selected_event.date = new DateTime.local (calendar.year, calendar.month + 1,
+                calendar.day, 0, 0, 0);
+        }
+    }
+ }

=== added file 'libclinica/EventListStore.vala'
--- libclinica/EventListStore.vala	1970-01-01 00:00:00 +0000
+++ libclinica/EventListStore.vala	2011-10-06 07:06:24 +0000
@@ -0,0 +1,123 @@
+/*
+ *   This file is part of Clinica.
+ *
+ *   Clinica is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Clinica is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Clinica.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *   Authors: Leonardo Robol <[e-mail]>
+ *            Gianmarco Brocchi <[e-mail]>
+ */
+ 
+ using Gtk;
+ 
+ namespace Clinica {
+    
+    public class EventListStore : ListStore {
+    
+        public signal void event_added (Event event);
+        public signal void event_removed (Event event);
+    
+        /**
+         * @brief Fields present in the store, i.e. header of
+         * the columns.
+         */
+        enum Field {
+            EVENT,
+            TITLE,
+            DESCRIPTION,
+            VENUE,
+            PATIENT,
+            VISIT,
+            DATE,
+        }
+    
+        /**
+         * @brief This signal is emitted if an error occur in the
+         * list_store
+         */
+        public signal void error (string message);
+        
+        /**
+         * @brief ResourceManager associated to this clinica application
+         * that will be used to retrieve various informationa about the
+         * other components running
+         */
+        private ResourceManager resource_manager { get; set; }
+    
+        public EventListStore (ResourceManager resources) {
+            resource_manager = resources;
+            error.connect ((widget, message) => resource_manager.error_callback (widget, message));
+            
+            Type [] column_headers = { typeof (Event), typeof (string), typeof (string), 
+                typeof (string), typeof (Patient?), typeof (Visit?), typeof (DateTime) };
+                
+            set_column_types (column_headers);
+            GLib.Idle.add (load_events_from_db);
+        }
+        
+        /**
+         * @brief Add an event to the liststore.
+         */
+        public void add_event (Event event) {
+            TreeIter iter;
+            append (out iter);
+            
+            /* Set values in the treeview */
+            set_value (iter, Field.EVENT, event);
+            set_value (iter, Field.DATE, event.date);
+            set_value (iter, Field.DESCRIPTION, event.description);
+            set_value (iter, Field.PATIENT, event.patient);
+            set_value (iter, Field.TITLE, event.title);
+            set_value (iter, Field.VENUE, event.venue);
+            set_value (iter, Field.VISIT, event.visit);
+            
+            /* Emit event_added to make calendars and other pieces of interface
+             * using events know that they must reload their dates */
+            event_added (event);
+        }
+        
+        public void remove_event (Event event) {
+            TreeIter iter;
+            Value value;
+            if (!get_iter_first (out iter)) {
+                error (_("Events database seems corrupted. This is likely to be a bug in the application"));
+            }
+            
+            do {
+                get_value (iter, Field.EVENT, out value);
+                if ((value as Event).get_id () == event.get_id ()) {
+                    /* Delete this event from the liststore */
+                    remove (iter);
+                    event_removed (event);
+                    return;
+                }
+            } while (iter_next (ref iter));
+            
+            assert_not_reached ();
+        }
+        
+        /**
+         * @brief Function to be schedule with GLib.Idle_add () when loading of
+         * the events from the db is needed at the start of the application.
+         *
+         * This function is now called by default from the constructor.
+         */
+        private bool load_events_from_db () {
+            foreach (var event in Event.all (resource_manager)) {
+                add_event (event);
+            }
+            
+            return false;
+        }
+    }
+ }

=== modified file 'libclinica/PatientEditor.vala'
--- libclinica/PatientEditor.vala	2011-09-22 19:27:52 +0000
+++ libclinica/PatientEditor.vala	2011-10-06 07:06:24 +0000
@@ -60,7 +60,7 @@
         
         /* Set to a patient that is the existing object for the
          * one represented here. */
-        private Patient? existing_patient = null;
+        private Patient? existing_patient { get; set; default = null; }
         
         /* Dialog opened to select data of the new patient */
         public Dialog dialog;
@@ -88,6 +88,8 @@
 		public Gdk.Color alert_color;
 		
 		private ResourceManager resource_manager;
+		
+		internal Patient created_patient;
     	
         public PatientEditor (ResourceManager resources) {
             resource_manager = resources;
@@ -102,6 +104,9 @@
             
             /* Fill the dialog with the pieces from the gtk builder file */ 
             dialog = builder.get_object("patient_editor") as Dialog;
+
+            /* Prepare for drag and drop if the patient is changed */
+            notify["existing_patient"].connect (update_draggable_patient_status);
             
             /* Load entries into local object */
             doctor_entry = builder.get_object ("doctor_entry") as Entry;
@@ -150,6 +155,16 @@
 	        extensions = setup_extension_set (resource_manager.plugin_engine);
         }
         
+        private void update_draggable_patient_status () {  
+            /* Enable drag and drop on the patient icon */
+            if (existing_patient == null)
+                return;
+            var patient_eventbox = builder.get_object ("patient_eventbox") as EventBox;
+            TargetEntry patient_target = { "PATIENT", 0, 1 };
+            Gtk.drag_source_set (patient_eventbox, Gdk.ModifierType.BUTTON1_MASK, { patient_target }, Gdk.DragAction.COPY);  
+            patient_eventbox.drag_begin.connect ((widget, context) => resource_manager.dragging_patient = existing_patient);
+        }
+        
         private void on_doctor_entry_changed (Editable editable) {
         	Entry entry = (editable as Entry);
 	        string doc_name = entry.get_text ();
@@ -252,6 +267,7 @@
         	// Load doctors and existing patient
         	selected_doctor = p.doctor;
         	existing_patient = p;
+        	update_draggable_patient_status ();
         	doctor_entry.set_text (p.doctor.get_complete_name ());
         	
         	// Pre fill the fields in the interface
@@ -383,17 +399,16 @@
             	
             	/*  Save the new patient, creating a new one if this is a new patient, or
             	 *  reusing the existing one if we are only modifying a patient. */
-            	Patient patient;
             	if (existing_patient == null)
-	            	patient = new Patient (resource_manager, selected_doctor);
+	            	created_patient = new Patient (resource_manager, selected_doctor);
 	            else
-					patient = existing_patient;
+					created_patient = existing_patient;
 					
-            	patient.given_name = given_name_entry.get_text ();
-            	patient.surname = surname_entry.get_text ();
-            	patient.phone = phone_entry.get_text ();
-            	patient.identification_code = identification_code_entry.get_text ();
-            	patient.residence_address = residence_address_entry.get_text ();
+            	created_patient.given_name = given_name_entry.get_text ();
+            	created_patient.surname = surname_entry.get_text ();
+            	created_patient.phone = phone_entry.get_text ();
+            	created_patient.identification_code = identification_code_entry.get_text ();
+            	created_patient.residence_address = residence_address_entry.get_text ();
             	
             	/* Create new DateTime */
             	int year = int.parse (year_entry.get_text ());
@@ -406,7 +421,7 @@
             		(1 <= day) && (day <= 31))
             	{
 	            	t = new DateTime (new TimeZone.utc (), year, month, day, 0, 0, 0);
-	            	patient.birth_date = t;
+	            	created_patient.birth_date = t;
 	            }
 	            else
 	            {
@@ -417,18 +432,18 @@
 	            
             	/* Set gender here */
             	if (gender_combobox.get_active () == 0)
-	            	patient.gender = Gender.MALE;
+	            	created_patient.gender = Gender.MALE;
 	            else
-	            	patient.gender = Gender.FEMALE;
+	            	created_patient.gender = Gender.FEMALE;
 	            
-            	patient.save ();
+            	created_patient.save ();
             	
             	// If this was an existing patient we need to reload it in the patient
             	// list store, otherwise we can just add it
             	if (existing_patient != null) {
-            		resource_manager.patient_list_store.reload_patient (patient);
+            		resource_manager.patient_list_store.reload_patient (created_patient);
             	} else {
-	            	resource_manager.patient_list_store.add_patient (patient);
+	            	resource_manager.patient_list_store.add_patient (created_patient);
 	            }
             	
                 return Response.SAVE;

=== added file 'libclinica/PatientEntry.vala'
--- libclinica/PatientEntry.vala	1970-01-01 00:00:00 +0000
+++ libclinica/PatientEntry.vala	2011-10-06 07:06:24 +0000
@@ -0,0 +1,168 @@
+/*
+ *   This file is part of Clinica.
+ *
+ *   Clinica is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Clinica is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Clinica.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *   Authors: Leonardo Robol <[e-mail]>
+ *            Gianmarco Brocchi <[e-mail]>
+ */
+ 
+ using Gtk;
+ 
+ namespace Clinica {
+ 
+    /**
+     * @brief Extension of GtkEntry with autocompletion on patients
+     *
+     * The selected patient, or null, if there is no selected patient,
+     * can be retrieved git the get_patient () method.
+     */
+    public class PatientEntry : Entry {
+    
+        public signal void selection_changed ();
+    
+        enum PatientCompletionAction {
+            CREATE_NEW = 0,
+        }
+    
+        /**
+         * @brief The reference to the resource manager
+         */
+        private ResourceManager resource_manager { get; set; }
+        
+        /**
+         * @brief The reference to the selected patient
+         */
+        private Patient? selected_patient = null;        
+        
+        /**
+         * @brief Completion for the patients
+         */
+        private new EntryCompletion completion;
+        
+        public PatientEntry (ResourceManager resources) {
+            resource_manager = resources;
+            
+            /* Init the completion */
+            completion = new EntryCompletion ();
+            completion.set_model (resource_manager.patient_list_store);
+            completion.set_text_column (PatientListStore.Field.COMPLETE_NAME);
+            completion.set_match_func (completion_match_function);
+            completion.insert_action_text (PatientCompletionAction.CREATE_NEW, "Create a new patient");
+            
+            /* Callback that stores the selected patient */
+            completion.match_selected.connect (on_match_selected);
+            
+            /* Callback for action selected */
+            completion.action_activated.connect (on_action_activated);
+            
+            /* Activate completion */
+            set_completion (completion);
+            changed.connect (on_changed);
+        }
+        
+        /**
+         * Change selection to the given patient
+         */
+        public void select_patient (Patient patient) {
+            selected_patient = patient;
+            set_text (patient.get_complete_name ());
+        }
+        
+        public Patient get_patient () {
+            return selected_patient;
+        }
+        
+        /** 
+         * @brief Return true if this entry has a valid selection.
+         */
+        public bool is_valid () {
+            /* If no patient is selected the entry should be empty */
+            if (selected_patient == null) {
+                if (get_text () != "")
+                    return false;
+                else
+                    return true;
+            }
+                
+            return (get_text () == selected_patient.get_complete_name ());
+        }        
+        
+        /**
+         * @brief Callback function for the patient selection that matches the doctor
+         * if the key is a substring of its complete name. 
+         */
+        private bool completion_match_function (EntryCompletion compl, string key, TreeIter iter) {
+        	Value value;
+        	resource_manager.patient_list_store.get_value(iter, 0, out value);
+        	Patient pat = value as Patient;
+        	if (pat == null)
+        		return false;
+        	return (key.up () in pat.get_complete_name ().up ());
+        }
+        
+        /**
+         * @brief Callback called when the user select a patient
+         */
+        private bool on_match_selected (EntryCompletion compl, TreeModel model, TreeIter iter) {
+        	/* Get doctor associated with the selected completion */
+        	Value value;
+        	model.get_value (iter, PatientListStore.Field.COMPLETE_NAME, out value);
+        	set_text (value as string);
+        	model.get_value (iter, PatientListStore.Field.PATIENT, out value);
+        	
+        	/* Set selected doctor in this object to use it later */
+        	selected_patient = value as Patient;
+        	
+        	return true;
+        }
+        
+        /**
+         * @brief Create a new doctor on the fly with the name specifed in the 
+         * doctor_entry
+         */
+        private void on_action_activated (EntryCompletion editable, int action) {
+        	if (action != PatientCompletionAction.CREATE_NEW)
+            	return;
+            	
+            /* Create a new dialog precompiled with the user input until now */
+            string name = get_text ();
+            var dialog = new PatientEditor.with_name (resource_manager, Utils.capitalize (name));
+            if (dialog.run () == PatientEditor.Response.CANCEL) {
+            	dialog.destroy ();
+            	return;
+            }
+            
+            /* Set the newly created doctor as selected doctor */
+            selected_patient = dialog.created_patient;
+            set_text (selected_patient.get_complete_name ());
+            
+            /* Destroy the dialog */
+            dialog.destroy ();
+        }
+        
+        private void on_changed (Editable editable) {
+	        string patient_name = get_text ();
+	    	
+	    	/* Replace action */
+	    	completion.delete_action (PatientCompletionAction.CREATE_NEW);
+	    	if (patient_name != "")
+	        	completion.insert_action_text (PatientCompletionAction.CREATE_NEW,
+	        		@"Create a new patient named $(Utils.capitalize (patient_name))");
+	        else 
+	        	completion.insert_action_text (PatientCompletionAction.CREATE_NEW,
+	        		@"Create a new patient");
+        }   
+    }
+ }

=== modified file 'libclinica/PatientListView.vala'
--- libclinica/PatientListView.vala	2011-09-22 19:27:52 +0000
+++ libclinica/PatientListView.vala	2011-10-06 07:06:24 +0000
@@ -87,6 +87,13 @@
             
             /* Some styling, row in alternating colors */                
             set_rules_hint (true);
+            
+            /* Drag and drop support */
+            TargetEntry patient_target = { "PATIENT", 0, 1 };
+            enable_model_drag_source (Gdk.ModifierType.BUTTON1_MASK, { patient_target }, Gdk.DragAction.COPY);
+            drag_begin.connect ((context) => {
+                resource_manager.dragging_patient = get_selected_patient ();
+            });
         }
         
         private void on_name_cell_edited (CellRenderer renderer, string path, string new_text) {

=== modified file 'libclinica/ResourceManager.vala'
--- libclinica/ResourceManager.vala	2011-09-23 13:24:03 +0000
+++ libclinica/ResourceManager.vala	2011-10-06 07:06:24 +0000
@@ -23,7 +23,6 @@
 using Gtk;
 
 namespace Clinica {
-
  
     /**
      * @brief Type representing the callback for the error
@@ -38,6 +37,12 @@
     public class ResourceManager : GLib.Object {
     
         /**
+         * @brief The padding the should be used in windows
+         * in Clinica.
+         */
+        public const int PADDING = 6;
+    
+        /**
          * @brief Callback that manages errors
          * notification to the end user.
          */
@@ -61,6 +66,15 @@
          */
         public VisitListStore visit_list_store;
         
+        /**
+         * @brief EventListStore that holds the list of
+         * the events scheduled in clinica.
+         */
+        public EventListStore event_list_store;
+        
+        /**
+         * @brief Reference to a user interface
+         */
         public UserInterface user_interface;
         
         /**
@@ -105,6 +119,13 @@
         internal GLib.List<unowned MedicineSearchEngine> medicine_search_engines;
         
         /**
+         * @brief A pointer to the patient that is been dragged. Should
+         * be set on drag_begin by the treeview and reset to null by the
+         * drag destination handler. 
+         */
+		internal Patient? dragging_patient = null;
+        
+        /**
          * @brief Path to the UI files directory
          */
         private string ui_files_path;
@@ -114,13 +135,17 @@
         
         private bool is_local = false;
         
-        public string doctor_table = "doctors";
-        public string patient_table = "patients";
-        public string visits_table = "visits";
+        public const string doctor_table = "doctors";
+        public const string patient_table = "patients";
+        public const string visits_table = "visits";
+        public const string events_table = "events";
         
         /** SIGNALS **/
         public signal void medicine_search_engines_added (MedicineSearchEngine engine);
         public signal void medicine_search_engines_removed (MedicineSearchEngine engine);
+        
+        private const string [] supported_db_versions = { "0.1", "0.2" };
+        private const string db_version = "0.2";
     
         public ResourceManager (string program_name = "clinica", ErrorCallback? callback = null) {
             if (callback != null)
@@ -150,11 +175,11 @@
              * This may be used in future to perform one-time upgrade of the database */
             var version_db_file = Path.build_filename (local_config_directory, 
             										    ".clinica_db_version");
-            										    
+            										   
         	if (!FileUtils.test (version_db_file, FileTest.IS_REGULAR)) {
         		/* Create the file with the version of the database */
         		try {
-	        		FileUtils.set_contents(version_db_file, "0.1");
+	        		FileUtils.set_contents(version_db_file, db_version);
 	        	} catch (Error e) {
 	        		error (_("Error creating some configuration files, check permission on %s".printf(version_db_file)));
 	        	}
@@ -166,8 +191,36 @@
         		} catch (Error e) {
         			error (_("Error reading some configuration files, check permission on %s".printf(version_db_file)));
         		}
-        		if ("0.1" != content) {
-        			error (_("Version of the database is not compatible"));
+        		
+        		bool upgraded_correcty = true;
+        		if (db_version != content) {
+        		    /* Ask the user if he really wants to upgrade */
+        		    if (!ask_for_upgrade()) {
+        		        debug ("The user doesn't want to upgrade, exiting.");
+        		        Posix.exit (0);
+        		    }
+        		
+        		    upgraded_correcty = false;
+        		    /* Try to determine if the version of the local database is supported */
+        		    if (content in supported_db_versions) {
+        		        if (upgrade_database (content)) {
+        		            upgraded_correcty = true;
+        		            try {
+            		            FileUtils.set_contents (version_db_file, db_version);
+            		        } catch (GLib.Error e) {
+            		            error (_("Failure while settings new database version to %s").printf (db_version));
+                            }
+        		        } else {
+        		            error (_("Failure while upgrading database"));
+        		        }
+        		    }
+        		    else
+        			    error (_("Version of the database is not compatible"));
+        		}
+        		
+        		if (!upgraded_correcty) {
+      		        debug ("Upgrade failed, exiting.");
+        		    Posix.exit (1);
         		}
         	}
                                                 
@@ -207,7 +260,7 @@
              * use local schema file */
             if (is_local) {
                 debug ("Trying to compile my own gsettings schema");
-		try {
+            try {
 	            Process.spawn_sync (null, {Environment.find_program_in_path ("glib-compile-schemas"), 
                                                src_base}, 
                                         null, GLib.SpawnFlags.STDERR_TO_DEV_NULL, null);
@@ -217,7 +270,6 @@
                 Environment.set_variable ("GSETTINGS_SCHEMA_DIR", src_base, true);
                 Environment.set_variable ("GI_TYPELIB_PATH", 
                     Path.build_filename (src_base, "_build_", "libclinica"), true);
-	        debug (Environment.get_variable ("GI_TYPELIB_PATH"));
             }
             
             /* Create configuration */
@@ -231,6 +283,25 @@
                  load_plugins.begin ();
         }
         
+        private bool ask_for_upgrade () {
+            var mb = new MessageDialog (null,
+                DialogFlags.DESTROY_WITH_PARENT |
+                DialogFlags.MODAL,
+                MessageType.QUESTION,
+                ButtonsType.YES_NO,
+                "%s", "Database upgrade");
+            mb.format_secondary_markup (_("This is a version of Clinica newer than the one that created the\npatients database installed on the system.\nUsing this version requires upgrading the database, and\n<b>the old version will not be able to use it anymore</b>.\nDo you wish to perform this one-time upgrade?\n"));
+            mb.set_title (_("Upgrade database"));
+            if (mb.run () == ResponseType.YES) {
+                mb.destroy ();
+                return true;
+            }
+            else {
+                mb.destroy ();
+                return false;
+           }
+        }
+        
         /**
          * @brief Instantiate the plugin engine and load
          * all the plugins present in the directory
@@ -298,6 +369,34 @@
             }
         }
         
+        private bool upgrade_database (string db_version) {
+            /* Try to open the database first */
+            if (!(Database.open (database_path, out db) == OK)) {
+                error (_("Error upgrading database, please check your installation"));
+            }
+            
+            string sql;
+            Statement stmt;
+            int rc;
+            
+            /* Performing upgrade from 0.1 */
+            if (db_version == "0.1") {
+                /* We need to create the new table for the events */
+               sql = "CREATE TABLE IF NOT EXISTS events (id INTEGER PRIMARY KEY, title TEXT, description TEXT, venue TEXT, patient INTEGER, visit INTEGER, date TEXT);";
+               db.prepare (sql, -1, out stmt, null);
+               rc = stmt.step ();
+               
+               if (rc != DONE) {
+                   error (_("Error upgrading the database from version 0.1 to 0.2, sqlite exit code: %d".printf (rc)));
+                   return false;
+               } else {
+                   db_version = "0.2";
+               }
+            }
+            
+            return true;
+        }
+        
         /**
          * @brief Check that all the resources needed by Clinica
          * are actually available, and if they are not create them.
@@ -326,6 +425,7 @@
             doctor_list_store = new DoctorListStore (this);
             patient_list_store = new PatientListStore (this);
             visit_list_store = new VisitListStore (this);
+            event_list_store = new EventListStore (this);
         }
         
         

=== modified file 'libclinica/SqlDataType.vala'
--- libclinica/SqlDataType.vala	2011-09-22 19:27:52 +0000
+++ libclinica/SqlDataType.vala	2011-10-06 07:06:24 +0000
@@ -40,9 +40,30 @@
         protected unowned Database db;
         protected Statement stmt;
 
-        public SqlDataIterator (Database db, string table_name) {
-            this.db = db;
-            db.prepare (@"SELECT ID FROM $(table_name);", -1, out stmt, null);
+        public SqlDataIterator (Database db, string table_name, string? order_by = null, bool desc = false) {
+            this.db = db;
+            if (order_by == null)
+                db.prepare (@"SELECT ID FROM $(table_name);", -1, out stmt, null);
+            else {
+                if (desc)
+                    db.prepare (@"SELECT ID FROM $(table_name) ORDER by $(order_by) DESC;", -1, out stmt, null);
+                else
+                    db.prepare (@"SELECT ID FROM $(table_name) ORDER by $(order_by);", -1, out stmt, null);
+            }
+        }
+        
+        public SqlDataIterator.with_like (Database db, string table_name, string? order_by = null, 
+            bool desc = false, string where_stmt) {
+            this.db = db;
+            
+            if (order_by == null)
+                db.prepare (@"SELECT ID FROM $(table_name) WHERE $(where_stmt);", -1, out stmt, null);
+            else {
+                if (desc)
+                    db.prepare (@"SELECT ID FROM $(table_name) WHERE $(where_stmt) ORDER by $(order_by) DESC;", -1, out stmt, null);
+                else
+                    db.prepare (@"SELECT ID FROM $(table_name) WHERE $(where_stmt) ORDER by $(order_by);", -1, out stmt, null);
+            }
         }
         
         public SqlDataIterator iterator () {
@@ -184,7 +205,10 @@
         		return "";
         	}
             SqlColumn col = columns.get (field);
-            return col.v;
+            if (col.v != null)
+                return col.v;
+            else
+                return "";
         }
         
         public unowned int get_integer (string field) {
@@ -230,7 +254,11 @@
         		return;
         	}
         	SqlColumn col = columns.get (field);
-        	col.v = string.join(" ", 
+        	col.v = datetime_to_string (date);
+        }
+        
+        public static string datetime_to_string (DateTime date) {
+            return string.join(" ", 
         		date.get_year ().to_string (), 
         		"%.2d".printf (date.get_month ()), 
         		"%.2d".printf (date.get_day_of_month()), 
@@ -279,16 +307,21 @@
             sql += ") VALUES (";
 
             foreach (Map.Entry<string, SqlColumn> e in columns.entries) {
-                if (e.value.type == "TEXT")
-                    sql += @"$(quote(e.value.v)), ";
-                else
-                    sql += @"$(e.value.v), ";
+                if (e.value.v != null) {
+                    if (e.value.type == "TEXT")
+                        sql += @"$(quote(e.value.v)), ";
+                    else
+                        sql += @"$(e.value.v), ";
+                }
+                else {
+                    sql += ", ";
+                }
             }
             
             sql = sql[0:-2]; sql += ");";
             db.prepare (sql, -1, out stmt, null);
             if (stmt.step () != DONE) {
-                error (@"Error inserting values in the database $(table_name)");
+                error (@"Error inserting values in the database $(table_name)\n Error $(db.errcode()): $(db.errmsg ())");
             }
             
             /* If we save with ID set to 0 then the ID will be autodetermined

=== modified file 'libclinica/UserInterface.vala'
--- libclinica/UserInterface.vala	2011-09-22 19:27:52 +0000
+++ libclinica/UserInterface.vala	2011-10-06 07:06:24 +0000
@@ -45,6 +45,7 @@
 		
 		/* Windows */
 		private SettingsManager? settings_manager = null;
+		private CalendarWindow?  calendar_window  = null;
 		
 		private extern Peas.ExtensionSet setup_extension_set (ResourceManager resources, Peas.Engine engine);
 		internal Peas.ExtensionSet extension_set;
@@ -160,7 +161,11 @@
 		 */
 		[CCode (instance_pos = -1)]
 		public void show_calendar_window (GLib.Object? source = null) {
-		    debug ("Calendar is not available yet");
+		    if (calendar_window == null) {
+    		    calendar_window = new CalendarWindow (resource_manager);
+    		    calendar_window.destroy.connect ((cw) => calendar_window = null);
+    		}
+		    calendar_window.show_all ();
 		}
 		
 		/* CALLBACKS */

=== modified file 'libclinica/Visit.vala'
--- libclinica/Visit.vala	2011-09-22 19:27:52 +0000
+++ libclinica/Visit.vala	2011-10-06 07:06:24 +0000
@@ -29,11 +29,20 @@
 		private ResourceManager resource_manager;
 
         public VisitIterator (ResourceManager resources) {
-            base (resources.db, resources.visits_table);
-            resource_manager = resources;
-            db.prepare (@"SELECT ID FROM $(resources.visits_table) ORDER by date DESC;", -1, out stmt, null);
-        }
+            base (resources.db, resources.visits_table, "date", true);
+            resource_manager = resources;
+        }
+        
+        public VisitIterator.with_day (ResourceManager resources, DateTime day) {
+            DateTime day_after = day.add_days (1).add_minutes (-1);
+            base.with_like (resources.db, resources.visits_table, "date", true, 
+                "date BETWEEN '%s' AND '%s'".printf (SqlDataType.datetime_to_string (day),
+                                                     SqlDataType.datetime_to_string (day_after)));
+            resource_manager = resources;
+        }
+        
         public new VisitIterator iterator () { return this; }
+        
         public new Visit get () { 
             return new Visit.with_id (resource_manager, base.get ()); 
         }
@@ -149,6 +158,10 @@
         public static new VisitIterator all (ResourceManager resources) {
             return new VisitIterator (resources);
         }
+        
+        public static new VisitIterator for_day (ResourceManager resources, DateTime date) {
+            return new VisitIterator.with_day (resources, date);
+        }
        
     }
  

=== modified file 'libclinica/wscript'
--- libclinica/wscript	2011-09-25 09:49:30 +0000
+++ libclinica/wscript	2011-10-06 07:06:24 +0000
@@ -5,7 +5,7 @@
 
 def build(bld):
 	bld.add_group ("libclinica")
-	prog = bld(features = 'c cshlib glib2')
+	prog = bld(features = 'c cshlib glib2', valaflags=[ "-g" ])
 	bld.set_group ("libclinica")
 
 	# Symbolic name used to reference this object
@@ -26,7 +26,7 @@
 	prog.uselib = 'GOBJECT PEAS GTK+ GEE SQLITE PEASGTK'
 
 	# Vala packages to use
-	prog.packages = 'gtk+-3.0 Peas-1.0 PeasGtk-1.0 sqlite3 gee-1.0 config'
+	prog.packages = 'gtk+-3.0 Peas-1.0 PeasGtk-1.0 sqlite3 gee-1.0 config posix'
 	prog.vapi = 'clinica-0.2'
 
 	# Extra vapi dirs

=== modified file 'ui/patient_editor.glade'
--- ui/patient_editor.glade	2011-07-24 17:22:39 +0000
+++ ui/patient_editor.glade	2011-10-06 07:06:24 +0000
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
   <object class="GtkListStore" id="gender_store">
     <columns>
       <!-- column-name gender -->
@@ -22,12 +21,12 @@
     <property name="title" translatable="yes">Create a new patient</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
@@ -75,15 +74,20 @@
             <property name="can_focus">False</property>
             <property name="spacing">5</property>
             <child>
-              <object class="GtkImage" id="image1">
+              <object class="GtkEventBox" id="patient_eventbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="pixbuf">icons/patient.svg</property>
+                <child>
+                  <object class="GtkImage" id="patient_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixbuf">icons/patient.svg</property>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="padding">10</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -109,8 +113,6 @@
                 <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>
                 <signal name="focus-out-event" handler="clinica_patient_editor_on_name_focus_out_event" swapped="no"/>
               </object>
               <packing>
@@ -128,8 +130,6 @@
                 <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>
                 <signal name="focus-out-event" handler="clinica_patient_editor_on_surname_focus_out_event" swapped="no"/>
               </object>
               <packing>
@@ -221,8 +221,6 @@
                     <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>
@@ -253,8 +251,6 @@
                     <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>
@@ -285,8 +281,6 @@
                     <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>
@@ -308,8 +302,6 @@
                 <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="left_attach">1</property>
@@ -354,8 +346,6 @@
                 <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="left_attach">3</property>
@@ -385,8 +375,6 @@
                 <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="left_attach">1</property>
@@ -403,8 +391,6 @@
                 <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="left_attach">1</property>

=== modified file 'ui/window.glade'
--- ui/window.glade	2011-09-27 21:50:27 +0000
+++ ui/window.glade	2011-10-06 07:06:24 +0000
@@ -26,7 +26,7 @@
     <property name="title" translatable="yes">Clinica</property>
     <property name="window_position">center</property>
     <property name="default_width">700</property>
-    <property name="default_height">500</property>
+    <property name="default_height">400</property>
     <signal name="destroy" handler="clinica_user_interface_on_window_destroy" swapped="no"/>
     <child>
       <object class="GtkVBox" id="vbox1">

=== modified file 'wscript'
--- wscript	2011-10-03 16:31:06 +0000
+++ wscript	2011-10-06 07:06:24 +0000
@@ -13,10 +13,6 @@
 
 def options (opt):
     opt.load ('compiler_cc glib2 gnu_dirs')
-    # opt.add_option ('--destdir', action='store', default='',
-    # help = 'Install project in a different root',
-    # 1;2802;0c                dest = 'destdir')
-
 
 def put_config_h_in (ctx, destination):
     
@@ -56,11 +52,13 @@
     ctx.find_program ('glib-compile-schemas', var='GLIB_COMPILE_SCHEMAS')
     ctx.find_program ('g-ir-compiler', var = 'G_IR_COMPILER')
 
+    ctx.env.append_value ('VALAFLAGS', '-g')
+
     put_config_h_in (ctx, "libclinica")
     put_config_h_in (ctx, "clinica")
     put_config_h_in (ctx, "plugins")
 
-    ctx.env.append_value ('CFLAGS', '-DHAVE_CONFIG_H -include config.h'.split ())
+    ctx.env.append_value ('CFLAGS', '-g -DHAVE_CONFIG_H -include config.h'.split ())
 
 def build(bld):
     bld.add_subdirs('libclinica')
@@ -100,4 +98,11 @@
 
         
 def run(ctx):
+<<<<<<< TREE
     ctx.exec_command ("LD_LIBRARY_PATH=./_build_/libclinica GI_TYPELIB_PATH=./_build_/libclinica ./_build_/clinica/clinica")
+=======
+    ctx.exec_command ("LD_LIBRARY_PATH=./_build_/libclinica ./_build_/clinica/clinica")
+
+def debug (ctx):
+    ctx.exec_command ("LD_LIBRARY_PATH=./_build_/libclinica gdb --args ./_build_/clinica/clinica")
+>>>>>>> MERGE-SOURCE