Changeset 2478

Timestamp:

10/07/21 19:03:50 (3 years ago)

Author:

nanardon

Message:

Add attribute BAP and Grade

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (2 diffs)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFormsA.pm (modified) (3 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Attributes.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap/User.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Employment.pm (modified) (3 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (6 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -68 +68 @@
             manager
             contratType
+            assigned
+            grade
+            BAP
             expire
             endcircuit
@@ -148 +151 @@
             contratType
             assigned
+            grade
+            BAP
             department
             managerContact

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFormsA.pm

@@ -372 +372 @@
 sub attr_LIST {
     my ($self, $value) = @_;
-
-    my @values = $self->can_values;
     $value ||= '';
 
-    if (@values < 5) {
-        return sprintf(q|<select id="%s" name="%s">%s%s</select>|,
-            $self->htmlid,
-            $self->htmlname,
-            ($self->mandatory ? '' : '<option value="">--</option>'),
-            join(",\n", map { $_ = sprintf('<option value="%s"%s>%s</option>', $_, ($_ eq $value ? ' selected="selected"' : ''), $self->display($_)) } sort $self->can_values),
-        );
-    } else {
-        my $html = $self->attr_TEXT($self->display($value));
-    }
+    my $html = $self->attr_TEXT($self->display($value));
 }
 
@@ -392 +381 @@
     return sprintf(q|
             $('[name="%s"]').autocomplete({
-                delay: 200,
+                delay: 100,
                 minLength: 0,
                 source: '%s',
@@ -406 +395 @@
     );
 }
+
+sub attr_SELECT {
+    my ($self, $value) = @_;
+    $value ||= '';
+
+    return sprintf(q|<select id="%s" name="%s">%s%s</select>|,
+        $self->htmlid,
+        $self->htmlname,
+        ($self->mandatory ? '' : '<option value="">--</option>'),
+        join(",\n", map { $_ = sprintf('<option value="%s"%s>%s</option>', $_, ($_ eq $value ? ' selected="selected"' : ''), $self->display($_)) } sort $self->can_values),
+    );
+}
+
+sub attr_SELECT_js { }
 
 sub _uri_part {

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Attributes.pm

@@ -404 +404 @@
 
 sub form_type {
+
+    my @values = $_[0]->can_values;
+
     $_[0]->readonly ? 'LABEL' :
     $_[0]->{formtype} ? $_[0]->{formtype} :
-    $_[0]->has_values_list ? 'LIST' :
+    $_[0]->has_values_list ? ( scalar(@values) > 15 ? 'LIST' : 'SELECT') :
     $_[0]->real_form_type
 }

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap/User.pm

@@ -118 +118 @@
         physicalDeliveryOfficeName => { },
         ou => { },
+        employeeType => {},
         st => { },
         l => { },

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Employment.pm

@@ -8 +8 @@
 use LATMOS::Accounts::Log;
 use LATMOS::Accounts::I18N;
+use LATMOS::Accounts::Bases::Sql::User;
 use Date::Parse;
 use DateTime;
@@ -161 +162 @@
             label => l('Department'),
         },
+        grade => { },
+        BAP   => { },
         company => {
             label => l('Company'),
@@ -308 +311 @@
     if (! $base->config("allow_pasted_employment")) {
     # Completed contract are RO, we allow to still set lastday
-        foreach (qw(endcircuit firstday contratType department managerContact company employer)) {
+        foreach (LATMOS::Accounts::Bases::Sql::User::_reported_atributes(), qw(firstday contratType managerContact)) {
             $attrs->{$_}{ro} = sub {
                 my ($self) = $_[0];

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -784 +784 @@
                 label => l('Type of contract'),
             },
+            employeeType => {
+                iname => 'contratType',
+                ro => 1,
+            },
+            grade => { },
+
             site => {
                 reference => 'site',
@@ -1395 +1401 @@
             },
             grade => { },
+            BAP   => { },
             givenName => {
                 label => l('First name'),
@@ -1653 +1660 @@
     };
 
-    foreach (_reported_atributes(), qw(department managerContact contratTypeHistory)) {
+    foreach (_reported_atributes(), qw(managerContact contratTypeHistory)) {
         $attrs->{$_}{ro} = $employmentro;
     }
@@ -1761 +1768 @@
 }
 
-sub _reported_atributes { qw(contratType endcircuit hosted assigned requestId company employer) }
+sub _reported_atributes { qw(contratType endcircuit hosted assigned requestId company employer department BAP grade) }
 
 =head2 applyCurrentEmployment
@@ -1791 +1798 @@
             appliedEmployement => $currentemployment->id,
         );
-        foreach my $attr (_reported_atributes(), qw(department managerContact)) {
+        foreach my $attr (_reported_atributes(), qw(managerContact)) {
             my $uval = $self->get_attributes($attr) || '';
             my $cval = $currentemployment->get_attributes($attr) || '';
@@ -1839 +1846 @@
     );
 
-    my @attributesToReset = (_reported_atributes(), qw(department));
+    my @attributesToReset = _reported_atributes();
 
     foreach my $attr (@attributesToReset) {