From 9e0b882f922c6972dcac6540cbca915143daf290 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 1 Oct 2014 15:34:54 +0000
Subject: [PATCH] Add refresh(id, type) function to et2_gantt widget

---
 etemplate/js/et2_widget_gantt.js | 49 ++++----------------------------
 1 file changed, 5 insertions(+), 44 deletions(-)

diff --git a/etemplate/js/et2_widget_gantt.js b/etemplate/js/et2_widget_gantt.js
index 88937b0fbe..d87da78521 100644
--- a/etemplate/js/et2_widget_gantt.js
+++ b/etemplate/js/et2_widget_gantt.js
@@ -100,9 +100,6 @@ var et2_gantt = et2_valueWidget.extend([et2_IResizeable,et2_IInput],
 		// Gantt instance
 		this.gantt = null;
 
-		// Flag to avoid re-rendering several times while loading
-		this.gantt_loading = false;
-
 		// DOM Nodes
 		this.filters = $j(document.createElement("div"))
 			.addClass('et2_gantt_header');
@@ -127,6 +124,8 @@ var et2_gantt = et2_valueWidget.extend([et2_IResizeable,et2_IInput],
 	destroy: function() {
 		if(this.gantt !== null)
 		{
+			// Unselect task before removing it, or we get errors later if it is accessed
+			this.gantt.unselectTask();
 			this.gantt.detachAllEvents();
 			this.gantt.clearAll();
 			this.gantt = null;
@@ -267,9 +266,6 @@ var et2_gantt = et2_valueWidget.extend([et2_IResizeable,et2_IInput],
 	set_value: function(value) {
 		if(this.gantt == null) return false;
 
-
-		if(console.time) console.time("Gantt set_value");
-
 		// Unselect task before removing it, or we get errors later if it is accessed
 		this.gantt.unselectTask();
 
@@ -299,21 +295,8 @@ var et2_gantt = et2_valueWidget.extend([et2_IResizeable,et2_IInput],
 				data: value.data || [],
 				links: value.links || []
 			};
-
-			this.config.start_date = value.start_date ? new Date(value.start_date) : null;
-			this.config.end_date = value.end_date ? new Date(value.end_date) : null;
-			
-			// Set flag so events don't trigger an extra render
-			gantt_widget.gantt_loading = true;
-			if(gantt_widget.getWidgetById('start_date'))
-			{
-				gantt_widget.getWidgetById('start_date').set_value(value.start_date || null);
-			}
-			if(gantt_widget.getWidgetById('end_date'))
-			{
-				gantt_widget.getWidgetById('end_date').set_value(value.end_date || null);
-			}
-			
+			this.config.start_date = value.start_date || null;
+			this.config.end_date = value.end_date || null;
 			this.parse(safe_value);
 
 			gantt_widget.gantt_loading = false;
@@ -719,19 +702,7 @@ var et2_gantt = et2_valueWidget.extend([et2_IResizeable,et2_IInput],
 		// Bind AJAX for dynamic expansion
 		// TODO: This could be improved
 		this.gantt.attachEvent("onTaskOpened", function(id, item) {
-			var task = this.getTask(id);
-			// Node children are already there & displayed
-			var value = gantt_widget.getInstanceManager().getValues(gantt_widget.getInstanceManager().widgetContainer);
-
-			this.showCover();
-			var request = gantt_widget.egw().json(gantt_widget.options.autoload,
-				[id,value,task.parent||false],
-				function(data) {
-					this.parse(data);
-					this.hideCover();
-				},
-				this,true,this
-			).sendRequest();
+			gantt_widget.refresh(id);
 		});
 
 		// Filters
@@ -797,9 +768,6 @@ var et2_gantt = et2_valueWidget.extend([et2_IResizeable,et2_IInput],
 			var widget_change = _widget.change;
 
 			var change = function(_node) {
-				// Stop if we're in the middle of loading
-				if(gantt_widget.gantt_loading) return false;
-				
 				// Call previously set change function
 				var result = widget_change.call(_widget,_node);
 
@@ -816,13 +784,6 @@ var et2_gantt = et2_valueWidget.extend([et2_IResizeable,et2_IInput],
 						gantt_widget.gantt.config.start_date = start && start.getValue() ? new Date(start.getValue()) : gantt_widget.gantt.getState().min_date;
 						// End date is inclusive
 						gantt_widget.gantt.config.end_date = end && end.getValue() ? new Date(new Date(end.getValue()).valueOf()+86400000) : gantt_widget.gantt.getState().max_date;
-
-						/*
-						// TODO: some weirdness here when we start changing min_date
-						gantt_widget.gantt.config.start_date = start && start.getValue() ? new Date(start.getValue()) : gantt_widget.stored_state.min_date || gantt_widget.gantt.getState().min_date;
-						// End date is inclusive
-						gantt_widget.gantt.config.end_date = end && end.getValue() ? new Date(new Date(end.getValue()).valueOf()+86400000) : gantt_widget.stored_state.max_date || gantt_widget.gantt.getState().max_date;
-						 */
 						if(gantt_widget.gantt.config.end_date <= gantt_widget.gantt.config.start_date)
 						{
 							gantt_widget.gantt.config.end_date = null;