From 50341bd88807a6ac66dec2651ba7a0a792a9f2ba Mon Sep 17 00:00:00 2001
From: willkoua <willkoua@gmail.com>
Date: Thu, 26 May 2016 20:42:43 -0400
Subject: [PATCH 1/2] ajout de la date de creation de l'organisation dans la
 page d'admin

---
 src/Controller/PagesController.php    | 9 ++++++++-
 src/Template/Pages/administration.ctp | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Controller/PagesController.php b/src/Controller/PagesController.php
index 2d97cafd..94b83d03 100644
--- a/src/Controller/PagesController.php
+++ b/src/Controller/PagesController.php
@@ -559,7 +559,14 @@ public function administration($img = null)
         $projects = $this->Projects->find('all', ['conditions' => ['accepted' => 0, 'archived' => 0]])->toArray();
 
         $this->loadModel("Organizations");
-        $organizations = $this->Organizations->find('all', ['conditions' => ['isValidated' => 0, 'isRejected' => 0]])->toArray();
+        $organizations = $this->Organizations
+            ->find()
+            ->select(['id', 'name', 'created'])
+            ->where(['isValidated' => 0, 'isRejected' => 0])
+            ->order(['created' => 'DESC'])
+            ->limit(10)
+            ->toArray();
+
 
         //gestion des images du carousel
         $pathCar = WWW_ROOT . "img/carousel/";
diff --git a/src/Template/Pages/administration.ctp b/src/Template/Pages/administration.ctp
index 0532c186..79d49158 100644
--- a/src/Template/Pages/administration.ctp
+++ b/src/Template/Pages/administration.ctp
@@ -49,12 +49,14 @@
     </div>
     <div class="col-lg-6 col-xs-12">
         <div class="panel panel-default">
-            <div class="panel-body">
+            <div class="panel-body table-responsive">
                 <h3 class="header-title"><?= __('Organizations') ?></h3>
                 <table class="table">
                     <?php foreach ($organizations as $organization):?>
                         <tr>
                             <td><?= $this->Html->link($organization->getName(), ['controller' => 'Organizations', 'action' => 'view', $organization->id]); ?></td>
+                            <td><em class="small"><?= ($organization->getCreated() != null) ? $organization->getCreated() : __("not define"); ?> </em></td>
+
                         </tr>
                     <?php endforeach; ?>
                 </table>

From 689f9580cd1e2c407d33f37bf0d696d70b4fdddb Mon Sep 17 00:00:00 2001
From: willkoua <willkoua@gmail.com>
Date: Mon, 30 May 2016 10:34:00 -0400
Subject: [PATCH 2/2] ajout d'information pour ls organisation et correction du
 bug avec les dates

---
 src/Controller/PagesController.php    | 26 ++++++++++++++++++--------
 src/Template/Pages/administration.ctp | 10 ++++++----
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/Controller/PagesController.php b/src/Controller/PagesController.php
index 94b83d03..8dfece99 100644
--- a/src/Controller/PagesController.php
+++ b/src/Controller/PagesController.php
@@ -12,10 +12,12 @@
 
 use App\Controller\AppController;
 use Cake\Core\Configure;
+use Cake\Datasource\ConnectionManager;
 use Cake\Event\Event;
 use Cake\Network\Exception\NotFoundException;
 use Cake\View\Exception\MissingTemplateException;
 use GithubApi;
+use Migrations\CakeManager;
 
 /**
  * Pages controller
@@ -555,18 +557,26 @@ public function statistics()
      */
     public function administration($img = null)
     {
+        $conn = ConnectionManager::get('default');
+
         $this->loadModel("Projects");
         $projects = $this->Projects->find('all', ['conditions' => ['accepted' => 0, 'archived' => 0]])->toArray();
 
         $this->loadModel("Organizations");
-        $organizations = $this->Organizations
-            ->find()
-            ->select(['id', 'name', 'created'])
-            ->where(['isValidated' => 0, 'isRejected' => 0])
-            ->order(['created' => 'DESC'])
-            ->limit(10)
-            ->toArray();
-
+        $organizations = $conn->execute(
+            'SELECT id, name, created,
+              (
+                SELECT
+                COUNT(id)
+                FROM organizations_projects p
+                WHERE p.organization_id = o.id
+              ) pj
+              FROM organizations o
+              WHERE o.isValidated = 0 AND o.isRejected = 0
+              ORDER BY o.created DESC
+              LIMIT 10'
+        )
+            ->fetchAll('assoc');
 
         //gestion des images du carousel
         $pathCar = WWW_ROOT . "img/carousel/";
diff --git a/src/Template/Pages/administration.ctp b/src/Template/Pages/administration.ctp
index 79d49158..64ef939b 100644
--- a/src/Template/Pages/administration.ctp
+++ b/src/Template/Pages/administration.ctp
@@ -52,11 +52,13 @@
             <div class="panel-body table-responsive">
                 <h3 class="header-title"><?= __('Organizations') ?></h3>
                 <table class="table">
-                    <?php foreach ($organizations as $organization):?>
+                    <?php foreach ($organizations as $organization): ?>
                         <tr>
-                            <td><?= $this->Html->link($organization->getName(), ['controller' => 'Organizations', 'action' => 'view', $organization->id]); ?></td>
-                            <td><em class="small"><?= ($organization->getCreated() != null) ? $organization->getCreated() : __("not define"); ?> </em></td>
-
+                            <td>
+                                <?= $this->Html->link($organization['name'], ['controller' => 'Organizations', 'action' => 'view', $organization['id']]); ?>
+                                <span class='label label-success' title='projets'><?= $organization['pj']; ?></span>
+                            </td>
+                            <td><em class="small"><?= ($organization['created'] != null) ?  date("d-m-Y", strtotime($organization['created'])) : __("not define"); ?> </em></td>
                         </tr>
                     <?php endforeach; ?>
                 </table>