From 23609060a20b6305ce973a3b8e3e648bc7e0e14a Mon Sep 17 00:00:00 2001 From: Joey Schulze Date: Fri, 12 Mar 2010 13:07:06 +0100 Subject: [PATCH] Format name differently --- masks/akkord_mitarbeiter.php | 2 +- masks/arbeitsberichte.php | 2 +- masks/overview_gewaesser.php | 2 +- masks/overview_kosten.php | 2 +- masks/overview_mitarbeiter.php | 2 +- masks/overview_stunden.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/masks/akkord_mitarbeiter.php b/masks/akkord_mitarbeiter.php index b228872..63caa24 100644 --- a/masks/akkord_mitarbeiter.php +++ b/masks/akkord_mitarbeiter.php @@ -35,7 +35,7 @@ $mask = array( ), 'personal' => array( 'name' => 'Mitarbeiter', - 'sql' => "vorname || ' ' || name", + 'sql' => "name || ', ' || vorname", 'width' => 150, 'specs' => "filterUI: 's'", ), diff --git a/masks/arbeitsberichte.php b/masks/arbeitsberichte.php index 6ad35d2..601535d 100644 --- a/masks/arbeitsberichte.php +++ b/masks/arbeitsberichte.php @@ -347,7 +347,7 @@ $mask = array( 'sql' => 'SELECT id,name AS text FROM ordnungen ORDER BY id', ), 'mitarbeiter' => array( - 'sql' => 'SELECT id,vorname || \' \' || name AS text FROM personal WHERE aktiv = 1 ORDER BY text', + 'sql' => 'SELECT id,name || \', \' || vorname AS text FROM personal WHERE aktiv = 1 ORDER BY text', ), 'geraete' => array( 'sql' => 'SELECT id,geraet AS text FROM gerate ORDER BY text', diff --git a/masks/overview_gewaesser.php b/masks/overview_gewaesser.php index 04c4275..b1b5fa7 100644 --- a/masks/overview_gewaesser.php +++ b/masks/overview_gewaesser.php @@ -27,7 +27,7 @@ $mask = array( ), 'personal' => array( 'name' => 'Personal', - 'sql' => "personal.personal || ', ' || personal.vorname", + 'sql' => "personal.name || ', ' || personal.vorname", 'width' => 150, 'specs' => "filterUI: 't'", ), diff --git a/masks/overview_kosten.php b/masks/overview_kosten.php index 24fe1ce..48da6ae 100644 --- a/masks/overview_kosten.php +++ b/masks/overview_kosten.php @@ -62,7 +62,7 @@ $mask = array( ), 'personal' => array( 'name' => 'Mitarbeiter', - 'sql' => "personal.vorname || ' ' || personal.name", + 'sql' => "personal.name || ', ' || personal.vorname", 'width' => 150, 'specs' => "filterUI: 's'", ), diff --git a/masks/overview_mitarbeiter.php b/masks/overview_mitarbeiter.php index 893f88c..7f7833c 100644 --- a/masks/overview_mitarbeiter.php +++ b/masks/overview_mitarbeiter.php @@ -35,7 +35,7 @@ $mask = array( ), 'personal' => array( 'name' => 'Mitarbeiter', - 'sql' => "personal.vorname || ' ' || personal.name", + 'sql' => "personal.name || ', ' || personal.vorname", 'width' => 150, 'specs' => "filterUI: 's'", ), diff --git a/masks/overview_stunden.php b/masks/overview_stunden.php index 70bd7da..5bce405 100644 --- a/masks/overview_stunden.php +++ b/masks/overview_stunden.php @@ -72,7 +72,7 @@ $mask = array( ), 'personal' => array( 'name' => 'Mitarbeiter', - 'sql' => "personal.vorname || ' ' || personal.name", + 'sql' => "personal.name || ', ' || personal.vorname", 'width' => 150, 'specs' => "filterUI: 's'", ), -- 2.20.1