Changeset 1566 for trunk

Timestamp:

12/30/15 13:56:55 (9 years ago)

Author:

nanardon

Message:

Make employment date store litterally to allow fast search

Location:

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

Files:

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

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

@@ -282 +282 @@
     my $expire = str2time($user->get_attributes('expire') || '1970-01-01T00:00:00');
 
+    my %changes;
+    foreach (qw( endEmployment endStrictEmployment endCurrentEmployment endLastEmployment )) {
+        my $old = $user->_get_attributes($_) || '';
+        my $new = $user->_get_attributes("_$_") || '';
+        if ($old ne $new) {
+            $changes{$_} = $new;
+        }
+    }
+
     # If there is no current employment we try to find any to not let expire
     # unset
     my $endemploy = $currentemployment
-        ? $user->get_attributes('endEmployment')
-        : $user->get_attributes('endLastEmployment');
+        ? $user->_get_attributes('_endEmployment')
+        : $user->_get_attributes('_endLastEmployment');
     my $nextexpire = str2time($endemploy || '1970-01-01T00:00:00');
 
     if ($expire != $nextexpire) {
-        $user->set_fields(expire => $endemploy);
-        $user->ReportChange('Update', 'Expire update to %s to match employment', ($endemploy || '(none)'));
+        $changes{expire} = $endemploy;
+    }
+
+    if (keys %changes) {
+        $user->ReportChange('Update', 'Update %s to match employment', join(', ', sort keys %changes));
+        $user->ReportChange('Update', 'Expire update to %s to match employment', ($endemploy || '(none)'))
+            if (exists($changes{expire}));
+        $user->set_fields(%changes);
     }
 

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

@@ -214 +214 @@
                 label => l('End of entrance'),
             },
-            endEmployment => {
+            _endEmployment => {
                 formtype => 'DATETIME',
                 managed => 1,
                 ro => 1,
+                hide => 1,
                 get => sub {
                     my ($attr) = @_;
@@ -225 +226 @@
                 label => l('End of employment'),
             },
-            endStrictEmployment => {
+            endEmployment => {
+                formtype => 'DATETIME',
+                ro => 1,
+                label => l('End of employment'),
+            },
+            _endStrictEmployment => {
                 formtype => 'DATETIME',
                 managed => 1,
                 ro => 1,
+                hide => 1,
                 get => sub {
                     my ($attr) = @_;
@@ -235 +242 @@
                 },
             },
-            endCurrentEmployment => {
+            endStrictEmployment => {
+                formtype => 'DATETIME',
+                ro => 1,
+            },
+            _endCurrentEmployment => {
                 formtype => 'DATETIME',
                 managed => 1,
                 ro => 1,
+                hide => 1,
                 get => sub {
                     my ($attr) = @_;
@@ -268 +280 @@
                 },
             },
-            endLastEmployment => {
+            endCurrentEmployment => {
+                formtype => 'DATETIME',
+                ro => 1,
+            },
+            _endLastEmployment => {
                 formtype => 'DATETIME',
                 managed => 1,
                 ro => 1,
+                hide => 1,
                 get => sub {
                     my ($attr) = @_;
@@ -291 +308 @@
                     return $end ? $end->iso8601 : undef
                 },
+                label => l('End of any employment'),
+            },
+            endLastEmployment => {
+                formtype => 'DATETIME',
+                ro => 1,
                 label => l('End of any employment'),
             },
@@ -1076 +1098 @@
             },
             appliedEmployement => {
-                hidden => 1,
+                hide => 1,
                 reference => 'employment',
             },