From 7a4b0c60f1c56afa1087d1ad18113a7ca566f327 Mon Sep 17 00:00:00 2001 From: Joey Schulze Date: Sat, 6 Mar 2010 22:18:17 +0100 Subject: [PATCH] Remove sorting permission for several columns --- masks/anbaugeraete.php | 6 +- masks/einsatz.php | 139 --------------------------------- masks/geraete.php | 6 +- masks/kostenstellen.php | 2 +- masks/materialien.php | 3 +- masks/overview_gewaesser.php | 18 ++--- masks/overview_mitarbeiter.php | 1 - masks/personal.php | 9 ++- masks/sys_group_mask.php | 2 +- masks/sys_mask.php | 17 +--- masks/sys_menu.php | 11 +-- masks/sys_user.php | 11 --- 12 files changed, 27 insertions(+), 198 deletions(-) delete mode 100644 masks/einsatz.php diff --git a/masks/anbaugeraete.php b/masks/anbaugeraete.php index ac21063..87b4788 100644 --- a/masks/anbaugeraete.php +++ b/masks/anbaugeraete.php @@ -15,19 +15,19 @@ $mask = array( 'anbgerstdsatz' => array( 'name' => 'Stundensatz', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright'", + 'specs' => "decPlaces: 2, ClassName: 'alignright', canSort: false", 'width' => 90, ), 'anbkst_intern' => array( 'name' => 'intern', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright'", + 'specs' => "decPlaces: 2, ClassName: 'alignright', canSort: false", 'width' => 60, ), 'anbkst_extern' => array( 'name' => 'extern', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright'", + 'specs' => "decPlaces: 2, ClassName: 'alignright', canSort: false", 'width' => 60, ), ), diff --git a/masks/einsatz.php b/masks/einsatz.php deleted file mode 100644 index 839c197..0000000 --- a/masks/einsatz.php +++ /dev/null @@ -1,139 +0,0 @@ - 'einsatz', - 'join' => array('personal ON einsatz.personal = personal.id', - 'gebiet ON einsatz.gebiet = gebiet.id', - 'gerate ON einsatz.geraet = gerate.id', - 'anbaugeraete ON einsatz.anbaugeraet = anbaugeraete.id', - 'arbeitsarten ON einsatz.arbeiten = arbeitsarten.id', - 'kostenstellen ON einsatz.kostenstelle = kostenstellen.id', - ), - 'list' => array( - 'id' => array( - 'name' => 'ID', - 'visible' => false, - 'sql' => 'einsatz.id', - ), - 'datum' => array( - 'name' => 'Datum', - 'type' => 'date', - 'width' => 70, - ), - 'ordnung' => array( - 'name' => 'Ord', - 'type' => 'number', - 'specs' => "ClassName: 'alignright'", - 'width' => 20, - 'visible' => false, - ), - 'stunden' => array( - 'name' => 'Std', - 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright'", - 'width' => 50, - ), - 'personal' => array( - 'name' => 'Personal', - 'sql' => 'personal.personal', - 'width' => 150, - 'specs' => "filterUI: 't'", - ), - 'kostenstelle' => array( - 'name' => 'Kostenstelle', - 'sql' => 'kostenstellen.kostenstelle', - 'width' => 150, - 'specs' => "filterUI: 't'", - ), - 'gebiet' => array( - 'name' => 'Gebiet', - 'sql' => 'gebiet.gebiet', - 'width' => 150, - 'specs' => "filterUI: 't'", - ), - 'geraet' => array( - 'name' => 'Gerät', - 'sql' => 'gerate.geraet', - 'width' => 150, - 'specs' => "filterUI: 't'", - ), - 'anbaugeraet' => array( - 'name' => 'Anbaugerät', - 'sql' => 'anbaugeraete.anbaugeraet', - 'width' => 150, - 'specs' => "filterUI: 't'", - ), - 'arbeit' => array( - 'name' => 'Arbeit', - 'sql' => 'arbeitsarten.arbeitsart', - 'width' => 150, - 'specs' => "filterUI: 't'", - ), - 'geraetstunden' => array( - 'name' => 'Std/G', - 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright'", - 'width' => 50, - ), - 'anbaugeraetstunden' => array( - 'name' => 'Std/A', - 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright'", - 'width' => 50, - ), - 'pers_kosten' => array( - 'name' => 'Kosten/P', - 'type' => 'number', - 'specs' => "decPlaces: 4, ClassName: 'alignright'", - 'width' => 80, - ), - 'geraet_kosten' => array( - 'name' => 'Kosten/G', - 'type' => 'number', - 'specs' => "decPlaces: 4, ClassName: 'alignright'", - 'width' => 80, - ), - 'anbauger_kosten' => array( - 'name' => 'Kosten/A', - 'type' => 'number', - 'specs' => "decPlaces: 4, ClassName: 'alignright'", - 'width' => 80, - ), - 'akkord' => array( - 'name' => 'Akkord', - 'type' => 'number', - 'specs' => "ClassName: 'alignright'", - 'width' => 20, - 'visible' => false, - ), - 'anbauger_kstint' => array( - 'name' => 'KstInt/A', - 'type' => 'number', - 'specs' => "decPlaces: 4, ClassName: 'alignright'", - 'width' => 80, - ), - 'geraet_kstint' => array( - 'name' => 'KstInt/G', - 'type' => 'number', - 'specs' => "decPlaces: 4, ClassName: 'alignright'", - 'width' => 80, - ), - 'hhjahreinsatz' => array( - 'name' => 'Jahreseinsatz', - 'type' => 'number', - 'specs' => "ClassName: 'alignright'", - 'width' => 30, - 'visible' => false, - ), - 'eingabe' => array( - 'name' => 'Edit', - 'type' => 'date', - 'width' => 70, - 'visible' => false, - ), -# gewaesser | integer | - ), - 'rows' => 20, - ); - -?> diff --git a/masks/geraete.php b/masks/geraete.php index ba77766..2e4bb40 100644 --- a/masks/geraete.php +++ b/masks/geraete.php @@ -16,19 +16,19 @@ $mask = array( 'gerstdsatz' => array( 'name' => 'Stundensatz', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright'", + 'specs' => "decPlaces: 2, ClassName: 'alignright', canSort: false", 'width' => 50, ), 'geraetkst_intern' => array( 'name' => 'interne Kosten', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright'", + 'specs' => "decPlaces: 2, ClassName: 'alignright', canSort: false", 'width' => 60, ), 'geraetkst_extern' => array( 'name' => 'externe Kosten', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright'", + 'specs' => "decPlaces: 2, ClassName: 'alignright', canSort: false", 'width' => 60, ), ), diff --git a/masks/kostenstellen.php b/masks/kostenstellen.php index e91075a..df4e68b 100644 --- a/masks/kostenstellen.php +++ b/masks/kostenstellen.php @@ -24,7 +24,7 @@ $mask = array( 'laenge' => array( 'name' => 'Länge', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright'", + 'specs' => "decPlaces: 2, ClassName: 'alignright', canSort: false", 'width' => 65, ), ), diff --git a/masks/materialien.php b/masks/materialien.php index f3d1b4e..4d2a6a4 100644 --- a/masks/materialien.php +++ b/masks/materialien.php @@ -20,11 +20,12 @@ $mask = array( 'name' => 'Einheit', 'width' => 70, 'sql' => 'einheiten.einheit', + 'specs' => 'canSort: false', ), 'preis' => array( 'name' => 'Preis', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright'", + 'specs' => "decPlaces: 2, ClassName: 'alignright', canSort: false", 'width' => 50, ), ), diff --git a/masks/overview_gewaesser.php b/masks/overview_gewaesser.php index 5d861aa..db02413 100644 --- a/masks/overview_gewaesser.php +++ b/masks/overview_gewaesser.php @@ -34,13 +34,13 @@ $mask = array( 'stunden' => array( 'name' => 'Stunden', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' '", + 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' ', canSort: false", 'width' => 50, ), 'stunde' => array( 'name' => 'Stunde', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' '", + 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' ', canSort: false", 'width' => 50, 'sql' => 'stunden * personal.persstdsatz', ), @@ -48,7 +48,7 @@ $mask = array( 'name' => 'Lfdm', 'visible' => false, 'type' => 'number', - 'specs' => "decPlaces: 3, ClassName: 'alignright', suffix: ' '", + 'specs' => "decPlaces: 3, ClassName: 'alignright', suffix: ' ', canSort: false", 'width' => 50, 'sql' => '(stunden * personal.persstdsatz) / laenge', ), @@ -62,13 +62,13 @@ $mask = array( 'geraetstunden' => array( 'name' => 'Stunden', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' '", + 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' ', canSort: false", 'width' => 50, ), 'geraetstunde' => array( 'name' => 'Stunde', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' '", + 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' ', canSort: false", 'width' => 50, 'sql' => 'geraetstunden * gerate.gerstdsatz', ), @@ -76,7 +76,7 @@ $mask = array( 'name' => 'Lfdm', 'visible' => false, 'type' => 'number', - 'specs' => "decPlaces: 3, ClassName: 'alignright', suffix: ' '", + 'specs' => "decPlaces: 3, ClassName: 'alignright', suffix: ' ', canSort: false", 'width' => 50, 'sql' => '(geraetstunden * gerate.gerstdsatz) / laenge', ), @@ -90,13 +90,13 @@ $mask = array( 'anbaugeraetstunden' => array( 'name' => 'Stunden', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' '", + 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' ', canSort: false", 'width' => 50, ), 'anbaugeraetstunde' => array( 'name' => 'Stunde', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' '", + 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' ', canSort: false", 'width' => 50, 'sql' => 'anbaugeraetstunden * anbaugeraete.anbgerstdsatz', ), @@ -104,7 +104,7 @@ $mask = array( 'name' => 'Lfdm', 'visible' => false, 'type' => 'number', - 'specs' => "decPlaces: 3, ClassName: 'alignright', suffix: ' '", + 'specs' => "decPlaces: 3, ClassName: 'alignright', suffix: ' ', canSort: false", 'width' => 50, 'sql' => '(anbaugeraetstunden * anbaugeraete.anbgerstdsatz) / laenge', ), diff --git a/masks/overview_mitarbeiter.php b/masks/overview_mitarbeiter.php index 652541d..9967c69 100644 --- a/masks/overview_mitarbeiter.php +++ b/masks/overview_mitarbeiter.php @@ -44,7 +44,6 @@ $mask = array( 'visible' => false, 'sql' => 'einsatz.id', ), -# Personal, Arbeitsarten, Stunden 'datum' => array( 'name' => 'Datum', 'type' => 'date', diff --git a/masks/personal.php b/masks/personal.php index e7da770..9f75b6a 100644 --- a/masks/personal.php +++ b/masks/personal.php @@ -35,6 +35,7 @@ $mask = array( 'name' => 'Telefon', 'width' => 100, 'visible' => false, + 'specs' => 'canSort: false', ), 'email' => array( 'name' => 'E-Mail', @@ -44,19 +45,19 @@ $mask = array( 'persstdsatz' => array( 'name' => 'Satz', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' '", + 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' ', canSort: false", 'width' => 50, ), 'jahresakkord' => array( 'name' => 'Akkord', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' '", + 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' ', canSort: false", 'width' => 60, ), 'akkord_vorjahr' => array( 'name' => 'Akkord Vorjahr', 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' '", + 'specs' => "decPlaces: 2, ClassName: 'alignright', suffix: ' ', canSort: false", 'width' => 60, 'visible' => false, ), @@ -64,7 +65,7 @@ $mask = array( 'name' => 'Zuschlag', 'visible' => false, 'type' => 'number', - 'specs' => "decPlaces: 2, ClassName: 'alignright'", + 'specs' => "decPlaces: 2, ClassName: 'alignright', canSort: false", 'width' => 70, ), ), diff --git a/masks/sys_group_mask.php b/masks/sys_group_mask.php index b5923f0..58efa14 100644 --- a/masks/sys_group_mask.php +++ b/masks/sys_group_mask.php @@ -63,7 +63,7 @@ $mask = array( 'edit' => array( 'name' => 'Edit', 'width' => 40, - 'specs' => "ClassName: 'aligncenter'", + 'specs' => "ClassName: 'aligncenter', canSort: false", 'sql' => 'sys_mask.edit', ), 'option' => array( diff --git a/masks/sys_mask.php b/masks/sys_mask.php index d4ba390..0931e0c 100644 --- a/masks/sys_mask.php +++ b/masks/sys_mask.php @@ -54,28 +54,15 @@ $mask = array( 'edit' => array( 'name' => 'Edit', 'width' => 40, - 'specs' => "ClassName: 'aligncenter'", + 'specs' => "ClassName: 'aligncenter', canSort: false", ), 'priority' => array( 'name' => 'Priorität', 'width' => 60, 'type' => 'number', - 'specs' => "ClassName: 'alignright'", + 'specs' => "ClassName: 'alignright', canSort: false", 'sql' => 'sys_mask.priority', ), - 'sys_user' => array( - 'name' => 'Bearb.', - 'width' => 50, - 'visible' => false, - 'sql' => 'sys_mask.sys_user', - ), - 'sys_edit' => array( - 'name' => 'Geändert', - 'width' => 80, - 'type' => 'date', - 'visible' => false, - 'sql' => 'sys_mask.sys_edit', - ), ), 'rows' => 20, 'edit' => array( diff --git a/masks/sys_menu.php b/masks/sys_menu.php index a7c7fd6..2864c67 100644 --- a/masks/sys_menu.php +++ b/masks/sys_menu.php @@ -16,16 +16,7 @@ $mask = array( 'name' => 'Priorität', 'width' => 30, 'type' => 'number', - 'specs' => "ClassName: 'alignright'", - ), - 'sys_user' => array( - 'name' => 'Bearb.', - 'width' => 50, - ), - 'sys_edit' => array( - 'name' => 'Geändert', - 'width' => 80, - 'type' => 'date', + 'specs' => "ClassName: 'alignright', canSort: false", ), ), 'rows' => 20, diff --git a/masks/sys_user.php b/masks/sys_user.php index 358975f..7c23e14 100644 --- a/masks/sys_user.php +++ b/masks/sys_user.php @@ -28,17 +28,6 @@ $mask = array( 'width' => 70, 'sql' => 'sys_group.name', ), - 'sys_user' => array( - 'name' => 'Bearb.', - 'width' => 50, - 'sql' => 'sys_user.sys_user', - ), - 'sys_edit' => array( - 'name' => 'Geändert', - 'width' => 80, - 'type' => 'date', - 'sql' => 'sys_user.sys_edit', - ), ), 'rows' => 20, 'edit' => array( -- 2.20.1