From ecaeb1d62d463938a742394a9f430d473e62dffe Mon Sep 17 00:00:00 2001 From: Thomas Mudrunka Date: Thu, 8 Dec 2011 06:00:39 +0100 Subject: [PATCH] Zkracen vypis tridy item, prodejce prekrten na dodavatele --- index.php | 17 ++++++++++++++--- locale/cs/messages.inc.php | 10 +++++----- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/index.php b/index.php index e19792e..d782466 100755 --- a/index.php +++ b/index.php @@ -368,12 +368,23 @@ EOF; $table = $table_sorted; } + function table_hide_columns(&$table, $class) { //TODO: Move to build_query_select() !!! :-))) + $fields_hide = array( + 'item' => array('model_descript','model_price_in','model_price_out','model_barcode','model_countable','model_reserve','model_eshop_hide','room_descript','room_author','producer_name','producer_note','vendor_note') + ); + //print_r($table); die(); + if(isset($fields_hide[$class])) foreach($table as $id => $row) { + foreach($fields_hide[$class] as $field) unset($table[$id][$field]); + } + } + function render_item_table($table,$class=false) { if(empty($table)) return '

'.T('holy primordial emptiness is all you can find here...').'


'; $this->table_add_images($table); if($class) $this->table_add_relations($table,$class); $this->table_add_barcodes($table); $this->table_collapse($table); + if($class) $this->table_hide_columns($table,$class); $this->table_sort($table); return $this->table($table); } @@ -499,7 +510,7 @@ class Sklad_DB extends PDO { 'item' => array('model', 'category', 'producer', 'vendor', 'room', 'status'), 'model' => array('category', 'producer') ); //TODO Autodetect using foreign keys? - $search_fields = array( + $fields_search = array( 'item' => array('item_id','item_serial','model_name','model_barcode','model_descript','producer_name','vendor_name'), 'model' => array('model_id','model_name','model_barcode','model_descript','producer_name') ); //TODO Autodetect @@ -517,9 +528,9 @@ class Sklad_DB extends PDO { //WHERE/REGEXP if($search) { $search = $this->quote($search); - if(!isset($search_fields[$class])) die(trigger_error(T("Can't search in $class table yet :-("))); //TODO: post_redirect_get + if(!isset($fields_search[$class])) die(trigger_error(T("Can't search in $class table yet :-("))); //TODO: post_redirect_get $sql_search = ''; - foreach($search_fields[$class] as $column) $sql_search .= "OR $column REGEXP $search "; + foreach($fields_search[$class] as $column) $sql_search .= "OR $column REGEXP $search "; $where[] = "FALSE $sql_search"; } elseif($id) $where[] = "$class$suffix_id = $id"; if(!$history && $this->contains_history($class)) $where[] = $class.'_valid_till=0'; diff --git a/locale/cs/messages.inc.php b/locale/cs/messages.inc.php index d68a4d2..00710ce 100644 --- a/locale/cs/messages.inc.php +++ b/locale/cs/messages.inc.php @@ -11,7 +11,7 @@ $LOCALE_MESSAGES = array( 'Record not found!' => 'Položka nenalezena!', 'holy primordial emptiness is all you can find here...' => 'věz, že zde nenajdeš více než nekonečnou laskavost prapůvodní prázdnoty...', - 'item_id' => 'č.položky', + 'item_id' => '#', 'item_serial' => 'Sériové č.', 'item_quantity' => 'Množství', 'item_price_in' => 'Nákupní cena', @@ -40,8 +40,8 @@ $LOCALE_MESSAGES = array( 'producer_name' => 'Výrobce', 'producer_note' => 'Poznámka o výrobci', - 'vendor_name' => 'Prodejce', - 'vendor_note' => 'Poznámka o prodejci', + 'vendor_name' => 'Dodavatel', + 'vendor_note' => 'Poznámka o dodavateli', 'status_name' => 'Stav', 'category_name' => 'Kategorie', @@ -49,7 +49,7 @@ $LOCALE_MESSAGES = array( 'model_relations' => 'Souvisejici s timto modelem', 'category_relations' => 'V teto kategorii', 'producer_relations' => 'Od tohoto vyrobce', - 'vendor_relations' => 'Od tohoto prodejce', + 'vendor_relations' => 'Od tohoto dodavatele', 'room_relations' => 'V tomto skladu', 'status_relations' => 'V tomto stavu', '_relations' => ' jinde', @@ -61,7 +61,7 @@ $LOCALE_MESSAGES = array( 'producer' => '[výrobce]', 'room' => '[sklad]', 'status' => '[stav]', - 'vendor' => '[prodejce]', + 'vendor' => '[dodavatel]', 'category' => '[kategorie]', 'model' => '[model]', 'user' => '[uživatel]', -- 2.30.2