Changeset 1735 for trunk

Timestamp:

03/21/16 14:51:29 (8 years ago)

Author:

nanardon

Message:

Fix days left wrongly display in expire mail

This patch also allow to make different mail according "endcircuit" attribute.

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Maintenance.pm (modified) (6 diffs)
• templates/mail/account_expire.mail (modified) (2 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Maintenance.pm

@@ -8 +8 @@
 use LATMOS::Accounts::Mail;
 use FindBin qw($Bin);
+use DateTime;
+use Date::Calc;
+use Date::Parse;
 
 =head1 NAME
@@ -39 +42 @@
     my $sth= $base->db->prepare(q{
         select name,
-            justify_hours(coalesce(endcircuit, expire) - now()) as delay,
-            endcircuit
+            coalesce(endcircuit, expire) as appliedexpire,
+            endcircuit,
+            expire
             from "user"
             where
             coalesce(endcircuit, expire) < now() + ?::interval
-            and expire > now()
+            and coalesce(endcircuit, expire) > now()
             and coalesce(endcircuit, expire) is not null
             and exported = True
@@ -53 +57 @@
     my @users;
     while (my $res = $sth->fetchrow_hashref) {
-        $res->{delay} =~ s/ day.? .*//;
+        my $now = DateTime->now;
+        my @expire = strptime($res->{appliedexpire});
+
+        my ($days) = Date::Calc::Delta_Days(
+            $now->year, $now->month, $now->day,
+            1900 + $expire[5], $expire[4] +1, $expire[3],
+        );
+
+        $res->{days} = $days;
+
         $res->{obj} = $base->get_object('user', $res->{name});
         $res->{obj}->get_attributes('locked') and next;
@@ -97 +110 @@
         my %mail = (
             From => $self->val('_default_', 'mailFrom', 'nomail@localhost'),
-            Subject => sprintf('Account %s Expire in %s days', $user->{name}, $user->{delay}),
+            Subject => sprintf('Account %s Expire in %s days', $user->{name}, $user->{days}),
             'X-LATMOS-Reason' => 'Account expiration',
         );
@@ -124 +137 @@
         my $mailcc = join(', ', @cc) || '';
         push(@summary, sprintf("%s : %s : %s\n",
-                $user->{obj}->queryformat('%{sn} %{givenName} : %{name} : %{department} : %{manager} : %{expireText}'),
+                $user->{obj}->queryformat('%{sn} %{givenName} : %{name} : %{department} : %{manager} : %{expireText} : %{endcircuit}'),
                 $to || 'Not sent, no destination',
                 ($mailcc ? $mailcc : ''),
@@ -133 +146 @@
             la_log(LA_NOTICE, "Expiration mail for %s (%s) sent to %s; cc %s",
                 $user->{obj}->id,
-                $user->{delay},
+                $user->{days},
                 $mail{to}, ($mail{cc} || ''));
             if ($options{to}) {

trunk/LATMOS-Accounts/templates/mail/account_expire.mail

@@ -4 +4 @@
 
 sauf erreur ou ommission de notre part votre compte [% obj.id %] expire
-dans [% delay %] jours ([% obj.get_c_field('expire') %]).
+dans [% IF days %][% days %] jours[% ELSE %]aujourd'hui[% END %] ([% obj.get_c_field('expire') %]).
 En aucun cas vos fichiers ne seront détruits. 
 
+[% IF endcircuit %]
+Il semble que vous n'avez pas fini votre circuit de sortie
+
+Merci de terminer celui-ci pour voir votre compte prolongé.
+[% ELSE %]
 Si ce dernier devait être prolongé, merci de dire à votre responsable
 de contacter svp@latmos.ipsl.fr afin de nous donner la nouvelle date.
-
-
-Cas d'un nouvel arrivant:
-
-Si vous êtes un nouvel arrivant, veuillez réaliser votre circuit d'entrée et
-remettre la fiche à Brigitte Fromager (Guyancourt - bureau 2421) ou Irina
-Tchoumakova (Jussieu - bureau 409).
-Si vous rencontrez des difficultés, n'hésitez pas à vous adresser à votre
-responsable, ou à Brigitte et Irina.
+[% END %]
 
 
@@ -36 +33 @@
 
 Except error or omission on our part, your account login expires
-in [% delay %] days ([% obj.get_c_field('expire') %]).
+in [% IF days %][% days %] days[% ELSE %]today[% END %] ([% obj.get_c_field('expire') %]).
 In no case your files will be destroyed.
 
+[% IF endcircuit %]
+It seems you haven't finish your entrance circuit
+
+Thanks to finish it to have your account prolongated.
+[% ELSE %]
 If your account had to be extended, please ask your manager to contact
 svp@latmos.ipsl.fr to give us a new expiration date.
-
-
-If you are new in laboratory:
-
-If you are a newcomer, please make your entrance circuit and pass on the sheet
-to Brigitte Fromager (Guyancourt - office 2421) or Irina Tchoumakova (Jussieu -
-office 409).                     
-If you meet difficulties, don't hesitate to deal with your manager, or with
-Brigitte and Irina.
+[% END %]