Changeset 2028

Timestamp:

05/09/17 15:13:29 (7 years ago)

Author:

nanardon

Message:

Trying to fix local time in employment managment

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases/Sql/User.pm (modified) (3 diffs)
• Task/Employment.pm (modified) (2 diffs)

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

@@ -1300 +1300 @@
                     my $self = $attr->object;
 
+                    my $now = DateTime->now()->iso8610 . 'Z';
+
                     my $sth = $self->base->db->prepare_cached(
                         q{
-                        select name from employment where firstday <= now() and
-                        (lastday is null or lastday >= now() - '1 days'::interval) and "user" = ?
+                        select name from employment where firstday <= ?::timestamp and
+                        (lastday is null or lastday >= ?::timestamp - '1 days'::interval) and "user" = ?
                         limit 1
                         }
                     );
-                    $sth->execute($self->id);
+                    $sth->execute($now, $now, $self->id);
                     my $res = $sth->fetchrow_hashref;
                     $sth->finish;
@@ -1325 +1327 @@
                     my $self = $attr->object;
 
+                    my $now = DateTime->now()->iso8610 . 'Z';
+
                     my $sth = $self->base->db->prepare_cached(
                         q{
-                        select name from employment where firstday > now() and "user" = ?
+                        select name from employment where firstday > ? and "user" = ?
                         order by firstday asc
                         limit 1
                         }
                     );
-                    $sth->execute($self->id);
+                    $sth->execute($now, $self->id);
                     my $res = $sth->fetchrow_hashref;
                     $sth->finish;
@@ -1350 +1354 @@
                     my $self = $attr->object;
 
+                    my $now = DateTime->now()->iso8610 . 'Z';
+
                     my $sth = $self->base->db->prepare_cached(
                         q{
                         select name from employment where
-                        (lastday is not null and lastday <= now() - '1 days'::interval) and "user" = ?
+                        (lastday is not null and lastday <= ? - '1 days'::interval) and "user" = ?
                         order by firstday desc
                         limit 1
                         }
                     );
-                    $sth->execute($self->id);
+                    $sth->execute($now, $self->id);
                     my $res = $sth->fetchrow_hashref;
                     $sth->finish;

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Employment.pm

@@ -8 +8 @@
 use LATMOS::Accounts::Utils;
 use LATMOS::Accounts::Bases::Sql::Employment;
+use DateTime;
+use DateTime::TimeZone;
 
 =head1 NAME
@@ -44 +46 @@
     }
 
+    my $now = DateTime->now()->iso8601 . 'Z';
+
     my $listempl = $self->{_base}->db->prepare_cached(q{
-        SELECT * FROM employment where firstday <= now() and (lastday is null or lastday >= now() - '1 days'::interval)
+        SELECT * FROM employment where firstday <= ?::timestamp and (lastday is null or lastday >= ?::timestamp - '1 days'::interval)
             and exported = true
             order by lastday, firstday
     });
-    $listempl->execute();
+    $listempl->execute($now, $now);
     my %new  = ();
     while (my $res = $listempl->fetchrow_hashref) {