diff --git a/html/js/managetable.js b/html/js/managetable.js
index 507d6d7c6..1993ad524 100644
--- a/html/js/managetable.js
+++ b/html/js/managetable.js
@@ -118,20 +118,28 @@ var ManageTable = function (p_table_name)
console.log(req.responseText);
try {
var xml = req.responseXML;
- var status = getElementsByTagName("status");
+ var status = xml.getElementsByTagName("status");
var ctl = xml.getElementsByTagName("ctl");
var html = xml.getElementsByTagName("html");
+ var ctl_row = xml.getElementsByTagName("ctl_row");
if (status.length == 0 || ctl.length == 0 || html.length == 0)
{
throw "Invalid answer " + req.responseText;
}
+ var answer=[];
answer['status'] = getNodeText(status[0]);
+ console.log(answer);
answer['ctl'] = getNodeText(ctl[0]);
+ console.log(answer);
+ answer['ctl_row'] = getNodeText(ctl_row[0]);
+ console.log(answer);
answer['html'] = getNodeText(html[0]);
+ console.log(answer);
return answer;
} catch (e) {
console.log("erreur parsing");
+ console.log(e.message);
throw e;
}
};
@@ -144,68 +152,94 @@ var ManageTable = function (p_table_name)
*/
this.save = function (form_id) {
waiting_box();
- var form = $F(form_id);
- this.param_add(form);
- var here=this;
+ try {
+ this.param['action'] = 'save';
+ console.log(form_id);
+ var form = $(form_id).serialize(true);
+ console.log(form);
+ this.param_add(form);
+ var here=this;
+ } catch (e) {
+ alert(e.message);
+ console.log(e.message);
+ return false;
+ }
new Ajax.Request(this.callback, {
parameters: this.param,
method: "post",
onSuccess: function (req) {
+ try {
/// Display the result of the update
/// or add , the name of the row in the table has the
/// if p_ctl_row does not exist it means it is a new
/// row , otherwise an update
var answer=here.parseXML(req);
+ console.log(answer);
if (answer ['status'] == 'OK') {
- if ($(answer['ctl'])) {
- $(answer['ctl']).update(answer['html']);
+ if ($(answer['ctl_row'])) {
+ $(answer['ctl_row']).update(answer['html']);
} else {
var new_row = new Element("tr");
- new_row.id = answer['ctl'];
+ new_row.id = answer['ctl_row'];
new_row.innerHTML = answer['html'];
- $("tb" + req.control).appendChild(new_row);
+ $("tb"+answer['ctl']).appendChild(new_row);
}
} else {
console.error("Error in save");
throw "error in save";
}
-
-
+ remove_waiting_box();
+ $("dtr").hide();
+ } catch (e) {
+ alert(e.message);
+ console.log(e.message);
+ return false;
+ }
}
- })
+ });
+ return false;
};
/**
*@brief call the ajax with action delete
*@param id (pk) of the data row
*/
- this.delete = function (p_id, p_ctl_row) {
+ this.delete = function (p_id, p_ctl) {
this.param['p_id'] = p_id;
this.param['action'] = 'delete';
+ this.param['ctl'] = p_ctl;
var here=this;
- new Ajax.Request(this.callback, {
- parameters: this.parm,
- method: "get",
- onSuccess: function (req) {
- here.parseXML(req);
- if (here.answer['status'] == 'OK') {
- $(here.answer['ctl']).hide();
- }
+ smoke.confirm("Confirmez ?",
+ function (e)
+ {
+ if (e ) {
+ new Ajax.Request(here.callback, {
+ parameters: here.param,
+ method: "get",
+ onSuccess: function (req) {
+ var answer = here.parseXML(req);
+ if (answer['status'] == 'OK') {
+ var x=answer['ctl_row'];
+ $(x).hide();
+ }
+ }
+ });
}
-
- });
+ }) ;
+
};
/**
*@brief display a dialog box with the information
* of the data row
*@param id (pk) of the data row
+ *@param ctl name of the object
*/
- this.input = function (p_id, p_ctl_row) {
+ this.input = function (p_id, p_ctl) {
waiting_box();
this.param['p_id'] = p_id;
this.param['action'] = 'input';
- this.param['ctl_row'] = p_ctl_row;
+ this.param['ctl'] = p_ctl;
var control = this.control;
var here = this;
// display the form to enter data
@@ -225,10 +259,10 @@ var ManageTable = function (p_table_name)
var pos = calcy(250);
$(obj.id).setStyle({position: "absolute", top: pos + 'px', width: "auto", "margin-left": "10%"});
console.log("set dgb content")
- $(obj.id).update(req.responseText);
+ $(obj.id).update(x['html']);
} catch (e) {
- console.log(e.getMessage());
- smoke.alert("ERREUR " + e.getMessage());
+ console.log(e.message);
+ smoke.alert("ERREUR " + e.message);
}
}
diff --git a/include/database/class_noalyss_sql.php b/include/database/class_noalyss_sql.php
index d1d5d8279..34eb68948 100644
--- a/include/database/class_noalyss_sql.php
+++ b/include/database/class_noalyss_sql.php
@@ -110,7 +110,7 @@ abstract class Noalyss_SQL
public function get($p_string)
{
if (array_key_exists($p_string, $this->type)) {
- return $this->$idx;
+ return $this->$p_string;
}
else
throw new Exception(__FILE__.":".__LINE__.$p_string.'Erreur attribut inexistant '.$p_string);
@@ -309,6 +309,20 @@ abstract class Noalyss_SQL
}
return $this;
}
+ /**
+ * Turn an object (row) into an array
+ * @return array
+ */
+ public function to_array()
+ {
+ $array=array();
+ foreach ($this->name as $key=> $value)
+ {
+
+ $array[$key]=$this->$key;
+ }
+ return $array;
+ }
/**
* @brief retrieve array of object thanks a condition
@@ -373,6 +387,15 @@ abstract class Noalyss_SQL
$count=$this->cn->get_value("select count(*) from $this->table".$p_where,$p_array);
return $count;
}
+ /**
+ * Count the number of record with the id ,
+ * @return integer 0 doesn't exist , 1 exists
+ */
+ public function exist() {
+ $pk=$this->primary_key;
+ $count=$this->cn->get_value("select count(*) from ".$this->table." where ".$this->primary_key."=$1",array($this->$pk));
+ return $count;
+ }
}
?>
diff --git a/include/lib/class_html_input.php b/include/lib/class_html_input.php
index 3b64d9a4b..e5d1e2ffc 100755
--- a/include/lib/class_html_input.php
+++ b/include/lib/class_html_input.php
@@ -552,6 +552,18 @@ class HtmlInput
return $r;
}
+ /**
+ * @brief transform a json to hidden
+ * @param json $p_json
+ */
+ static function json_to_hidden($p_json)
+ {
+ $aJson=json_decode($p_json);
+ foreach($aJson as $key=>$value)
+ {
+ echo HtmlInput::hidden($key, $value);
+ }
+ }
/**
*transform $_GET data to hidden
*@param $array is an of indices
diff --git a/include/lib/class_manage_table_sql.php b/include/lib/class_manage_table_sql.php
index b46a10f7d..2b9354817 100644
--- a/include/lib/class_manage_table_sql.php
+++ b/include/lib/class_manage_table_sql.php
@@ -25,7 +25,33 @@
* @brief Purpose is to propose a librairy to display a table content
* and allow to update and delete row , handle also the ajax call
* thanks the script managetable.js
- * @see ManageTable
+
+ *
+ * Code for ajax , here we see the ajax_input for creating a dg box
+ @code
+ $objet->set_pk($p_id);
+ $objet->set_object_name($objet_name);
+
+ // Set the ajax to call
+ $objet->set_callback("ajax.php");
+
+ // Build the json object for JS
+ $plugin_code=HtmlInput::default_value_request("plugin_code","");
+ $ac=HtmlInput::default_value_request("ac","");
+ $sa=HtmlInput::default_value_request("sa","");
+ $aJson=array("gDossier"=>Dossier::id(),
+ "ac"=>$ac,
+ "plugin_code"=>$plugin_code,
+ "sa"=>$sa,
+ "sb"=>$sb
+ );
+ $json=json_encode($aJson);
+ $objet->param_set($json);
+
+ // Display the box
+ $xml=$objet->ajax_input();
+ @endcode
+ * @see ManageTable.js
*/
class Manage_Table_SQL
{
@@ -34,10 +60,14 @@ class Manage_Table_SQL
private $a_label_displaid; //!< Label of the col. of the datarow
private $a_order; //!< order of the col
private $a_prop; //!< property for each col.
+ private $a_type; //!< Type of the column : date , select ... Only in input
+ private $a_select; //!< Possible value if a_type is a SELECT
private $object_name; //!< Object_name is used for the javascript
private $row_delete; //!< Flag to indicate if rows can be deleted
private $row_update; //!< Flag to indicate if rows can be updated
+ private $row_append; //!< Flag to indicate if rows can be added
private $json_parameter; //!< Default parameter to add (gDossier...)
+
const UPDATABLE=1;
const VISIBLE=2;
@@ -56,25 +86,63 @@ class Manage_Table_SQL
$this->a_label_displaid[$value]=$value;
$this->a_order[$order]=$value;
$this->a_prop[$value]=self::UPDATABLE|self::VISIBLE;
+ $this->a_type[$value]=$this->table->type[$value];
+ $this->a_select[$value]=null;
$order++;
}
$this->object_name=uniqid("tbl");
$this->row_delete=TRUE;
$this->row_update=TRUE;
+ $this->row_append=TRUE;
$this->callback="ajax.php";
$this->json=json_encode(array("gDossier"=>Dossier::id(),
"op"=>"managetable"));
}
-
+
+ /**
+ * @brief set the type of a column , it will change in the input db box , the
+ * select must supply an array of possible values [val=> , label=>] with
+ * the variable $this->key_name->a_value
+ * @param $p_key col name
+ * @param $p_type is SELECT NUMERIC TEXT or DATE
+ * @param $p_array if type is SELECT an array is expected
+ */
+ function set_col_type($p_key, $p_value, $p_array=NULL)
+ {
+ if (!isset($this->a_type[$p_key]))
+ throw new Exception("invalid key $p_key");
+
+ if (!in_array($p_value,
+ array("text", "numeric", "date", "select", "timestamp")))
+ throw new Exception("invalid type $p_value");
+
+ $this->a_type[$p_key]=$p_value;
+ $this->a_select[$p_key]=$p_array;
+ }
+ /**
+ * @brief return the type of a column
+ * @param $p_key col name
+ * @see set_col_type
+ */
+ function get_col_type($p_key)
+ {
+ if (!isset($this->a_type[$p_key]))
+ throw new Exception("invalid key");
+
+ return $this->a_type[$p_key];
+ }
+
/**
* Get the object name
* @details : return the object name , it is useful it
* the javascript will return coded without the create_js_script function
* @see create_js_script
*/
- function get_js_variable () {
+ function get_js_variable()
+ {
return $this->object_name;
}
+
/**
* Set the parameter of the object (gDossier, ac, plugin_code...)
* @detail By default , only gDossier will be set . The default value
@@ -82,9 +150,11 @@ class Manage_Table_SQL
* @param string with json format $p_json
*
*/
- function param_set($p_json) {
- $this->json=$p_json;
+ function param_set($p_json)
+ {
+ $this->json_parameter=$p_json;
}
+
/**
* @brief set the callback function that is passed to javascript
* @param $p_file : callback file by default ajax.php
@@ -95,21 +165,30 @@ class Manage_Table_SQL
}
/**
- * @brief we must create first the javascript if we want to update or delete
- * row. It is the default script .
+ * @brief we must create first the javascript if we want to update, insert
+ * or delete rows. It is the default script .
*/
function create_js_script()
- {
+ {
echo "
";
}
+ /**
+ * Set the object_name
+ * @param string $p_object_name name of the JS var, used in ajax response
+ */
+ function set_object_name($p_object_name)
+ {
+ $this->object_name=$p_object_name;
+ }
+
/**
* @brief set a column of the data row updatable or not
* @param string $p_key data column
@@ -120,11 +199,11 @@ class Manage_Table_SQL
if (!$this->a_prop[$p_key])
throw new Exception(__FILE__.":".__LINE__."$p_key invalid index");
if ($p_value==False)
- $this->a_prop[$p_key]=$this->a_prop[$p_key] - self::UPDATABLE;
+ $this->a_prop[$p_key]=$this->a_prop[$p_key]-self::UPDATABLE;
elseif ($p_value==True)
$this->a_prop[$p_key]=$this->a_prop[$p_key]|self::UPDATABLE;
else
- throw new Exception ("set_property_updatable [ $p_value ] incorrect");
+ throw new Exception("set_property_updatable [ $p_value ] incorrect");
}
/**
@@ -136,6 +215,37 @@ class Manage_Table_SQL
return $this->row_update;
}
+ /**
+ * @brief return false if the append of the row is forbidden
+ */
+ function can_append_row()
+ {
+
+ return $this->row_append;
+ }
+
+ /**
+ * @brief Enable or disable the deletion of rows
+ * @param $p_value Boolean : true enable the row to be deleted
+ */
+ function set_delete_row($p_value)
+ {
+ if ($p_value!==True&&$p_value!==False)
+ throw new Exception("Valeur invalide set_delete_row [$p_value]");
+ $this->row_delete=$p_value;
+ }
+
+ /**
+ * @brief Enable or disable the appending of rows
+ * @param $p_value Boolean : true enable the row to be appended
+ */
+ function set_append_row($p_value)
+ {
+ if ($p_value!==True&&$p_value!==False)
+ throw new Exception("Valeur invalide set_append_row [$p_value]");
+ $this->row_append=$p_value;
+ }
+
/**
* @brief Enable or disable the updating of rows
* @param $p_value Boolean : true enable the row to be updated
@@ -155,25 +265,15 @@ class Manage_Table_SQL
return $this->row_delete;
}
- /**
- * @brief Enable or disable the deleting of rows
- * @param $p_value Boolean : true enable the row to be deleted
- */
- function set_delete_row($p_value)
- {
- if ($p_value!==True&&$p_value!==False)
- throw new Exception("Valeur invalide set_delete_row [$p_value]");
- $this->row_delete=$p_value;
- }
-
/**
* @brief return True if the column is updatable otherwise false
* @param $p_key data column
*/
function get_property_updatable($p_key)
{
- $val= $this->a_prop[$p_key] & self::UPDATABLE ;
- if ( $val == self::UPDATABLE) return true;
+ $val=$this->a_prop[$p_key]&self::UPDATABLE;
+ if ($val==self::UPDATABLE)
+ return true;
return false;
}
@@ -187,11 +287,11 @@ class Manage_Table_SQL
if (!$this->a_prop[$p_key])
throw new Exception(__FILE__.":".__LINE__."$p_key invalid index");
if ($p_value==False)
- $this->a_prop[$p_key]=$this->a_prop[$p_key] -self::VISIBLE;
+ $this->a_prop[$p_key]=$this->a_prop[$p_key]-self::VISIBLE;
elseif ($p_value==True)
$this->a_prop[$p_key]=$this->a_prop[$p_key]|self::VISIBLE;
else
- throw new Exception ("set_property_updatable [ $p_value ] incorrect");
+ throw new Exception("set_property_updatable [ $p_value ] incorrect");
}
/**
@@ -200,8 +300,9 @@ class Manage_Table_SQL
*/
function get_property_visible($p_key)
{
- $val = $this->a_prop[$p_key] & self::VISIBLE ;
- if ( $val === self::VISIBLE) return true;
+ $val=$this->a_prop[$p_key]&self::VISIBLE;
+ if ($val===self::VISIBLE)
+ return true;
return false;
}
@@ -286,8 +387,25 @@ class Manage_Table_SQL
*/
function display_table()
{
- $ret=$this->table->seek();
+ $ret=$this->table->seek("order by ".$this->table->primary_key);
$nb=Database::num_row($ret);
+ if ($this->can_append_row()==TRUE)
+ {
+ echo HtmlInput::button_action(_("Ajout"),
+ sprintf("%s.input('-1','%s')", $this->object_name,
+ $this->object_name));
+ }
+ $nb_order=count($this->a_order);
+ $virg=""; $result="";
+ for ($e=0; $e<$nb_order; $e++)
+ {
+ if ($this->get_property_visible($this->a_order[$e])==TRUE)
+ {
+ $result.=$virg."$e";
+ $virg=",";
+ }
+ }
+ echo HtmlInput::filter_table("tb".$this->object_name, $result, 1);
printf('
', $this->object_name);
for ($i=0; $i<$nb; $i++)
{
@@ -298,6 +416,13 @@ class Manage_Table_SQL
$row=Database::fetch_array($ret, $i);
$this->display_row($row);
}
+ echo "