(no commit message)

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 15194ea23fae919b29fa29c38b63e03203a269bd..f7171d7ea7b898e278f15ff5243d1a13f40874bc 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -95,29 +95,7 @@ class commonCore extends cubeCore {
                }\r
        }\r
 \r
-       /**\r
-        * extranetCore::dbSync()\r
-        *\r
-        * Fonction permettant de modéliser le contenu de la base de données\r
-        * et de la synchroniser le cas échéant.\r
-        *\r
-        * @return void\r
-        */\r
-       /**\r
-        * extranetCore::dbSync()\r
-        *\r
-        * @return\r
-        */\r
-       /**\r
-        * extranetCore::dbSync()\r
-        *\r
-        * @return\r
-        */\r
-       /**\r
-        * commonCore::dbSync()\r
-        *\r
-        * @return\r
-        */\r
+\r
        public function dbSync()\r
        {\r
                $cache = ROOT . '/cache/DB_SYNC';\r
@@ -366,7 +344,7 @@ class commonCore extends cubeCore {
                $db->books->lang('varchar', 20, false);\r
                $db->books->theme('integer', 0, false);\r
                $db->books->proprietaire('integer', 0, false);\r
-               // $db->books->projet('integer', 0, false);\r
+               $db->books->tache('integer', 0, false);\r
                $db->books->hash('varchar', 32, false);\r
                $db->books->compteur_visites('integer', 0, false, 20);\r
                $db->books->status('integer', 0, false);\r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index e49fbf561151ff8912d495189f8d08de966e7dc1..76b7a2e1b5a0e2365806e34c6e26d6f50b0a52df 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -230,6 +230,44 @@ class wsAjax extends cubeAjax {
                $x->addRedirection($url);\r
        }\r
 \r
+       public static function statusBook($args, &$x)\r
+       {\r
+               global $core;\r
+\r
+               $book_id = $args[1];\r
+               $status = $args[2];\r
+               if ($status == 2 && isset($args[3])) {\r
+                       $x->addOpenPopup(self::formBookChooseProject($book_id));\r
+               }\r
+\r
+               $daoBook = new wsDAOBook($core->con);\r
+               $daoBook->setStatus($book_id, $status);\r
+\r
+               $x->addContent('listeBooks', wsUrl::listeBooks());\r
+       }\r
+\r
+       public static function formBookChooseProject($book_id)\r
+       {\r
+               return commonAjax::form('bookChooseProject', __("Selection d'un projet"), wsUrl::chooseBookProject($book_id), __('Suivant'), 3, '', '', true);\r
+       }\r
+\r
+       public static function bookChooseProject($args, &$x)\r
+       {\r
+               $book_id = $_POST['book_id'];\r
+               if ($_POST['book_project'] == 0) {\r
+                       $project = 0;\r
+               } else {\r
+                       $project = $_POST['book_project'];\r
+               }\r
+\r
+               $x->addChangePopup(self::formBookChooseTache($book_id, $project));\r
+       }\r
+\r
+       public static function formBookChooseTache($book_id, $project)\r
+       {\r
+               return commonAjax::form('bookChooseTache', __("Selection d'une tâche"), wsUrl::chooseBookTache($book_id, $project), __('Enregistrer'), 3, '', '', true);\r
+       }\r
+\r
        public static function changeLang($args, &$x)\r
        {\r
                $x->addContent('formLang', wsUrl::formLang($_POST['lang']));\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 580bf965d29d672b0badd19dc115e0a8bff3e0da..160bea8b620a3f083e2591df7d1a7611d1fe678a 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -149,7 +149,7 @@ class wsUrl {
        {\r
                global $core;\r
 \r
-               if (wsDroits::isAdmin()) {\r
+               if (wsDroits::admin()) {\r
                        $status = $core->books_status;\r
                } else {\r
                        $status = array();\r
@@ -161,7 +161,10 @@ class wsUrl {
                $res .= '<ul>';\r
                $res .= '<li class="head">' . __("Changer le status de la publication") . '</li>';\r
                foreach($status as $s => $title) {\r
-                       $res .= '<li><a href="#" rel="statusbook/$1/' . $s . '">' . $title . '</a></li>';\r
+                       $res .= '<li><a href="#" rel="statusBook/$1/' . $s . '" class="ajax">' . $title . '</a></li>';\r
+               }\r
+               if (wsDroits::admin()) {\r
+                       $res .= '<li><a href="#" rel="statusBook/$1/' . $s . '/1" class="ajax">' . __('Ajouter à un projet') . '</a></li>';\r
                }\r
                $res .= '</ul></div>';\r
                return $res;\r
@@ -200,7 +203,6 @@ class wsUrl {
                $res .= '<form action="changeLang" method="post" class="submitonchange">';\r
                $res .= '<table class="liste">';\r
                $res .= '<tr><td class="center">' . __('Sélectionnez la langue à configurer') . ' : ' . form::combo('lang', $langs, $args[1]) . ' </td></tr>';\r
-               // $res .= '<tr class="odd"><td class="right"><a href="#" class="submit">' . $core->typo->Ajouter('OK') . '</a></td></tr>';\r
                $res .= '</table>';\r
                $res .= '</form>';\r
                $res .= commonPage::bf();\r
@@ -485,6 +487,45 @@ html{height:100%}' . "\n";
                return $res;\r
        }\r
 \r
+       public static function chooseBookProject($book_id)\r
+       {\r
+               global $core;\r
+\r
+               wsDroits::admin(true);\r
+\r
+               $dao = new wsDAOBook($core->con);\r
+               $book = $dao->selectById($book_id);\r
+\r
+               $projects = array("--" => '0');\r
+               $r = $core->con->select('SELECT * FROM projets WHERE client IN( SELECT facturable_id FROM ws_users_tree WHERE utilisateur_id IN (SELECT utilisateur_id FROM utilisateurs WHERE entreprise=\'' . $core->con->escape($book->proprietaire_id) . '\')) ORDER BY projet_id DESC');\r
+               while ($r->fetch()) {\r
+                       $projects[$r->projet_id . ' - ' . $r->nom] = $r->projet_id;\r
+               }\r
+\r
+               $res = '<tr><td>' . __('Choisir un projet') . ' : </td><td>' . form::hidden('book_id', $book_id) . form::combo('book_project', $projects) . '</td></tr>';\r
+               $res .= '<tr><td>' . __('ou créer un nouveau projet') . ' : </td><td>' . form::field('new_book_project_nom', 64, 1024) . '</td></tr>';\r
+               return $res;\r
+       }\r
+\r
+       public static function chooseBookTache($book_id, $projet_id)\r
+       {\r
+               global $core;\r
+               wsDroits::admin(true);\r
+\r
+               $dao = new wsDAOBook($core->con);\r
+               $book = $dao->selectById($book_id);\r
+\r
+               $taches = array("--" => '0');\r
+               $r = $core->con->select('SELECT * FROM taches WHERE projet=\'' . $core->con->escape($projet_id) . '\'');\r
+               while ($r->fetch()) {\r
+                       $taches[$r->nom] = $r->tache_id;\r
+               }\r
+\r
+               $res = '<tr><td>' . __('Choisir une tâche') . ' : </td><td>' . form::hidden('book_id', $book_id) . form::hidden('projet_id', $projet_id) . form::combo('tache', $taches) . '</td></tr>';\r
+               $res .= '<tr><td>' . __('ou créer une nouvelle tâche') . ' : </td><td>' . form::field('nom', 32, 1024, $book->nom) . ' ' . __('ayant le budget suivant') . ' ' . form::field('budget', 6, 6) . '</td></tr>';\r
+               return $res;\r
+       }\r
+\r
        public static function valideDownload()\r
        {\r
                global $core;\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 06bc476907525602799799123bf4978addfbcd0f..f690bbdf6bd1641cc81255fd0e7ff7228b61104c 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -430,6 +430,8 @@ class wsDAOBook extends commonDAO {
                $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
        }\r
 \r
+\r
+\r
        public function touch($book_id)\r
        {\r
                $c = $this->con->openCursor('books');\r

diff --git a/js/ws.js b/js/ws.js
index 422b46f8a9f54852b47d08ec421917acc9d56ea5..3c21c74665968ec0cbc14d59ac3cf8c2da8dce87 100644 (file)
--- a/js/ws.js
+++ b/js/ws.js
@@ -19,6 +19,7 @@ function load_ws(){
                        onItemSelect    :       findProprietaire\r
                });\r
        }\r
+\r
 }\r
 \r
 function findProprietaire(li){\r