Changeset 1400

Timestamp:

04.05.2012 16:03:21 (14 months ago)

Author:

gnum

Message:

Dippler: Using new *Full listing possibilities for user administration pages. Pages also have pagination, left limit at 10 for now, can be changed later on (defined within a page using variable limit).

Location:

dippler/trunk

Files:

• engine/dippler.php (modified) (1 diff)
• engine/lib/backoffice/BackOfficeService.php (modified) (1 diff)
• views/pages/administrate_approve.html (modified) (3 diffs)
• views/pages/administrate_user.html (modified) (3 diffs)

dippler/trunk/engine/dippler.php

@@ -396 +396 @@
         return $list;
         }
+    
+    private function usersDataToArrayOfUserObjects($data) {
+        $users = array();
+                if (isset($data->user)) {
+                        foreach ($data->user as $single) {
+                                $user = new User();
+                                $user->load((object) $single);
+                                $users[$user->id] = $user;
+                        }
+        }
+        return $users;
+    }
+
+    function listUsersFull($offset = 0, $limit = 10) {
+        $data = $this->backoffice->listUsersFull($offset, $limit);
+        $users = $this->usersDataToArrayOfUserObjects($data["objects"]);
+        return array("pages" => $data["pages"], "users" => $users);
+    }
+
+    function listUsersNotApprovedFull($offset = 0, $limit = 10) {
+        $data = $this->backoffice->listUsersNotApprovedFull($offset, $limit);
+        $users = $this->usersDataToArrayOfUserObjects($data["objects"]);
+        return array("pages" => $data["pages"], "users" => $users);
+    }
         
         function listCoursesFull($offset = 0) {

dippler/trunk/engine/lib/backoffice/BackOfficeService.php

@@ -436 +436 @@
                 return $this->extendedListingManager("", "ORGANIZATION_NOTAPPROVEDCOURSE_FULL", "courses", $offset, $limit);
         }
+
+    public function listUsersFull($offset = 0, $limit = 5) {
+        return $this->extendedListingManager("", "USER_FULL", "users", $offset, $limit, "", true);   
+    }
+    
+    public function listUsersNotApprovedFull($offset = 0, $limit = 10) {
+        return $this->extendedListingManager("", "USER_NOT_APPROVED_FULL", "users", $offset, $limit, "", true);   
+    }
+
         
     /*****************

dippler/trunk/views/pages/administrate_approve.html

@@ -1 +1 @@
 <tal:block metal:use-macro="main.html/main" i18n:domain="dippler">
-    <tal:block metal:fill-slot="content_body" tal:condition="dippler/is_admin" define="users dippler/backoffice/listUsersNotApproved | NULL">
+    <tal:block metal:fill-slot="content_body" tal:condition="dippler/is_admin" define="offset request/offset | string:0; limit string: 10; page_url php:WWW_ROOT . 'administrate/approve'; users_info php:dippler.listUsersNotApprovedFull(offset, limit); page_count users_info/pages; users users_info/users;">
         <div class="extrawide_box">
                         <tal:block metal:use-macro="form.html/form" define="action string:administrate_users;">
@@ -9 +9 @@
                                 <table>
                                                                 <tbody>
-                                            <tal:block repeat="user_id users">
+                                            <tal:block repeat="user users">
                                                     <tr>
                                                             <td>
-                                                                <tal:block metal:use-macro="user_row" tal:define="user php:get_user_by_id(user_id);" />
+                                                                <tal:block metal:use-macro="user_row" />
                                                             </td>
                                                     </tr>
@@ -23 +23 @@
                                     <input type="button" onClick="" tal:attributes="onClick string:javascript:window.location='${WWW_ROOT}actions/cancel.php?href=administrate/view'" value="Cancel" i18n:attributes="value" />
                             </div>
+                                                        <tal:block metal:use-macro="page_elements.html/pagination"></tal:block>
                         </div>
                         </div>

dippler/trunk/views/pages/administrate_user.html

@@ -1 +1 @@
 <tal:block metal:use-macro="main.html/main" i18n:domain="dippler">
-    <tal:block metal:fill-slot="content_body" tal:condition="dippler/is_admin" define="users dippler/backoffice/listUsers | NULL;">
+    <tal:block metal:fill-slot="content_body" tal:condition="dippler/is_admin" define="offset request/offset | string:0; limit string:10; page_url php:WWW_ROOT . 'administrate/user'; users_info php:dippler.listUsersFull(offset, limit); page_count users_info/pages; users users_info/users;">
             <div class="extrawide_box">
                 <tal:block metal:use-macro="form.html/form" define="action string:administrate_users;">
@@ -9 +9 @@
                                 <table>
                                                                 <tbody>
-                                            <tal:block repeat="user_id users">
+                                            <tal:block repeat="user users">
                                                     <tr>
                                                             <td>
-                                                                    <tal:block metal:use-macro="user_row" tal:define="user php:get_user_by_id(user_id);" />
+                                                                    <tal:block metal:use-macro="user_row" />
                                                             </td>
                                                     </tr>
@@ -24 +24 @@
                                         <input type="button" onClick="" tal:attributes="onClick string:javascript:window.location='${WWW_ROOT}actions/cancel.php?href=administrate/view'" value="Cancel" i18n:attributes="value" />
                                 </div>
+                                                        <tal:block metal:use-macro="page_elements.html/pagination"></tal:block>
                             </div>
                         </div>