Changeset 1348

Timestamp:

06/01/15 17:57:34 (9 years ago)

Author:

nanardon

Message:

Add endcircuit attribute

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (2 diffs)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFormsA.pm (modified) (1 diff)
• LATMOS-Accounts/bin/la-sql-upgrade.in (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (6 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Maintenance.pm (modified) (1 diff)
• LATMOS-Accounts/man/man8/latmos-accounts-base-sql.pod (modified) (1 diff)
• LATMOS-Accounts/templates/mail/account_expire.mail (modified) (2 diffs)

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

@@ -227 +227 @@
             'label' => 'Expire le'
         },
+        'endcircuit' => {
+            'label' => 'Fin de Circuit d\'entrée'
+        },
         'postalCode' => {
             'label' => 'Code postal'

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -26 +26 @@
             mail initials nickname
             expire
+            endcircuit
             locked
             create
@@ -42 +43 @@
             contratType
             expire
+            endcircuit
             snNative
             givenNameNative

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFormsA.pm

@@ -288 +288 @@
     my ($self, $value) = @_;
     return sprintf(q|
-        $('[name="%s"]').datepicker( { dateFormat: 'dd/mm/yy' } );
+        $('[name="%s"]').datepicker( {
+            changeMonth: true,
+            changeYear: true,
+            dateFormat: 'dd/mm/yy'
+        } );
     |, $self->escape($self->htmlname));
 }

trunk/LATMOS-Accounts/bin/la-sql-upgrade.in

@@ -509 +509 @@
             EXECUTE PROCEDURE rev_tg_f();
             },
+        ],
+    },
+    {
+        ver => 11,
+        sql => [
+            q{
+            ALTER TABLE "user" ADD COLUMN endcircuit timestamp with time zone
+            }
         ],
     },

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

@@ -192 +192 @@
                 monitored => 1,
             },
-            expire    => { inline => 1, formtype => 'DATE', monitored => 1, },
+            expire        => { inline => 1, formtype => 'DATE', monitored => 1, },
+            endcircuit    => { inline => 1, formtype => 'DATE', monitored => 1, },
             cn        => {
                 inline => 1, ro => 1,
@@ -595 +596 @@
                     my $sth = $obj->db->prepare_cached(
                         sprintf(
-                            q{select extract(epoch from expire) + 11644474161 as expire
+                            q{select extract(epoch from COALESCE(endcircuit,  expire)) + 11644474161 as expire
                             from %s where %s = ?},
                             $obj->db->quote_identifier($obj->_object_table),
@@ -615 +616 @@
                     my $sth = $obj->db->prepare_cached(
                         sprintf(
-                            q{select justify_hours(expire - '1/1/1970'::timestamp) as expire
+                            q{select justify_hours(COALESCE(endcircuit,  expire) - '1/1/1970'::timestamp) as expire
                             from %s where %s = ?},
                             $obj->db->quote_identifier($obj->_object_table),
@@ -726 +727 @@
                     my $sth = $obj->db->prepare_cached(
                         sprintf(
-                            q{select to_char(expire, 'YYYY/MM/DD') as expire
+                            q{select to_char(COALESCE(endcircuit,  expire), 'YYYY/MM/DD') as expire
                             from %s where %s = ?},
                             $obj->db->quote_identifier($obj->_object_table),
@@ -745 +746 @@
                     my $sth = $self->object->db->prepare_cached(
                         sprintf(
-                            q{select date_part('epoch', expire)::int as expire
+                            q{select date_part('epoch', COALESCE(endcircuit,  expire))::int as expire
                             from %s where %s = ?},
                             $self->object->db->quote_identifier($self->object->_object_table),
@@ -780 +781 @@
                         my $sth = $obj->db->prepare_cached(
                             sprintf(
-                                q{select to_char(expire AT TIME ZONE 'Z', 'YYYYMMDDHH24MISSZ') as expire
+                                q{select to_char(COALESCE(endcircuit,  expire) AT TIME ZONE 'Z', 'YYYYMMDDHH24MISSZ') as expire
                                 from %s where %s = ? and expire < now()},
                                 $obj->db->quote_identifier($obj->_object_table),

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

@@ -38 +38 @@
 
     my $sth= $base->db->prepare(q{
-        select name, justify_hours(expire - now()) as delay from "user" where
-            expire < now() + ?::interval
+        select name,
+            justify_hours(coalesce(endcircuit, expire) - now()) as delay,
+            endcircuit
+            from "user"
+            where
+            coalesce(endcircuit, expire) < now() + ?::interval
             and expire > now()
-            and expire is not null
+            and coalesce(endcircuit, expire) is not null
             and exported = True
             order by expire

trunk/LATMOS-Accounts/man/man8/latmos-accounts-base-sql.pod

@@ -50 +50 @@
 NS, TXT...).
 
+=head2 User endcircuit
+
+The C<endcircuit> attribute contain the deadline for people to make
+admnistrative task when starting to work.
+If set this attribute take precedence to C<expire> attribute for computed
+attributes (C<accountExpires> for Active Directory).
+
 =head2 Group AutoMemberFilter
 

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

@@ -7 +7 @@
 En aucun cas vos fichiers ne seront détruits. 
 
-Si ce dernier devait être prolongé, merci de dire à votre responsable
-de contacter svp@latmos.ipsl.fr afin de nous donner la nouvelle date. 
+[% IF endcircuit %]
+Pour que votre compte soit prolongé vous finir le circuit d'accueil et remettre
+la fiche à Brigitte Fromager (Guyancourt - bureau 2421) ou Irina Tchoumakova
+(Jussieu - bureau 409).
 
-
-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.
 
+[% 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.
+[% END %]
 
 Votre statut:
 
 Société: [% obj.get_c_field('company') %]
+
 Département: [% obj.get_c_field('department') %]
+
 Contrat: [% obj.get_c_field('contratType') %]
 
@@ -37 +40 @@
 In no case your files will be destroyed.
 
-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 endcircuit %]
+To have your account renew please end 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.
 
+[% 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.
+[% END %]
 
 Your status:
 
 Company: [% obj.get_c_field('company') %]
+
 Department: [% obj.get_c_field('department') %]
+
 Contract: [% obj.get_c_field('contratType') %]