Gestion des dossiers

Fix #5

Gestion des dossiers
Fix #5
Geoffrey PREUD'HOMME
1 parent 74d33075
Showing 10 changed files with 284 additions and 32 deletions Show diff stats
app/models/ConvModl.js
app/models/DossModl.js
app/routes/ApiRtes.js
app/services/ConvsServ.js
app/services/DosssServ.js
public/js/app.js
public/js/controllers/ForumDirCtrl.js
public/js/services/ApiServ.js
public/views/forumConv.html
public/views/forumDir.html
@@ -4,6 +4,10 @@ module.exports = mongoose.model(&#39;Conv&#39;, {
     titre: {
         type: String,
         default: "Conversation"
+    },
+    parent: {
+        type: String,
+        default: 'lost'
     }
     // TODO Visibilité (brouillon)
     // TODO Répertoire
@@ -0,0 +1,17 @@
+var mongoose = require('mongoose');
+
+module.exports = mongoose.model('Doss', {
+    titre: {
+        type: String,
+        default: "Dossier"
+    },
+    parent: {
+        type: String,
+        default: 'lost'
+    },
+    special: {
+        type: String,
+        default: ''
+    }
+    // TODO Visibilité (brouillon)
+});
 var MembresServ = require('../services/MembresServ');
 var PolyUserServ = require('../services/PolyUserServ');
 var DecryptServ = require('../services/DecryptServ');
+var DosssServ = require('../services/DosssServ');
 var ConvsServ = require('../services/ConvsServ');
 var MessServ = require('../services/MessServ');
 var fs = require('fs');
@@ -94,6 +95,8 @@ sessionData = function (session, cb) {
             session.canDelConv = session.bureau;
             session.canAddMess = true;
             session.canDelMess = session.bureau;
+            session.canAddDoss = session.bureau;
+            session.canDelDoss = session.bureau;
             cb(session);
         });
     });
@@ -184,17 +187,58 @@ api.delete(&#39;/membres/:membre_id&#39;, reqPerm(&#39;canDelMembre&#39;), function (req, res) {
     });
 });
+// Dossiers
+api.get('/dosss/:doss_id', function (req, res) { // Un doss
+    // TODO Assertion 404 existe, transformer req.body.id avec la vraie id (ou redirect)
+    // TODO Requêtes séparées ?
+    DosssServ.get(req.params.doss_id, function (err, doss) { // TODO Async
+        if (err) {
+            res.status(500).send(err);
+        } else if (!doss) {
+            res.status(404);
+        } else {
+            DosssServ.children(doss._id, function (err, dosss) {
+                if (err) {
+                    res.status(500).send(err);
+                } else {
+                    doss.dosss = dosss;
+                    ConvsServ.children(doss._id, function (err, convs) {
+                        if (err) {
+                            res.status(500).send(err);
+                        } else {
+                            doss.convs = convs;
+                            res.json(doss);
+                        }
+                    });
+                }
+            });
+        }
+    });
+});
-// Conversations
-api.get('/convs', function (req, res) { // Liste des convs
-    ConvsServ.list(function (err, convs) {
+api.post('/dosss', reqPerm('canAddDoss'), function (req, res) { // Ajout d'un doss
+    // TODO Assertion 404 existe, transformer req.body.id avec la vraie id (ou redirect)
+    DosssServ.getId(req.body.parent, function (parent) { // TODO Async
+        req.body.parent = parent;
+        DosssServ.add(req.body, function (err, doss) {
+            if (err)
+                res.status(500).send(err);
+            else
+                res.json(doss);
+        });
+    });
+});
+
+api.delete('/dosss/:doss_id', reqPerm('canDelDoss'), function (req, res) { // Supression d'un doss
+    DosssServ.remove(req.params.doss_id, function (err, doss) {
         if (err)
             res.status(500).send(err);
         else
-            res.json(convs);
+            res.json(null);
     });
 });
+// Conversations
 api.get('/convs/:conv_id', function (req, res) { // Une conv
     ConvsServ.get(req.params.conv_id, function (err, conv) {
         if (err)
@@ -205,11 +249,15 @@ api.get(&#39;/convs/:conv_id&#39;, function (req, res) { // Une conv
 });
 api.post('/convs', reqPerm('canAddConv'), function (req, res) { // Ajout d'un conv
-    ConvsServ.add(req.body, function (err, conv) {
-        if (err)
-            res.status(500).send(err);
-        else
-            res.json(conv);
+    // TODO Assertion 404 existe, transformer req.body.id avec la vraie id (ou redirect)
+    DosssServ.getId(req.body.parent, function (parent) { // TODO Async
+        req.body.parent = parent;
+        ConvsServ.add(req.body, function (err, conv) {
+            if (err)
+                res.status(500).send(err);
+            else
+                res.json(conv);
+        });
     });
 });
@@ -42,9 +42,18 @@ ConvsServ.list = function (cb) { // TODO Visibilité
     });
 };
+ConvsServ.children = function (id, cb) {
+    ConvModl.find({
+        parent: id
+    }).lean().exec(function (err, Conv) {
+        async.mapSeries(Conv, ConvsServ.addData, cb);
+    });
+};
+
 ConvsServ.add = function (data, cb) {
     ConvModl.create({
-        titre: data.titre
+        titre: data.titre,
+        parent: data.parent
     }, function (err, Conv) {
         ConvsServ.get(Conv._id, cb);
     });
@@ -0,0 +1,111 @@
+var DossModl = require('../models/DossModl');
+// var PolyUserServ = require('../services/PolyUserServ');
+var async = require('async');
+
+var DosssServ = {};
+
+(function init() {
+    DossModl.find({
+        special: 'root'
+    }).exec(function (err, data) {
+        if (data.length < 1) {
+            DossModl.create({
+                special: 'root',
+                titre: 'Racine'
+            });
+        }
+    });
+})();
+
+DosssServ.addData = function (doss, cb) {
+    // PolyUserServ.get(Doss.login, function (err, nom) {
+    //     if (nom) {
+    //         Doss.nom = nom;
+    //     } else {
+    //         Doss.nom = Doss.login;
+    //     }
+    //     cb(null, Doss);
+    // });
+    // TODO Dernier message
+    cb(null, doss);
+};
+
+DosssServ.exists = function (id, cb) {
+    DossModl.findById(id).exec(function (err, doss) {
+        if (err)
+            cb(err);
+        else
+            cb(null, true);
+    });
+};
+
+DosssServ.getId = function (special, cb) {
+    DossModl.findById(special).exec(function (err, doss) {
+        if (!err && doss) {
+            cb(doss._id); // Équivalent à cb(special)
+        } else {
+
+            DossModl.findOne({
+                special: special
+            }).exec(function (err2, doss) {
+                if (!err2 && doss) {
+                    cb(doss._id);
+                } else {
+                    cb(null);
+                }
+            });
+        }
+    });
+};
+
+DosssServ.get = function (special, cb) {
+    DosssServ.getId(special, function (id) { // TODO À enlever avec api.get('/dosss/:doss_id')
+        DossModl.findById(id).lean().exec(function (err, doss) {
+            if (err) {
+                cb(err);
+            } else {
+                DosssServ.addData(doss, cb);
+            }
+        });
+    });
+};
+
+DosssServ.list = function (cb) {
+    DossModl.find({}).lean().exec(function (err, Dosss) {
+        async.mapSeries(Dosss, DosssServ.addData, cb);
+    });
+};
+
+DosssServ.children = function (id, cb) {
+    DossModl.find({
+        parent: id
+    }).lean().exec(function (err, Dosss) {
+        async.mapSeries(Dosss, DosssServ.addData, cb);
+    });
+};
+
+DosssServ.add = function (data, cb) {
+    DossModl.create({
+        titre: data.titre,
+        parent: data.parent
+    }, function (err, Doss) {
+        if (err) {
+            cb(err);
+        } else {
+            DosssServ.get(Doss._id, cb);
+        }
+    });
+};
+
+DosssServ.canWriteIn = function (id, login, cb) {
+    DosssServ.exists(id, cb);
+};
+
+DosssServ.remove = function (id, cb) {
+    // TODO Trash
+    DossModl.remove({
+        _id: id
+    }, cb);
+};
+
+module.exports = DosssServ;
@@ -8,9 +8,9 @@ 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'
+            redirectTo: 'forum/dir/root'
         })
-        .when('/forum/dir/:dir_id', {
+        .when('/forum/dir/:doss_id', {
             templateUrl: 'views/forumDir.html',
             controller: 'ForumDirCtrl'
         })
 angular.module('ForumDirCtrl', ['SessionsServ', 'ApiServ'])
-    .controller('ForumDirCtrl', function ($scope, SessionServ, ApiServ) {
+    .controller('ForumDirCtrl', function ($scope, $routeParams, SessionServ, ApiServ) {
         $scope.convs = [];
-        $scope.formData = {};
+        $scope.dosss = [];
+        $scope.formDoss = {};
+        $scope.formConv = {};
         $scope.session = SessionServ.cur;
         SessionServ.onChange(function () {
             $scope.session = SessionServ.cur;
         });
-        ApiServ("récupération des conversations", 'get', 'convs', function (err, convs) {
-            if (!err)
-                $scope.convs = convs;
+        ApiServ("récupération du dossier", 'get', 'dosss', $routeParams.doss_id, function (err, doss) {
+            if (err) {
+                console.error(err);
+            } else {
+                if (doss) {
+                    $scope.dosss = doss.dosss;
+                    $scope.convs = doss.convs;
+                }
+            }
         });
+        // Dossiers
+        $scope.createDoss = function () {
+            $scope.formDoss.parent = $routeParams.doss_id;
+            ApiServ("création du dossier", 'post', 'dosss', $scope.formDoss, function (err, doss) {
+                if (!err) {
+                    $scope.formDoss = {};
+                    $scope.dosss.push(doss);
+                }
+            });
+        };
+
+        $scope.deleteDoss = function (index) {
+            ApiServ("suppression du dossier", 'delete', 'dosss', $scope.dosss[index]._id, function (err) {
+                if (!err)
+                    $scope.dosss.splice(index, 1);
+            });
+        };
+
+        // Conversations
         $scope.createConv = function () {
-            ApiServ("création de la conversation", 'post', 'convs', $scope.formData, function (err, conv) {
+            $scope.formConv.parent = $routeParams.doss_id;
+            ApiServ("création de la conversation", 'post', 'convs', $scope.formConv, function (err, conv) {
                 if (!err) {
-                    $scope.formData = {};
+                    $scope.formConv = {};
                     $scope.convs.push(conv);
                 }
             });
         };
         $scope.deleteConv = function (index) {
-            ApiServ("création de la conversation", 'delete', 'convs', $scope.convs[index]._id, function (err) {
+            ApiServ("suppression de la conversation", 'delete', 'convs', $scope.convs[index]._id, function (err) {
                 if (!err)
                     $scope.convs.splice(index, 1);
             });
 angular.module('ApiServ', ['NotifyServ'])
     .service('ApiServ', function ($http, NotifyServ) {
         return function (name, method, href) {
+            var cb;
             link = '/api/' + href;
             arglen = arguments.length;
             if (typeof arguments[arglen - 1] == 'function') {
 <div class="container">
     <ol class="breadcrumb">
-        <li><a href="#">Forum</a></li>
+        <li><a href="/forum">Forum</a></li>
         <li><a href="#">Conversations</a></li>
         <li class="active">{{ conv.titre }}</li>
     </ol>
@@ -31,7 +31,7 @@
             </div>
         </div>
     </div>
-    <nav>
+    <!-- <nav>
         <ul class="pagination">
             <li>
                 <a href="#" aria-label="Previous">
@@ -49,5 +49,5 @@
                 </a>
             </li>
         </ul>
-    </nav>
+    </nav> -->
 </div>
 \ No newline at end of file
 <div class="container">
     <ol class="breadcrumb">
-        <li><a href="#">Forum</a></li>
+        <li><a href="/forum">Forum</a></li>
         <li><a href="#">Dossiers</a></li>
-        <li class="active">{{ dossier.name }}</li>
+        <li class="active">{{ dossier.titre }}</li>
     </ol>
+    <h1>{{ doss.titre }}</h1>
+    <h2>Dossiers</h2>
+    <div class="panel panel-default" ng-repeat="doss in dosss">
+        <div class="panel-heading">
+            <h3 class="panel-title">
+                <a href="/forum/dir/{{ doss._id }}">
+                    <span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span> {{ doss.titre }}
+                </a>
+            </h3>
+        </div>
+        <div class="panel-body">
+            <!-- <strong>Date : </strong>{{ doss.date }}<br/> -->
+            <button ng-if="session.canDelDoss" type="button" class="btn btn-danger" ng-click="deleteDoss($index)">
+                <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Supprimer
+            </button>
+        </div>
+    </div>
+    <div class="form-group" ng-if="session.canAddDoss">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title">
+                    <input type="text" class="form-control" placeholder="Titre du dossier" ng-model="formDoss.titre" />
+                </h3>
+            </div>
+            <div class="panel-body">
+                <button type="submit" class="btn btn-primary" aria-label="Ajouter" ng-click="createDoss()">
+                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Ajouter
+                </button>
+            </div>
+        </div>
+    </div>
+    <h2>Conversations</h2>
     <div class="panel panel-default" ng-repeat="conv in convs">
         <div class="panel-heading">
-            <a href="/forum/conv/{{ conv._id }}">
-                <h3 class="panel-title">{{ conv.titre }}</h3>
-            </a>
+            <h3 class="panel-title">
+                <a href="/forum/conv/{{ conv._id }}">
+                    <span class="glyphicon glyphicon-th-list" aria-hidden="true"></span> {{ conv.titre }}
+                </a>
+            </h3>
         </div>
         <div class="panel-body">
             <!-- <strong>Date : </strong>{{ conv.date }}<br/> -->
@@ -21,18 +55,18 @@
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h3 class="panel-title">
-                    <input type="text" class="form-control" placeholder="Titre" ng-model="formData.titre" />
+                    <input type="text" class="form-control" placeholder="Titre de la conversation" ng-model="formConv.titre" />
                 </h3>
             </div>
             <div class="panel-body">
-                <textarea class="form-control" rows="3"></textarea>
+                <!-- <textarea class="form-control" rows="3"></textarea> -->
                 <button type="submit" class="btn btn-primary" aria-label="Ajouter" ng-click="createConv()">
                     <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Ajouter
                 </button>
             </div>
         </div>
     </div>
-    <nav>
+    <!-- <nav>
         <ul class="pagination">
             <li>
                 <a href="#" aria-label="Previous">
@@ -50,5 +84,5 @@
                 </a>
             </li>
         </ul>
-    </nav>
+    </nav> -->
 </div>
 \ No newline at end of file