[update] version 3.3.0

Author: AlexKlimenkov

README.md

@@ -1,4 +1,4 @@
-dhtmlxGantt v.3.2
+dhtmlxGantt v.3.3
 =================
 
 dhtmlxGantt is an open source JavaScript Gantt chart that helps you illustrate a project schedule in a nice-looking chart. It can show the dependencies between tasks as lines and allows you to set up different relationships between tasks (finish-to-start, start-to-start, end-to-end). dhtmlxGantt provides flexible API and a large number of event handles, which gives you the freedom to customize it for your needs. 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "gantt",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "homepage": "http://dhtmlx.com/docs/products/dhtmlxGantt/",
   "description": "An open source JavaScript Gantt chart that helps you illustrate a project schedule in a nice-looking chart.",
   "main": [

codebase/connector/base_connector.php

@@ -282,38 +282,38 @@ public function to_xml_end(){
 	Can be used on its own to provide raw data.	
 **/
 class Connector {
+
+    private $id_seed=0; //!< default value, used to generate auto-IDs
+    private $db; //!< db connection resource
+
 	protected $config;//DataConfig instance
 	protected $request;//DataRequestConfig instance
 	protected $names;//!< hash of names for used classes
 	protected $encoding="utf-8";//!< assigned encoding (UTF-8 by default) 
 	protected $editing=false;//!< flag of edit mode ( response for dataprocessor )
+    protected $updating=false;//!< flag of update mode ( response for data-update )
+    protected $dload;//!< flag of dyn. loading mode
+    protected $data_separator = "\n";
+    protected $live_update = false; // actions table name for autoupdating
+    protected $live_update_data_type = "DataUpdate";
+    protected $extra_output="";//!< extra info which need to be sent to client side
+    protected $options=array();//!< hash of OptionsConnector
+    protected $as_string = false; // render() returns string, don't send result in response
+    protected $simple = false; // render only data without any other info
+    protected $filters;
+    protected $sorts;
+    protected $mix;
+    protected $order = false;
 
 	public static $filter_var="dhx_filter";
 	public static $sort_var="dhx_sort";
 	public static $kids_var="dhx_kids";
 
-	public $model=false;
-
-	private $updating=false;//!< flag of update mode ( response for data-update )
-	private $db; //!< db connection resource
-	protected $dload;//!< flag of dyn. loading mode
-	public $access;  //!< AccessMaster instance
-	protected $data_separator = "\n";
-	
-	public $sql;	//DataWrapper instance
-	public $event;	//EventMaster instance
-	public $limit=false;
-	
-	private $id_seed=0; //!< default value, used to generate auto-IDs
-	protected $live_update = false; // actions table name for autoupdating
-	protected $extra_output="";//!< extra info which need to be sent to client side
-	protected $options=array();//!< hash of OptionsConnector 
-	protected $as_string = false; // render() returns string, don't send result in response
-	protected $simple = false; // render only data without any other info
-	protected $filters;
-	protected $sorts;
-	protected $mix;
-	protected $order = false;
+    public $model=false;
+    public $access;  //!< AccessMaster instance
+    public $sql;	//DataWrapper instance
+    public $event;	//EventMaster instance
+    public $limit=false;
 
 	/*! constructor
 		
@@ -419,7 +419,7 @@ public function configure($table,$id="",$fields=false,$extra=false,$relation_id=
                 $id = $info["key"];
         }
 		$this->config->init($id,$fields,$extra,$relation_id);
-		if (strpos(trim($table), " ")!==false)
+		if (is_string($table) && strpos(trim($table), " ")!==false)
 			$this->request->parse_sql($table);
 		else
 			$this->request->set_source($table);
@@ -810,6 +810,10 @@ public function set_options($name,$options){
 		$this->options[$name]=$options;
 	}
 
+    public function get_options() {
+        return $this->options;
+    }
+
 
 	public function insert($data) {
 		$action = new DataAction('inserted', false, $data);
@@ -851,7 +855,7 @@ public function update($data) {
 			url used for update notifications
 	*/	
 	public function enable_live_update($table, $url=false){
-		$this->live_update = new DataUpdate($this->sql, $this->config, $this->request, $table,$url);
+        $this->live_update = new $this->live_update_data_type($this->sql, $this->config, $this->request, $table,$url, array("connector" => $this));
         $this->live_update->set_event($this->event,$this->names["item_class"]);
 		$this->event->attach("beforeOutput", 		Array($this->live_update, "version_output"));
 		$this->event->attach("beforeFiltering", 	Array($this->live_update, "get_updates"));

codebase/connector/combo_connector.php

@@ -25,7 +25,7 @@ function select(){
 	function to_xml_start(){
 		if ($this->skip) return "";
 
-		return "<option ".($this->selected?"selected='true'":"")."value='".$this->xmlentities($this->get_id())."'><![CDATA[".$this->data[$this->config->text[0]["name"]]."]]>";
+		return "<option ".($this->selected?"selected='true' ":"")."value='".$this->xmlentities($this->get_id())."'><![CDATA[".$this->data[$this->config->text[0]["name"]]."]]>";
 	}
 	/*! return self as XML string, ending part
 	*/

codebase/connector/db_common.php

@@ -8,6 +8,8 @@
 /*! manager of data request
 **/
 class DataRequestConfig{
+
+    private $action_mode = "";
 	private $filters;	//!< array of filtering rules
 	private $relation=false;	//!< ID or other element used for linking hierarchy
 	private $sort_by;	//!< sorting field 
@@ -52,6 +54,7 @@ public function copy($proto){
 		$this->relation		=$proto->get_relation();
         $this->user = $proto->user;
         $this->version = $proto->version;
+        $this->action_mode = $proto->action_mode;
 	}
 
 	/*! convert self to string ( for logs )
@@ -69,6 +72,15 @@ public function __toString(){
 		return $str;
 	}
 
+    public function set_action_mode($action_mode) {
+        $this->action_mode = $action_mode;
+        return $this;
+    }
+
+    public function get_action_mode() {
+        return $this->action_mode;
+    }
+
 	/*! returns set of filtering rules
 		@return 
 			set of filtering rules

codebase/connector/db_phpcake.php

@@ -11,75 +11,76 @@
 
 if you plan to use it for Oracle - use Oracle connection type instead
 **/
-class PHPCakeDBDataWrapper extends ArrayDBDataWrapper{
-	public function select($sql){
-		$source = $sql->get_source();
-		if (is_array($source))	//result of find
-			$res = $source;
-		else
-			$res = $this->connection->find("all");
-
-		$temp = array();
-		if (sizeof($res)){
-			$name = get_class($this->connection);
-			for ($i=sizeof($res)-1; $i>=0; $i--)
-				$temp[]=&$res[$i][$name];
-		}
-		return new ArrayQueryWrapper($temp);
-	}
-
-	protected function getErrorMessage(){
-		$errors = $this->connection->invalidFields();
-		$text = array();
-		foreach ($errors as $key => $value){
-			$text[] = $key." - ".$value[0];
-		}
-		return implode("\n", $text);
-	}
-
-	public function insert($data,$source){
-		$name = get_class($this->connection);
-		$save = array(); 
-		$temp_data = $data->get_data();
-		unset($temp_data[$this->config->id['db_name']]);
-		unset($temp_data["!nativeeditor_status"]);
-		$save[$name] = $temp_data;
-
-		if ($this->connection->save($save)){
-			$data->success($this->connection->getLastInsertID());	
-		} else {
-			$data->set_response_attribute("details", $this->getErrorMessage());
-			$data->invalid();
-		}
-	}
-	public function delete($data,$source){
-		$id = $data->get_id();
-		$this->connection->delete($id);
-		$data->success();
-	}
-	public function update($data,$source){
-		$name = get_class($this->connection);
-		$save = array(); 
-		$save[$name] = &$data->get_data();
-
-		if ($this->connection->save($save)){
-			$data->success();
-		} else {
-			$data->set_response_attribute("details", $this->getErrorMessage());
-			$data->invalid();
-		}
-	}	
-		
-
-	public function escape($str){
-		throw new Exception("Not implemented");
-	}
-	public function query($str){
-		throw new Exception("Not implemented");
-	}
-	public function get_new_id(){
-		throw new Exception("Not implemented");
-	}
+class PHPCakeDBDataWrapper extends ArrayDBDataWrapper {
+
+    public function select($source) {
+        $sourceData = $source->get_source();
+        if(is_array($sourceData))	//result of find
+            $query = $sourceData;
+        else
+            $query = $sourceData->find("all");
+
+        $temp = array();
+        foreach($query as $row)
+            $temp[] = $row->toArray();
+
+        return new ArrayQueryWrapper($temp);
+    }
+
+    protected function getErrorMessage() {
+        $errors = $this->connection->invalidFields();
+        $text = array();
+        foreach ($errors as $key => $value){
+            $text[] = $key." - ".$value[0];
+        }
+        return implode("\n", $text);
+    }
+
+    public function insert($data, $source) {
+        $sourceData = $source->get_source();
+        $obj = $sourceData->newEntity();
+        $obj = $this->fillModel($obj, $data);
+        $savedResult = $source->get_source()->save($obj);
+        $data->success($savedResult->get($this->config->id["db_name"]));
+    }
+
+    public function delete($data, $source) {
+        $sourceData = $source->get_source();
+        $obj = $sourceData->get($data->get_id());
+        $source->get_source()->delete($obj);
+    }
+
+    public function update($data, $source) {
+        $sourceData = $source->get_source();
+        $obj = $sourceData->get($data->get_id());
+        $obj = $this->fillModel($obj, $data);
+        $sourceData->save($obj);
+    }
+
+    private function fillModel($obj, $data) {
+        //Map data to model object.
+        for($i = 0; $i < count($this->config->text); $i++) {
+            $step=$this->config->text[$i];
+            $obj->set($step["name"], $data->get_value($step["name"]));
+        }
+
+        if($relation = $this->config->relation_id["db_name"])
+            $obj->set($relation, $data->get_value($relation));
+
+        return $obj;
+    }
+
+    public function escape($str){
+        throw new Exception("Not implemented");
+    }
+
+    public function query($str){
+        throw new Exception("Not implemented");
+    }
+
+    public function get_new_id(){
+        throw new Exception("Not implemented");
+    }
 }
 
 ?>

codebase/connector/db_phpcake2.php

@@ -0,0 +1,85 @@
+<?php
+/*
+	@author dhtmlx.com
+	@license GPL, see license.txt
+*/
+require_once("db_common.php");
+
+//DataProcessor::$action_param ="dhx_editor_status";
+
+/*! Implementation of DataWrapper for PDO
+
+if you plan to use it for Oracle - use Oracle connection type instead
+**/
+class PHPCake2DBDataWrapper extends ArrayDBDataWrapper{
+	public function select($sql){
+		$source = $sql->get_source();
+		if (is_array($source))	//result of find
+			$res = $source;
+		else
+			$res = $this->connection->find("all");
+
+		$temp = array();
+		if (sizeof($res)){
+			$name = get_class($this->connection);
+			for ($i=sizeof($res)-1; $i>=0; $i--)
+				$temp[]=&$res[$i][$name];
+		}
+		return new ArrayQueryWrapper($temp);
+	}
+
+	protected function getErrorMessage(){
+		$errors = $this->connection->invalidFields();
+		$text = array();
+		foreach ($errors as $key => $value){
+			$text[] = $key." - ".$value[0];
+		}
+		return implode("\n", $text);
+	}
+
+	public function insert($data,$source){
+		$name = get_class($this->connection);
+		$save = array(); 
+		$temp_data = $data->get_data();
+		unset($temp_data[$this->config->id['db_name']]);
+		unset($temp_data["!nativeeditor_status"]);
+		$save[$name] = $temp_data;
+
+		if ($this->connection->save($save)){
+			$data->success($this->connection->getLastInsertID());	
+		} else {
+			$data->set_response_attribute("details", $this->getErrorMessage());
+			$data->invalid();
+		}
+	}
+	public function delete($data,$source){
+		$id = $data->get_id();
+		$this->connection->delete($id);
+		$data->success();
+	}
+	public function update($data,$source){
+		$name = get_class($this->connection);
+		$save = array(); 
+		$save[$name] = &$data->get_data();
+
+		if ($this->connection->save($save)){
+			$data->success();
+		} else {
+			$data->set_response_attribute("details", $this->getErrorMessage());
+			$data->invalid();
+		}
+	}	
+		
+
+	public function escape($str){
+		throw new Exception("Not implemented");
+	}
+	public function query($str){
+		throw new Exception("Not implemented");
+	}
+	public function get_new_id(){
+		throw new Exception("Not implemented");
+	}
+}
+
+?>