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

Timestamp:

02/01/16 15:01:00 (8 years ago)

Author:

nanardon

Message:

speedup office web page

Location:

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

Files:

• Controller/Json/RefVal.pm (modified) (1 diff)
• Controller/Json/Timeline.pm (modified) (1 diff)
• Controller/Summary/Offices.pm (modified) (1 diff)
• I18N/fr.po (modified) (1 diff)
• I18N/messages.pot (modified) (1 diff)

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

@@ -37 +37 @@
             foreach my $attr (@{ $c->config->{objects}{$oref}{quick_search} || [ 'name' ]}) {
                 foreach ($base->search_objects(
-                        $oref, "$attr~" . $term)) {
+                        $oref, "$attr~" . $term, 'exported=true')) {
                     $objs{$_} = 1;
                 }

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

@@ -123 +123 @@
     }
 
-
     if (my $date = $ouser->get_attributes('endEmployment')) {
         push(@{$var->{employments}{events}}, {

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Summary/Offices.pm

@@ -27 +27 @@
     my $base = $c->model('Accounts')->base;
 
-    my @users = $base->search_objects('user', 'active=1');
+    my $users = $base->fetchObjectInfo(
+        'user',
+        [ qw(sn givenName) ],
+        'active=1'
+    );
 
-    foreach ( $base->search_objects('address', 'active=1', map { "user=$_" } @users)) {
+    my $sites = $base->fetchObjectInfo(
+        'site',
+        [ qw(l description) ],
+        'exported=true'
+    );
 
-        my $add = $base->get_object('address', $_) or next;
-        my $site = $add->get_attributes('site')
-            || $add->get_attributes('l');
-        my $office = $add->get_attributes('physicalDeliveryOfficeName') || '';
+    my $addresses = $base->fetchObjectInfo(
+        'address',
+        [ qw(user site physicalDeliveryOfficeName telephoneNumber l isMainAddress) ],
+        'exported=true'
+    );
 
-        $site or next;
+    foreach my $ad (keys %$addresses) {
+        my $sitename = $addresses->{$ad}{site}[0] || $c->loc('(other)');
 
-        push (@{$c->stash->{office}{$site}{$office}}, $add);
+        my $loc = $addresses->{$ad}{site}[0]
+            ? $sites->{ $addresses->{$ad}{site}[0] }{l}[0]
+            : $addresses->{$ad}{l}[0];
+
+        my $office = $addresses->{$ad}{physicalDeliveryOfficeName}[0] || '';
+
+        my $user = $users->{ $addresses->{$ad}{user}[0] } or next;
+
+        $c->stash->{sites} = $sites;
+
+        push (
+            @{$c->stash->{office}{$sitename}{$office}},
+            {
+                displayName => sprintf('%s %s', $user->{givenName}[0], $user->{sn}[0]),
+                phone => $addresses->{$ad}{telephoneNumber}[0],
+                isMainAddress => $addresses->{$ad}{isMainAddress}[0],
+                id => $ad,
+                user => $addresses->{$ad}{user}[0],
+                l => $loc,
+                site => $sitename,
+            }
+        );
     }
 }

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

@@ -42 +42 @@
 msgstr "(sans)"
 
-#: root/html/includes/sidebar.tt:77
+#: lib/LATMOS/Accounts/Web/Controller/Summary/Offices.pm:48
+msgid "(other)"
+msgstr "(autre)"
+
+#: root/html/includes/sidebar.tt:76
 msgid "About"
 msgstr "À propos"
 
-#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:128
-#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:137
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:127
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:136
 msgid "Activity end"
 msgstr "Fin d'activité"

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

@@ -35 +35 @@
 msgstr ""
 
-#: root/html/includes/sidebar.tt:77
+#: lib/LATMOS/Accounts/Web/Controller/Summary/Offices.pm:48
+msgid "(other)"
+msgstr ""
+
+#: root/html/includes/sidebar.tt:76
 msgid "About"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:128 lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:137
+#: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:127 lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:136
 msgid "Activity end"
 msgstr ""