From: Joey Schulze Date: Sun, 28 Feb 2010 12:51:07 +0000 (+0100) Subject: Updates according to specification X-Git-Tag: 2010-06-02_customer~175 X-Git-Url: https://git.infodrom.org/?p=misc%2Fkostenrechnung;a=commitdiff_plain;h=fde995099786741800bb68a34045baddd093395b Updates according to specification --- diff --git a/masks/anbaugeraete.php b/masks/anbaugeraete.php index 2252411..ec96ea6 100644 --- a/masks/anbaugeraete.php +++ b/masks/anbaugeraete.php @@ -2,35 +2,50 @@ $mask = array( 'table' => 'anbaugeraete', + 'title' => 'Anbaugeräte', 'list' => array( 'id' => array( 'name' => 'ID', 'visible' => false, ), 'anbaugeraet' => array( - 'name' => 'Gerät', + 'name' => 'Anbaugerät', 'width' => 150, ), 'anbgerstdsatz' => array( - 'name' => 'Satz', + 'name' => 'Stundensatz', 'type' => 'number', 'specs' => "decPlaces: 2, ClassName: 'alignright'", - 'width' => 50, + 'width' => 90, ), +/* 'anbkst_intern' => array( 'name' => 'intern', 'type' => 'number', 'specs' => "decPlaces: 2, ClassName: 'alignright'", - 'width' => 50, + 'width' => 60, ), 'anbkst_extern' => array( 'name' => 'extern', 'type' => 'number', 'specs' => "decPlaces: 2, ClassName: 'alignright'", - 'width' => 50, + 'width' => 60, ), +*/ ), 'rows' => 20, + 'edit' => array( + 'anbaugeraet' => array( + 'name' => 'Anbaugerät', + 'type' => 'text', + 'size' => 25, + ), + 'anbgerstdsatz' => array( + 'name' => 'Stundensatz', + 'type' => 'number', + 'size' => 15, + ), + ), ); ?> diff --git a/masks/arbeitsarten.php b/masks/arbeitsarten.php index 94fecbe..48a127c 100644 --- a/masks/arbeitsarten.php +++ b/masks/arbeitsarten.php @@ -2,6 +2,7 @@ $mask = array( 'table' => 'arbeitsarten', + 'title' => 'Arbeitsarten', 'list' => array( 'id' => array( 'name' => 'ID', @@ -13,6 +14,13 @@ $mask = array( ), ), 'rows' => 20, + 'edit' => array( + 'arbeitsart' => array( + 'name' => 'Arbeitsart', + 'type' => 'text', + 'size' => 25, + ), + ), ); ?> diff --git a/masks/gebiet.php b/masks/gebiet.php index 02a5c95..f53293e 100644 --- a/masks/gebiet.php +++ b/masks/gebiet.php @@ -2,6 +2,7 @@ $mask = array( 'table' => 'gebiet', + 'title' => 'Gebiete', 'sort' => 1, 'list' => array( 'id' => array( @@ -10,10 +11,17 @@ $mask = array( ), 'gebiet' => array( 'name' => 'Gebiet', - 'width' => 200, + 'width' => 300, ), ), 'rows' => 20, + 'edit' => array( + 'gebiet' => array( + 'name' => 'Gebiet', + 'type' => 'text', + 'size' => 25, + ), + ), ); ?> diff --git a/masks/geraete.php b/masks/geraete.php index c06a1ea..06415a3 100644 --- a/masks/geraete.php +++ b/masks/geraete.php @@ -2,7 +2,7 @@ $mask = array( 'table' => 'gerate', - 'title' => 'Informationen zu Geräten', + 'title' => 'Geräte', 'sort' => 1, 'list' => array( 'id' => array( @@ -11,14 +11,15 @@ $mask = array( ), 'geraet' => array( 'name' => 'Gerät', - 'width' => 150, + 'width' => 200, ), 'gerstdsatz' => array( - 'name' => 'Satz', + 'name' => 'Stundensatz', 'type' => 'number', 'specs' => "decPlaces: 2, ClassName: 'alignright'", 'width' => 50, ), +/* 'geraetkst_intern' => array( 'name' => 'intern', 'type' => 'number', @@ -31,8 +32,21 @@ $mask = array( 'specs' => "decPlaces: 2, ClassName: 'alignright'", 'width' => 60, ), +*/ ), 'rows' => 20, + 'edit' => array( + 'geraet' => array( + 'name' => 'Gerät', + 'type' => 'text', + 'size' => 25, + ), + 'gerstdsatz' => array( + 'name' => 'Stundensatz', + 'type' => 'number', + 'size' => 15, + ), + ), ); ?> diff --git a/masks/kostenstellen.php b/masks/kostenstellen.php index 4091e7a..6d9388f 100644 --- a/masks/kostenstellen.php +++ b/masks/kostenstellen.php @@ -2,6 +2,7 @@ $mask = array( 'table' => 'kostenstellen', + 'title' => 'Kostenstellen', 'join' => array('gebiet ON kostenstellen.gebiet = gebiet.id'), 'list' => array( 'id' => array( @@ -11,12 +12,14 @@ $mask = array( ), 'kostenstelle' => array( 'name' => 'Kostenstelle', - 'width' => 150, + 'specs' => "filterUI: 't'", + 'width' => 220, ), 'gebiet' => array( 'name' => 'Gebiet', 'sql' => 'gebiet.gebiet', - 'width' => 200, + 'specs' => "filterUI: 's'", + 'width' => 220, ), 'laenge' => array( 'name' => 'Länge', @@ -24,8 +27,9 @@ $mask = array( 'specs' => "decPlaces: 2, ClassName: 'alignright'", 'width' => 65, ), +/* 'dienstlstg' => array( - 'name' => 'Dienst', + 'name' => 'Dienstleistung', # 'type' => 'number', 'specs' => "ClassName: 'alignright'", 'width' => 50, @@ -36,8 +40,26 @@ $mask = array( 'specs' => "ClassName: 'alignright'", 'width' => 50, ), +*/ ), 'rows' => 20, + 'edit' => array( + 'kostenstelle' => array( + 'name' => 'Kostenstelle', + 'type' => 'text', + 'size' => 25, + ), + 'gebiet' => array( + 'name' => 'Gebiet', + 'type' => 'select', + 'options' => 'SELECT id,gebiet AS text FROM gebiet ORDER BY gebiet', + ), + 'laenge' => array( + 'name' => 'Länge', + 'type' => 'number', + 'width' => 65, + ), + ), ); ?> diff --git a/masks/materialien.php b/masks/materialien.php index 3a99c81..0091da7 100644 --- a/masks/materialien.php +++ b/masks/materialien.php @@ -2,17 +2,25 @@ $mask = array( 'table' => 'materialien', + 'title' => 'Materialien', 'sort' => 1, + 'join' => array('einheiten ON materialien.einheit = einheiten.id'), 'list' => array( 'id' => array( 'name' => 'ID', 'visible' => false, + 'sql' => 'materialien.id', ), 'material' => array( 'name' => 'Material', - 'width' => 200, + 'width' => 270, 'specs' => "filterUI: 't'", ), + 'einheit' => array( + 'name' => 'Einheit', + 'width' => 70, + 'sql' => 'einheiten.einheit', + ), 'preis' => array( 'name' => 'Preis', 'type' => 'number', @@ -27,10 +35,17 @@ $mask = array( 'type' => 'text', 'size' => 50, ), + 'einheit' => array( + 'name' => 'Einheit', + 'type' => 'select', + 'options' => 'SELECT id,einheit AS text FROM einheiten ORDER BY einheit', + 'size' => 10, + ), 'preis' => array( 'name' => 'Preis', 'type' => 'text', - 'size' => 20, + 'size' => 10, + 'comment' => 'immer brutto', ), ), );