Changeset 1651 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts

Timestamp:

01/22/16 06:25:19 (8 years ago)

Author:

nanardon

Message:

Update timeline

Location:

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web

Files:

• Controller/Json/Timeline.pm (modified) (1 diff)
• I18N/fr.po (modified) (2 diffs)
• I18N/messages.pot (modified) (2 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm

@@ -97 +97 @@
                 name => $c->loc('Expire'),
                 date => $expire,
+                options => {
+                    type => 'alarm',
+                }
+        });
+    }
+    if (my $endcircuit = $ouser->get_attributes('endcircuit')) {
+        push(@{$var->{employments}{events}}, {
+                name => $c->loc('End of entrance'),
+                date => $endcircuit,
+                options => {
+                    type => 'alarm',
+                }
+        });
+    }
+    if (my $date = $ouser->get_attributes('startEmployment')) {
+        push(@{$var->{employments}{events}}, {
+                name => $c->loc('Activity start'),
+                date => $date,
+                options => {
+                    type => 'employment',
+                    showdate => 1,
+                }
+        });
+    }
+    if (my $date = $ouser->get_attributes('endEmployment')) {
+        push(@{$var->{employments}{events}}, {
+                name => $c->loc('Activity end'),
+                date => $date,
+                options => {
+                    type => 'employment',
+                    showdate => 1,
+                }
         });
     }

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

@@ -15 +15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:125
+msgid "Activity end"
+msgstr "Fin d'activité"
+
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:115
+msgid "Activity start"
+msgstr "Début d'activité"
 
 #: root/html/users/employment.tt:134
@@ -44 +52 @@
 msgid "Duration"
 msgstr "Durée"
+
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:106
+msgid "End of entrance"
+msgstr "Fin de circuit d'entrée"
 
 #: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:97

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

@@ -15 +15 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:125
+msgid "Activity end"
+msgstr ""
+
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:115
+msgid "Activity start"
+msgstr ""
 
 #: root/html/users/employment.tt:134
@@ -42 +50 @@
 #: root/html/users/employment.tt:149
 msgid "Duration"
+msgstr ""
+
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:106
+msgid "End of entrance"
 msgstr ""