From: vincent@cubedesigners.com Date: Wed, 5 Jan 2011 14:44:32 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=fac5263e2e4c03e4625dad3d4bed47ae808bbdf9;p=cubeextranet.git --- diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php index 79001320d..ee835ed16 100644 --- a/inc/extranet/Controlleur/class.extranet.core.php +++ b/inc/extranet/Controlleur/class.extranet.core.php @@ -135,6 +135,7 @@ class extranetCore extends cubeCore { $db->utilisateurs->ws_password('varchar', 40, false); $db->utilisateurs->ws_admin('integer', 0, false, 1); $db->utilisateurs->ws_id('integer', 0, true); + $db->utilisateurs->ws_settings('text', 0, false); // Clés $db->utilisateurs->primary('pk_utilisateurs', 'utilisateur_id'); $db->utilisateurs->unique('unique_utilisateurs_email', 'email'); diff --git a/inc/extranet/DAO/class.extranet.dao.utilisateur.php b/inc/extranet/DAO/class.extranet.dao.utilisateur.php index 6ad83bcbc..4927f5b02 100644 --- a/inc/extranet/DAO/class.extranet.dao.utilisateur.php +++ b/inc/extranet/DAO/class.extranet.dao.utilisateur.php @@ -41,6 +41,11 @@ class extranetDAOUtilisateur extends extranetDAO { $utilisateur->entreprise = $r->entreprise; $utilisateur->collegues = array(); $utilisateur->ws_grade = $r->ws_grade; + if ($r->ws_settings != '') { + $utilisateur->ws_settings = unserialize($r->ws_settings); + } else { + $utilisateur->ws_settings = array('resolution' => 150, 'method' => 0, 'quality' => 85, 'objects' => 1800); + } return $utilisateur; } @@ -67,7 +72,8 @@ class extranetDAOUtilisateur extends extranetDAO { $utilisateur->settings = array(); $utilisateur->notes = ''; $utilisateur->entreprise = 0; - $utilisateur->ws_grade=0; + $utilisateur->ws_grade = 0; + $utilisateur->ws_settings = array('resolution' => 150, 'method' => 0, 'quality' => 85, 'objects' => 1800); return $utilisateur; } @@ -186,6 +192,13 @@ class extranetDAOUtilisateur extends extranetDAO { return $c->update('WHERE utilisateur_id=\'' . $this->con->escape($utilisateur_id) . '\''); } + public function sauveWSSettings($utilisateur_id, $datas) + { + $c = $this->con->openCursor('utilisateurs'); + $c->ws_settings = serialize($datas); + return $c->update('WHERE utilisateur_id=\'' . $this->con->escape($utilisateur_id) . '\''); + } + public function sauvePreferences($utilisateur) { if ($utilisateur) { diff --git a/inc/extranet/Metier/class.extranet.utilisateur.php b/inc/extranet/Metier/class.extranet.utilisateur.php index 628a1bd10..ae0df915d 100644 --- a/inc/extranet/Metier/class.extranet.utilisateur.php +++ b/inc/extranet/Metier/class.extranet.utilisateur.php @@ -25,6 +25,7 @@ class extranetUtilisateur extends cubeMetier { protected $collegues; protected $ws_admin; protected $ws_grade; + protected $ws_settings; public function getEmail() { diff --git a/inc/ws/Controlleur/class.ws.conversion.session.php b/inc/ws/Controlleur/class.ws.conversion.session.php index de0183366..136f94978 100644 --- a/inc/ws/Controlleur/class.ws.conversion.session.php +++ b/inc/ws/Controlleur/class.ws.conversion.session.php @@ -40,18 +40,18 @@ class wsConversionSession { global $core; $dao = new wsDAODocument($core->con); - $this->documents = $dao->selectInList($this->documentsId); - $this->updateCountPages(); + $docs = $dao->selectInList($this->documentsId); + + foreach($docs as $doc) { + trigger_error($doc->document_id); + $this->documents[$doc->document_id] = $doc; + } $inited = true; } public function getDocumentById($id) { - foreach($this->documents as $doc) { - if ($doc->document_id == $id) { - return $doc; - } - } + return $this->documents[$id]; } public function process() @@ -63,12 +63,14 @@ class wsConversionSession { $dao = new wsDAODocument($core->con); $daobook = new wsDAOBook($core->con); + trigger_error(count($this->documents)); + foreach($this->documents as $doc) { $this->currentDoc = $doc; $this->serialize(); $this->currentDoc->globalOperations(); - $this->currentDoc = $dao->updateFromObject($this->currentDoc); $this->updateCountPages(); + $this->currentDoc = $dao->updateFromObject($this->currentDoc); for($i = 1;$i <= $doc->generalInfos['pages'];$i++) { $this->currentDocPage = $i; @@ -97,8 +99,10 @@ class wsConversionSession { if ($pages == 'all') { $doc = $this->getDocumentById($id); $this->totalPages += $doc->generalInfos['pages']; + trigger_error('all : ' . $doc->generalInfos['pages']); } else { $this->totalPages += count($pages); + trigger_error($pages); } } $this->totalDoc = count($this->documents); diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php index 0253a3914..1aedfd88d 100644 --- a/inc/ws/Controlleur/class.ws.flash.php +++ b/inc/ws/Controlleur/class.ws.flash.php @@ -9,6 +9,26 @@ class wsFlash extends cubeFlashGateway { $gateway = new $n($core->con, $args); } + public function saveConversionSettings() + { + global $core; + $dao = new extranetDAOUtilisateur($core->con); + $datas = array('resolution' => $this->args['resolution'], + 'objects' => $this->args['objects'], + 'method' => $this->args['method'], + 'quality' => $this->args['quality']); + $dao->sauveWSSettings($core->user->utilisateur_id, $datas); + } + + public function getConversionSettings() + { + global $core; + $this->xml->addChild('resolution', $core->user->ws_settings['resolution']); + $this->xml->addChild('quality', $core->user->ws_settings['quality']); + $this->xml->addChild('method', $core->user->ws_settings['method']); + $this->xml->addChild('objects', $core->user->ws_settings['objects']); + } + public function uploadDocument() { cubePHP::neverStop(); diff --git a/inc/ws/Metier/class.ws.document.conversioninfos.php b/inc/ws/Metier/class.ws.document.conversioninfos.php index 717a4ae19..e39735f5e 100644 --- a/inc/ws/Metier/class.ws.document.conversioninfos.php +++ b/inc/ws/Metier/class.ws.document.conversioninfos.php @@ -21,7 +21,7 @@ class wsDocumentConversionInfos { public function setPageNumber($n) { // Set defaults - for($i = 1;$i <= $n;$n++) { + for($i = 1;$i <= $n;$i++) { if (!isset($this->pages[$i])) { $this->pages[$i] = new wsDocumentConversionInfos($this->resolution, $this->method, $this->quality, $this->objects); } diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php index 5d025bc68..5d82480d5 100644 --- a/inc/ws/Metier/class.ws.document.php +++ b/inc/ws/Metier/class.ws.document.php @@ -475,7 +475,7 @@ class wsDocument extends cubeMetier { public function makeSWFFiles($page, $resolution = null, $quality = null, $storeAllChars = null, $maxObjects = 1800, $method = null) { - $conversionSettings = $this->conversionInfos[$page]; + $conversionSettings = $this->conversionInfos->pages[$page]; if (is_null($storeAllChars)) { $storeAllChars = true; } diff --git a/swf/_src/assets/settings.png b/swf/_src/assets/settings.png new file mode 100644 index 000000000..9aef034b0 Binary files /dev/null and b/swf/_src/assets/settings.png differ diff --git a/swf/_src/composerLibrary.swc b/swf/_src/composerLibrary.swc index 429449305..8a3497e29 100644 Binary files a/swf/_src/composerLibrary.swc and b/swf/_src/composerLibrary.swc differ diff --git a/swf/_src/wsComposerLibrary.fla b/swf/_src/wsComposerLibrary.fla index dea9a003e..b5f3d0c43 100644 Binary files a/swf/_src/wsComposerLibrary.fla and b/swf/_src/wsComposerLibrary.fla differ