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

Timestamp:

12/27/16 18:40:15 (8 years ago)

Author:

nanardon

Message:

expireText does not take endcircuit into account anymore

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (4 diffs)

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

@@ -892 +892 @@
                     my ($self) = @_;
                     my $obj = $self->object;
+
+                    my $ec = $obj->_get_c_field('endcircuit');
+
+                    my $date = $ec
+                        ? sprintf('%s (%s)', $ec, $obj->_get_c_field('expireText'))
+                        : $obj->_get_c_field('expireText');
+
                     my $gecos = sprintf("%s,%s,%s,%s",
                         join(' ', grep { $_ }
@@ -901 +908 @@
                             $obj->_get_c_field('physicalDeliveryOfficeName'))) || '',
                         $obj->_get_c_field('telephoneNumber') || '',
-                        $obj->_get_c_field('expireText') || '',
+                        $date,
                     );
                     $gecos =~ s/:/ /g;
@@ -1085 +1092 @@
                 label => l('Manager'),
             },
-            expireText => {
-                ro => 1,
+            expireTextEC => {
+                ro => 1,
+                managed => 1,
                 get => sub {
                     my ($self) = @_;
@@ -1093 +1101 @@
                         sprintf(
                             q{select to_char(COALESCE(endcircuit,  expire), 'YYYY/MM/DD') as expire
+                            from %s where %s = ?},
+                            $obj->db->quote_identifier($obj->_object_table),
+                            $obj->db->quote_identifier($obj->_key_field),
+                        )
+                    );
+                    $sth->execute($obj->id) or $obj->db->rollback;
+                    my $res = $sth->fetchrow_hashref;
+                    $sth->finish;
+                    return $res->{expire}
+                },
+            },
+            expireText => {
+                ro => 1,
+                managed => 1,
+                get => sub {
+                    my ($self) = @_;
+                    my $obj = $self->object;
+                    my $sth = $obj->db->prepare_cached(
+                        sprintf(
+                            q{select to_char(expire, 'YYYY/MM/DD') as expire
                             from %s where %s = ?},
                             $obj->db->quote_identifier($obj->_object_table),