Changeset 2147 for trunk/LATMOS-Accounts/lib/LATMOS

Timestamp:

09/25/18 17:50:05 (6 years ago)

Author:

nanardon

Message:

Add nationality, native country and assigned attributes

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql

Files:

• Employment.pm (modified) (1 diff)
• User.pm (modified) (4 diffs)

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

@@ -175 +175 @@
             formtype => 'CHECKBOX',
             label => l('Hosted'),
+        },
+        assigned => {
+            formtype => 'CHECKBOX',
+            label => l('Assigned'),
         },
         requestId => {

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

@@ -1430 +1430 @@
                 label => l('Hosted'),
             },
+            assigned => {
+                formtype => 'CHECKBOX',
+                label => l('Assigned'),
+            },
             createRequestId => {
                 label => l('Account Request id')
             },
             requestId => {
-                label => l('Request id')
-            }
-
+                label => l('Request id'),
+            },
+            nationality => {
+                label => l('Nationality'),
+            },
+            nativeCountry => {
+                label => l('Native country'),
+            },
     };
 
@@ -1472 +1481 @@
     };
 
-    foreach (qw(contratType managerContact company endcircuit department hosted requestId
-                contratTypeHistory employer)) {
+    foreach (_reported_atributes(), qw(department managerContact contratTypeHistory)) {
         $attrs->{$_}{ro} = $employmentro;
     }
@@ -1581 +1589 @@
 }
 
-sub _reported_atributes { qw(contratType endcircuit hosted requestId company employer) }
+sub _reported_atributes { qw(contratType endcircuit hosted assigned requestId company employer) }
 
 =head2 applyCurrentEmployment
@@ -1657 +1665 @@
     );
 
-    my @attributesToReset = (_reported_atributes, qw(department));
+    my @attributesToReset = (_reported_atributes(), qw(department));
 
     foreach my $attr (@attributesToReset) {