Ansprechpersonen: Feld "Funktion/Position"

diff --git a/SL/CT.pm b/SL/CT.pm
index 082afdf2572d763bfbdb4b0c918695192f997b53..a196095250081795ac5e3c449eabf53cca6875e2 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -551,7 +551,7 @@ sub _save_contact {
 
   my @columns = qw(cp_title cp_givenname cp_name cp_email cp_phone1 cp_phone2 cp_abteilung cp_fax
                    cp_mobile1 cp_mobile2 cp_satphone cp_satfax cp_project cp_privatphone cp_privatemail cp_birthday cp_gender
 
   my @columns = qw(cp_title cp_givenname cp_name cp_email cp_phone1 cp_phone2 cp_abteilung cp_fax
                    cp_mobile1 cp_mobile2 cp_satphone cp_satfax cp_project cp_privatphone cp_privatemail cp_birthday cp_gender

-                   cp_street cp_zipcode cp_city);
+                   cp_street cp_zipcode cp_city cp_function);

   my @values  = map(
     {
       if ( $_ eq 'cp_gender' ) {
   my @values  = map(
     {
       if ( $_ eq 'cp_gender' ) {


@@ -1123,7 +1123,7 @@ sub search_contacts {
     'vcnumber'  => 'vcnumber, cp_name, cp_givenname',
     );
 
     'vcnumber'  => 'vcnumber, cp_name, cp_givenname',
     );
 

-  my %sortcols  = map { $_ => 1 } qw(cp_name cp_givenname cp_phone1 cp_phone2 cp_mobile1 cp_email cp_street cp_zipcode cp_city vcname vcnumber);
+  my %sortcols  = map { $_ => 1 } qw(cp_name cp_givenname cp_phone1 cp_phone2 cp_mobile1 cp_email cp_street cp_zipcode cp_city cp_function vcname vcnumber);

 
   my $order_by  = $sortcols{$::form->{sort}} ? $::form->{sort} : 'cp_name';
   $::form->{sort} = $order_by;
 
   my $order_by  = $sortcols{$::form->{sort}} ? $::form->{sort} : 'cp_name';
   $::form->{sort} = $order_by;

diff --git a/SL/DB/MetaSetup/Contact.pm b/SL/DB/MetaSetup/Contact.pm
index 322f826479ef22944dfec8417b654ef0c0b184f7..20dae29d52b6a9eebf6878d28c6e85d1af5b2b14 100644 (file)
--- a/SL/DB/MetaSetup/Contact.pm
+++ b/SL/DB/MetaSetup/Contact.pm
@@ -34,6 +34,7 @@ __PACKAGE__->meta->setup(
     cp_zipcode     => { type => 'text' },
     cp_city        => { type => 'text' },
     cp_birthday    => { type => 'date' },
     cp_zipcode     => { type => 'text' },
     cp_city        => { type => 'text' },
     cp_birthday    => { type => 'date' },

+    cp_function    => { type => 'text' },

   ],
 
   primary_key_columns => [ 'cp_id' ],
   ],
 
   primary_key_columns => [ 'cp_id' ],

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index d7cebc4dc54629a99ebed180666571c3ec477474..7c1b2248fc5e50b3ff1781f7bf601c94f870e51c 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -303,7 +303,7 @@ sub list_contacts {
 
   my @columns      = qw(
     cp_id vcname vcnumber cp_name cp_givenname cp_street cp_zipcode cp_city cp_phone1 cp_phone2
 
   my @columns      = qw(
     cp_id vcname vcnumber cp_name cp_givenname cp_street cp_zipcode cp_city cp_phone1 cp_phone2

-    cp_mobile1 cp_mobile2 cp_email cp_abteilung cp_birthday cp_gender
+    cp_mobile1 cp_mobile2 cp_email cp_abteilung cp_function cp_birthday cp_gender

   );
 
   my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
   );
 
   my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };


@@ -336,6 +336,7 @@ sub list_contacts {
     'cp_mobile2'   => { 'text' => $::locale->text('Mobile2'), },
     'cp_email'     => { 'text' => $::locale->text('E-mail'), },
     'cp_abteilung' => { 'text' => $::locale->text('Department'), },
     'cp_mobile2'   => { 'text' => $::locale->text('Mobile2'), },
     'cp_email'     => { 'text' => $::locale->text('E-mail'), },
     'cp_abteilung' => { 'text' => $::locale->text('Department'), },

+    'cp_function'  => { 'text' => $::locale->text('Function/position'), },

     'cp_birthday'  => { 'text' => $::locale->text('Birthday'), },
     'cp_gender'    => { 'text' => $::locale->text('Gender'), },
     %column_defs_cvars,
     'cp_birthday'  => { 'text' => $::locale->text('Birthday'), },
     'cp_gender'    => { 'text' => $::locale->text('Gender'), },
     %column_defs_cvars,

diff --git a/locale/de/all b/locale/de/all
index 2c824308af0b2e129a80b0a1c9939dbf32da6ea2..627fbffe77e86739c57a0e7e17db749f442c7a08 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -913,6 +913,7 @@ $self->{texts} = {
   'Full Access'                 => 'Vollzugriff',
   'Full Preview'                => 'Alles',
   'Full access to all functions' => 'Vollzugriff auf alle Funktionen',
   'Full Access'                 => 'Vollzugriff',
   'Full Preview'                => 'Alles',
   'Full access to all functions' => 'Vollzugriff auf alle Funktionen',

+  'Function/position'           => 'Funktion/Position',

   'Fwd'                         => 'Vorwärts',
   'GL Transaction'              => 'Dialogbuchung',
   'GL transactions changeable'  => 'Änderbarkeit von Dialogbuchungen',
   'Fwd'                         => 'Vorwärts',
   'GL Transaction'              => 'Dialogbuchung',
   'GL transactions changeable'  => 'Änderbarkeit von Dialogbuchungen',

diff --git a/sql/Pg-upgrade2/contacts_add_cp_function.sql b/sql/Pg-upgrade2/contacts_add_cp_function.sql
new file mode 100644 (file)
index 0000000..571d61e
--- /dev/null
+++ b/sql/Pg-upgrade2/contacts_add_cp_function.sql
@@ -0,0 +1,5 @@
+-- @tag: contacts_add_cp_function
+-- @description: Feld 'Funktion/Position' zu Kontakten
+-- @depends: release_3_0_0
+-- @charset: utf-8
+ALTER TABLE contacts ADD COLUMN cp_function text;

diff --git a/templates/webpages/ct/_contact.html b/templates/webpages/ct/_contact.html
index 2b126c62ddfc8eb7aeb5cf1faf4b46a5e59620ab..f6c9b8a5a3bab15f420d58f66d5d144ea55cf317 100644 (file)
--- a/templates/webpages/ct/_contact.html
+++ b/templates/webpages/ct/_contact.html
@@ -35,6 +35,11 @@
       </td>
      </tr>
 
       </td>
      </tr>
 

+     <tr>
+      <th align="left" nowrap>[% 'Function/position' | $T8 %]</th>
+      <td>[% L.input_tag('cp_function', cp_function, size=40) %]</td>
+     </tr>
+

      <tr>
       <th align="left" nowrap>[% 'Given Name' | $T8 %]</th>
       <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="[% HTML.escape(cp_givenname) %]"></td>
      <tr>
       <th align="left" nowrap>[% 'Given Name' | $T8 %]</th>
       <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="[% HTML.escape(cp_givenname) %]"></td>

diff --git a/templates/webpages/ct/search_contact.html b/templates/webpages/ct/search_contact.html
index f7d291be586037684cdbaa930e85ec1c9b333785..af95c2d00469d09ec68e54350235e2bef9c4ba0d 100644 (file)
--- a/templates/webpages/ct/search_contact.html
+++ b/templates/webpages/ct/search_contact.html
@@ -1,5 +1,7 @@
 [%- USE HTML %]
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE T8 %]

+[%- USE L %]
+[%- USE LxERP %]

  <form method="post" action="ct.pl" name="Form">
 
   <input type="hidden" name="db" value="[% db | html %]">
  <form method="post" action="ct.pl" name="Form">
 
   <input type="hidden" name="db" value="[% db | html %]">


@@ -110,6 +112,11 @@
         <input name="l.cp_abteilung" id="l_cp_abteilung" type="checkbox" class="checkbox" value="Y">
         <label for="l_cp_abteilung">[% 'Department' | $T8 %]</label>
        </td>
         <input name="l.cp_abteilung" id="l_cp_abteilung" type="checkbox" class="checkbox" value="Y">
         <label for="l_cp_abteilung">[% 'Department' | $T8 %]</label>
        </td>

+
+       <td>[% L.checkbox_tag('l.cp_function', value='Y', label=LxERP.t8('Function/position'), class='checkbox') %]</td>
+      </tr>
+
+      <tr>

        <td>
         <input name="l.cp_gender" id="l_cp_gender" type="checkbox" class="checkbox" value="Y">
         <label for="l_cp_gender">[% 'Gender' | $T8 %]</label>
        <td>
         <input name="l.cp_gender" id="l_cp_gender" type="checkbox" class="checkbox" value="Y">
         <label for="l_cp_gender">[% 'Gender' | $T8 %]</label>


@@ -127,4 +134,3 @@
 
   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
  </form>
 
   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
  </form>

-