From f4f5f83f8fb6b5bbe61a797424f8582598d2c338 Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Sat, 25 Jul 2015 00:45:15 +0100 Subject: [PATCH] db fix bugs --- lib/css/db.css | 71 +++++++++++++++++++++++++++++++------------- lib/php/db.php | 54 +++++++++++++++++++++++---------- lib/php/db/field.php | 2 +- lib/php/db/table.php | 51 ++++++++++++++++++++----------- 4 files changed, 124 insertions(+), 54 deletions(-) diff --git a/lib/css/db.css b/lib/css/db.css index c30e33cf..ba3bc968 100644 --- a/lib/css/db.css +++ b/lib/css/db.css @@ -7,7 +7,10 @@ border: solid 1px red !important; #db { } -#db .rows { +/* + List +*/ +.rows { margin: 0 auto; } @@ -17,6 +20,13 @@ border: solid 1px red !important; } .rows ul .edit { float: right; } +.rows tr.nav td { border: none; } + +td.name, +td.email, +td.phone { + white-space: nowrap; +} /* Menu @@ -25,11 +35,35 @@ border: solid 1px red !important; margin: 0 auto; padding: 0.8em 0.8em 0.8em 0.5em; padding: 0.5em 0.8em; + /* display: table; + */ +} + +.db.menu hr { + clear: both; + margin: 0; + padding: 0.5px 0; + border: none; + background-color: #f4f4f4; +} + +.db.menu .button, +.db.menu input, +.db.menu select, +.db.menu label +{ + margin: 0.3em 0.3em 0.3em 0; } -.db.menu label { - margin: 0.1em 0.1em 0 0.5em; +.db.menu span.i, +.db.menu span.i label { + float: left; +} +.db.menu span.i label { + display: inline-block; + width: 4em; + text-align: right; } .db.menu label:after { @@ -43,6 +77,18 @@ ul.db.menu { max-width: 7em; } +li.tables { + float: left; +} + +li.tables ul { + text-transform: capitalize; +} + +li.tables li { + font-size: 0.8em; +} + /* Edit */ @@ -73,24 +119,7 @@ form.db.edit .buttons { } form.db.edit .buttons input { +border: solid 1px red; width: auto; float: none; } - -li.tables { - float: left; -} - -li.tables ul { - text-transform: capitalize; -} - -li.tables li { - font-size: 0.8em; -} - -td.name, -td.email, -td.phone { - white-space: nowrap; -} diff --git a/lib/php/db.php b/lib/php/db.php index 9e6f1a3a..9546c7f6 100644 --- a/lib/php/db.php +++ b/lib/php/db.php @@ -10,12 +10,15 @@ require_once(dirname(__FILE__).'/functions.php'); require_once(dirname(__FILE__).'/db/table.php'); require_once(dirname(__FILE__).'/db/field.php'); if (!defined('DB_HTML_FORM_BUTTONS')) define('DB_HTML_FORM_BUTTONS','' - .'' - .'X' + .'' + #.'' + #.'' + .'X' .'' ); -if (!defined('DB_HTML_BUTTON_ADD')) define('DB_HTML_BUTTON_ADD',''); -if (!defined('DB_HTML_BUTTON_SUBMIT')) define('DB_HTML_BUTTON_SUBMIT',''); +#if (!defined('DB_HTML_BUTTON_SUBMIT')) define('DB_HTML_BUTTON_SUBMIT',''); +#if (!defined('DB_HTML_BUTTON_ADD')) define('DB_HTML_BUTTON_ADD','Add'); +#if (!defined('DB_HTML_BUTTON_ADD')) define('DB_HTML_BUTTON_ADD',''); class db { @@ -100,13 +103,27 @@ class db { return $this->conn->exec($sql); } - function query($sql,$o='') { - return $this->conn->query($sql); + function query($sql) { + # See: http://wiki.hashphp.org/PDO_Tutorial_for_MySQL_Developers + + try { + $r = $this->conn->query($sql); + } catch (PDOException $e) { + err(array("Db.query()",$e->getMessage(),$sql)); + $r = null; + } + + return $r; + } - function query2v($sql) { - $r = $this->conn->query($sql,PDO::FETCH_COLUMN,0); - return $r ? $r->fetch() : $r; + function row($sql,$sep=' ') { + #$sql = "SELECT * FROM addr LIMIT 1"; + $query = $this->query($sql); + $result = $query->fetch(PDO::FETCH_NUM); + if (!is_array($result)) return $result; + return join($sep,$result); + return join($sep,$query->fetch(PDO::FETCH_NUM)); } function query2a($sql) { @@ -218,15 +235,22 @@ EOF; $html = ' onchange="this.parentElement.submit()"'; $r = '
'.PHP_EOL; - if (!empty($table)) foreach ( array_keys($table->fields()) as $k ) { + if (!empty($table)) { + foreach ( array_keys($table->fields()) as $k ) { - $v = $this->p($k); + $v = $this->p($k); - $r .= '' - . '' - . '' - ; + $r .= '' + .'' + . '' + . '' + .'' + ; + } + #$r .= ''; + $r .= '
'; } /// Tables diff --git a/lib/php/db/field.php b/lib/php/db/field.php index 7f947e20..0c03d222 100644 --- a/lib/php/db/field.php +++ b/lib/php/db/field.php @@ -19,7 +19,7 @@ class field { function html_edit($value) { - echo '' + return '' .'' .PHP_EOL; diff --git a/lib/php/db/table.php b/lib/php/db/table.php index cbcee08d..513c0b9b 100644 --- a/lib/php/db/table.php +++ b/lib/php/db/table.php @@ -31,6 +31,10 @@ class table { 'debug', ); + function __destruct() { + foreach (get_object_vars($this) as $k=>$v) { unset($this->$k); }; + } + function __construct($name,$opt=array()) { // Connection @@ -72,7 +76,8 @@ class table { } else { err('table.sql(): Unknow db type: '.$this->db->type); } - $this->sql = $this->db->query($sql); + $this->sql = $this->db->row($sql); + #bye($this->sql); return $this->sql; } @@ -244,7 +249,8 @@ FROM pg_catalog.pg_attribute a WHERE a.attrelid = (SELECT c.oid FROM pg_catalog. foreach ($this->fields() as $name => $attr) { $field = new field($name,$attr); - $field->html_edit( (is_array($row) and array_key_exists($name,$row) ) ? $row[$name] : $attr['default']); + echo $field->html_edit( (is_array($row) and array_key_exists($name,$row) ) ? $row[$name] : $attr['default']); + unset($field); } } @@ -358,6 +364,7 @@ FROM pg_catalog.pg_attribute a WHERE a.attrelid = (SELECT c.oid FROM pg_catalog. } function form_criterias($opt=array()) { + // Legacy from sem - NB 25.07.15 echo ''.PHP_EOL; echo '
Use: '.join(' | ',$this->db->help_criterias).'
'.PHP_EOL; @@ -412,12 +419,11 @@ FROM pg_catalog.pg_attribute a WHERE a.attrelid = (SELECT c.oid FROM pg_catalog. foreach ($this->fields() as $k => $spec) { - $field = new field($k,$spec); - // No empty values $v = isset($values[$k]) ? $values[$k] : null; if (strcmp($v,'')==0 or $v=='!' or $v=='~') continue; // NB 03.07.15 $number = preg_match('/int|float|number|currency/',$spec['type']) ? 1 : 0; + $field = new field($k,$spec); $number = $field->is_num(); // Equal / Not Equal @@ -475,7 +481,8 @@ FROM pg_catalog.pg_attribute a WHERE a.attrelid = (SELECT c.oid FROM pg_catalog. $where[] = "$k$equal$v"; } - } + unset($field); + } #foreach fields $sql = ''; if ($where) $sql .= ' WHERE '.join(" $logic ",$where); @@ -716,18 +723,23 @@ FROM pg_catalog.pg_attribute a WHERE a.attrelid = (SELECT c.oid FROM pg_catalog. $colspan = 0; if (DB_HTML_EDIT) $colspan++; if (DB_HTML_DELETE) $colspan++; - if (DB_HTML_NAV_TOP) $html .= '' - . '' . DB_HTML_NAV_TOP . '' - . ''.PHP_EOL + if (DB_HTML_NAV_TOP) $html .= ''#''.PHP_EOL + .'' + . '' . DB_HTML_NAV_TOP . '' + . ''#.''.PHP_EOL + ; + + $html .= ''#''.PHP_EOL + .'' ; - $html .= ''; if (DB_HTML_EDIT) $html .= ''; + foreach (array_keys($this->fields()) as $f) { $html .= ''.$this->url_sort($f).''; } if (DB_HTML_DELETE) $html .= ''; - $html .= ''.PHP_EOL.''.PHP_EOL; + $html .= ''.PHP_EOL;#.''.PHP_EOL; return $html; } @@ -745,14 +757,19 @@ FROM pg_catalog.pg_attribute a WHERE a.attrelid = (SELECT c.oid FROM pg_catalog. } function rows_end_table($opt=array()) { - $html = PHP_EOL.''.PHP_EOL; - - if (!empty($opt['count'])) $html .= '' - . '' - . $this->nav($opt['count'],$opt['tot'],$opt['limit']) + #$html = ''.PHP_EOL; + + if (!empty($opt['count'])) $html .= ''#''.PHP_EOL + .'' + . '' + . $this->nav($opt['count'],$opt['tot'],$opt['limit']) . '' - . ''.PHP_EOL - ; + . ''.PHP_EOL + ;#.''.PHP_EOL; $html .= ''.PHP_EOL; return $html; -- 2.47.3