Affichage d'une conversation

Geoffrey PREUD'HOMME
1 parent 12162cc1
Showing 9 changed files with 94 additions and 6 deletions Show diff stats
app/routes/ApiRtes.js
app/services/ConvsServ.js
public/js/app.js
public/js/controllers/ForumConvCtrl.js
public/js/controllers/ForumDirCtrl.js
public/js/services/ForumServ.js
public/views/forumConv.html
public/views/forumDir.html
public/views/index.html
@@ -104,6 +104,15 @@ api.get(&#39;/convs&#39;, function (req, res) { // Liste des convs
     });
 });
  
+api.get('/convs/:conv_id', function (req, res) { // Une conv
+    ConvsServ.get(req.params.conv_id, function (err, conv) {
+        if (err)
+            res.send(err);
+        else
+            res.json(conv);
+    });
+});
+
 api.post('/convs', function (req, res) { // Ajout d'un conv
     ifPermission(req, res, 'canAddConv', function () {
         ConvsServ.add(req.body, function (err, conv) {
@@ -4,7 +4,7 @@ var async = require(&#39;async&#39;);
  
 var ConvsServ = {};
  
-ConvsServ.addData = function (Conv, cb) {
+ConvsServ.addData = function (conv, cb) {
     // NomsServ.get(Conv.login, function (nom) {
     //     if (nom) {
     //         Conv.nom = nom;
@@ -15,15 +15,15 @@ ConvsServ.addData = function (Conv, cb) {
     // });
     // TODO Démarré par
     // TODO Dernier message
-    cb(null, Conv);
+    cb(null, conv);
 };
  
 ConvsServ.get = function(id, cb) {
-    ConvModl.findById(id).lean().exec(function (err, Conv) {
+    ConvModl.findById(id).lean().exec(function (err, conv) {
         if (err)
             cb(err);
         else
-            ConvsServ.addData(Conv, cb);
+            ConvsServ.addData(conv, cb);
     });
 };
  
-angular.module('ciApp', ['ngAnimate', 'ngRoute', 'ConnectCtrl', 'MembreCtrl', 'ForumDirCtrl', 'SessionsCtrl']).config(['$routeProvider', '$locationProvider',
+angular.module('ciApp', ['ngAnimate', 'ngRoute', 'ConnectCtrl', 'MembreCtrl', 'ForumDirCtrl', 'ForumConvCtrl', 'SessionsCtrl']).config(['$routeProvider', '$locationProvider',
     function ($routeProvider, $locationProvider) {
         $routeProvider
             .when('/', {
@@ -9,9 +9,16 @@ angular.module(&#39;ciApp&#39;, [&#39;ngAnimate&#39;, &#39;ngRoute&#39;, &#39;ConnectCtrl&#39;, &#39;MembreCtrl&#39;, &#39;F
                 controller: 'MembreCtrl'
             })
             .when('/forum', {
+                redirectTo: 'forum/dir/0'
+            })
+            .when('/forum/dir/:dir_id', {
                 templateUrl: 'views/forumDir.html',
                 controller: 'ForumDirCtrl'
             })
+            .when('/forum/conv/:conv_id', {
+                templateUrl: 'views/forumConv.html',
+                controller: 'ForumConvCtrl'
+            })
             .when('/connect', {
                 templateUrl: 'views/connect.html',
                 controller: 'ConnectCtrl'
@@ -0,0 +1,31 @@
+angular.module('ForumConvCtrl', ['SessionsServ', 'ForumServ', 'NotifyServ']).controller('ForumConvCtrl', ['$scope', '$routeParams', 'SessionServ', 'ForumServ', 'NotifyServ',
+    function ($scope, $routeParams, SessionServ, ForumServ, NotifyServ) {
+        $scope.conv = {};
+        // $scope.formData = {};
+
+        $scope.session = SessionServ.cur;
+        SessionServ.onChange(function () {
+            $scope.session = SessionServ.cur;
+        });
+        ForumServ.getConv($routeParams.conv_id, function(err, conv) {
+            if (!err)
+                $scope.conv = conv;
+        });
+        //
+        // $scope.createConv = function () {
+        //     ForumServ.createConv($scope.formData, function(err, conv) {
+        //         if (!err)
+        //             $scope.formData = {};
+        //             $scope.convs.push(conv);
+        //     });
+        // };
+        //
+        // $scope.deleteConv = function (index) {
+        //     ForumServ.deleteConv($scope.convs[index]._id, function(err) {
+        //         if (!err)
+        //             $scope.convs.splice(index, 1);
+        //     });
+        // };
+
+    }
+]);
@@ -16,6 +16,7 @@ angular.module(&#39;ForumDirCtrl&#39;, [&#39;SessionsServ&#39;, &#39;ForumServ&#39;, &#39;NotifyServ&#39;]).cont
         $scope.createConv = function () {
             ForumServ.createConv($scope.formData, function(err, conv) {
                 if (!err)
+                    $scope.formData = {};
                     $scope.convs.push(conv);
             });
         };
 angular.module('ForumServ', ['NotifyServ']).service('ForumServ', ['$http', 'NotifyServ',
     function ($http, NotifyServ) {
         a = {
+            getConv: function (id, cb) {
+                $http.get('/api/convs/' + id)
+                    .success(function (data) {
+                        cb(null, data);
+                    })
+                    .error(function (data) {
+                        NotifyServ.error("Impossible d'obtenir la conv", data);
+                    });
+            },
+
             getConvs: function (cb) {
                 // TODO Dirs
                 $http.get('/api/convs')
@@ -0,0 +1,27 @@
+<div class="container">
+    <ol class="breadcrumb">
+        <li><a href="#">Home</a></li>
+        <li><a href="#">Library</a></li>
+        <li class="active">Conv</li>
+    </ol>
+    <h1>{{ conv.titre }}</h1>
+    <nav>
+        <ul class="pagination">
+            <li>
+                <a href="#" aria-label="Previous">
+                    <span aria-hidden="true">&laquo;</span>
+                </a>
+            </li>
+            <li><a href="#">1</a></li>
+            <li><a href="#">2</a></li>
+            <li><a href="#">3</a></li>
+            <li><a href="#">4</a></li>
+            <li><a href="#">5</a></li>
+            <li>
+                <a href="#" aria-label="Next">
+                    <span aria-hidden="true">&raquo;</span>
+                </a>
+            </li>
+        </ul>
+    </nav>
+</div>
@@ -6,7 +6,9 @@
     </ol>
     <div class="panel panel-default" ng-repeat="conv in convs">
         <div class="panel-heading">
-            <h3 class="panel-title">{{ conv.titre }}</h3>
+            <a href="/forum/conv/{{ conv._id }}">
+                <h3 class="panel-title">{{ conv.titre }}</h3>
+            </a>
         </div>
         <div class="panel-body">
             <strong>Date : </strong>{{ conv.date }}
@@ -27,6 +27,7 @@
     <script src="js/controllers/ConnectCtrl.js"></script>
     <script src="js/controllers/MembreCtrl.js"></script>
     <script src="js/controllers/ForumDirCtrl.js"></script>
+    <script src="js/controllers/ForumConvCtrl.js"></script>
     <script src="js/app.js"></script>
 </head>