Changeset 1623 for trunk/LATMOS-Accounts-Web

Timestamp:

01/10/16 20:15:54 (8 years ago)

Author:

nanardon

Message:

Fix start / end Employment computation

Location:

trunk/LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/I18N/fr.po (modified) (6 diffs)
• lib/LATMOS/Accounts/Web/I18N/messages.pot (modified) (6 diffs)
• lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (3 diffs)
• root/html/users/employment.tt (modified) (2 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/fr.po

@@ -16 +16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: root/html/users/employment.tt:133
+#: root/html/users/employment.tt:134
 msgid "Arrival"
 msgstr "Arrivée"
@@ -32 +32 @@
 msgstr "Créer"
 
-#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:81
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:92
+#: root/html/users/employment.tt:132
 msgid "Created"
 msgstr "Créé"
 
-#: root/html/users/employment.tt:115
+#: root/html/users/employment.tt:114
 msgid "Current status"
 msgstr "Statut actuel"
 
-#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:86
+#: root/html/users/employment.tt:149
+msgid "Duration"
+msgstr "Durée"
+
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:97
 msgid "Expire"
 msgstr "Expiration"
 
-#: root/html/users/employment.tt:95
+#: root/html/users/employment.tt:91
 msgid "From"
 msgstr "Du"
@@ -52 +57 @@
 msgstr "Gestion informatique"
 
-#: root/html/users/employment.tt:135
+#: root/html/users/employment.tt:136
 msgid "Leave"
 msgstr "Départ"
@@ -60 +65 @@
 msgstr "Se déconnecter"
 
-#: root/html/users/employment.tt:38
+#: root/html/users/employment.tt:31
 msgid "New employment"
 msgstr "Nouveau statut"
 
-#: root/html/users/employment.tt:98
+#: root/html/users/employment.tt:94
 msgid "Since"
 msgstr "A partir du"
@@ -72 +77 @@
 msgstr "Statistiques"
 
-#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:77
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:88
 msgid "Today"
 msgstr "Aujourd'hui"
@@ -84 +89 @@
 msgstr "Voir"
 
-#: root/html/users/employment.tt:36 root/html/users/employment.tt:96
+#: root/html/users/employment.tt:29 root/html/users/employment.tt:92
 msgid "to"
 msgstr "Ã "

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/messages.pot

@@ -16 +16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: root/html/users/employment.tt:133
+#: root/html/users/employment.tt:134
 msgid "Arrival"
 msgstr ""
@@ -32 +32 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:81
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:92 root/html/users/employment.tt:132
 msgid "Created"
 msgstr ""
 
-#: root/html/users/employment.tt:115
+#: root/html/users/employment.tt:114
 msgid "Current status"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:86
+#: root/html/users/employment.tt:149
+msgid "Duration"
+msgstr ""
+
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:97
 msgid "Expire"
 msgstr ""
 
-#: root/html/users/employment.tt:95
+#: root/html/users/employment.tt:91
 msgid "From"
 msgstr ""
@@ -52 +56 @@
 msgstr ""
 
-#: root/html/users/employment.tt:135
+#: root/html/users/employment.tt:136
 msgid "Leave"
 msgstr ""
@@ -60 +64 @@
 msgstr ""
 
-#: root/html/users/employment.tt:38
+#: root/html/users/employment.tt:31
 msgid "New employment"
 msgstr ""
 
-#: root/html/users/employment.tt:98
+#: root/html/users/employment.tt:94
 msgid "Since"
 msgstr ""
@@ -72 +76 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:77
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:88
 msgid "Today"
 msgstr ""
@@ -84 +88 @@
 msgstr ""
 
-#: root/html/users/employment.tt:36 root/html/users/employment.tt:96
+#: root/html/users/employment.tt:29 root/html/users/employment.tt:92
 msgid "to"
 msgstr ""

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

@@ -23 +23 @@
             sn givenName description
             comment
+            managerContact
             uid uidNumber gidNumber gecos homeDirectory loginShell
             mail initials nickname
@@ -61 +62 @@
         attrs => [ qw(
             sn givenName
-            endEmployment
             expire
-            manager
         ) ]
     },
@@ -122 +121 @@
             lastday
             endcircuit
+            lengthText
+            description
             company
             contratType

trunk/LATMOS-Accounts-Web/root/html/users/employment.tt

@@ -133 +133 @@
         <td>[% user.get_attributes('create') | html  %]</td></tr>
     <tr><th>[% l('Arrival') %]</th>
-        <td>[% user.get_attributes('startFirstEmployment') | html  %]</td></tr>
+        <td>[% user.get_attributes('startEmployment') | html  %]</td></tr>
+    <tr><th>[% l('Leave') %]</th>
+        <td>[% user.get_attributes('endEmployment') | html  %]</td></tr>
     <tr>
         <th>
@@ -145 +147 @@
         <td>[% user.get_attributes('expire') | html  %]</td>
     </tr>
-    <tr><th>[% l('Leave') %]</th>
-        <td>[% user.get_attributes('endLastEmployment') | html  %]</td></tr>
+    <tr><th>[% l('Duration') %]</th>
+        <td>[% user.get_attributes('employmentLengthText') | html  %]</td></tr>
     </table>