From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 13 Jul 2011 13:05:17 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=dc79c0dea6149b0573a927febc8b25e66a7c5a5e;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index b26006b94..51aa71767 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -168,7 +168,7 @@ class wsAjax extends cubeAjax {
 		global $core;
 		$dao = new wsDAOBook($core->con);
 		if ($_POST['book'] != '') {
-			$book = $dao->duplicate($_POST['book'], $core->user->utilisateur_id, $_POST['title']);
+			$book = $dao->duplicate($_POST['book'], $core->user->utilisateur_id, $_POST['title'],isset($_POST['pages']));
 		} else {
 			$book = $dao->creeEmpty($core->user->utilisateur_id, $core->user->lang, $_POST['title']);
 		}
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index f8fb2f216..78e1e3093 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -245,7 +245,9 @@ class wsUrl {
 
 		$res = commonPage::bh();
 		$res .= '<table class="liste">';
-		$res .= '<tr><td><a href="' . SITE_PATH . 'exportLangAsExcel/' . $lang_id . '">' . __('Exporter au format Excel') . '</a></td></tr>';
+		$res .= '<tr><td><a href="' . SITE_PATH . 'exportLangAsExcel/' . $lang_id . '">' . __('Exporter au format Excel') . '</a>';
+		$res.=' | <a href="' . SITE_PATH . 'exportAllLangsAsExcel/' . $lang_id . '">' . __('Exporter toutes les langues au format Excel') . '</a>';
+		$res.='</td></tr>';
 		$res .= '</table>';
 		$res .= commonPage::bf();
 
@@ -272,30 +274,83 @@ class wsUrl {
 	public static function exportLangAsExcel($args) {
 		global $core;
 
-		$dao = new wsDAOLang($core->con);
-
 		$lang_id = $args[1];
-		$lang_name = cubeLang::getNameByCode($lang_id, 'en');
 
 		$xls = new PHPExcel();
 		$s = $xls->setActiveSheetIndex(0);
-		$s->setTitle($lang_name);
+
+		$lang_name = self::exportLangAsSheet($s, $lang_id, 'en');
+
+		$xls->setActiveSheetIndex(0);
+
+		ob_end_clean();
+		files::registerMimeTypes(array('xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'));
+		cubeHTTP::forceDownload('Fluidbook_' . $lang_name . '.xlsx', false);
+
+		$writer = new PHPExcel_Writer_Excel2007($xls);
+		$writer->save('php://output');
+
+		exit;
+	}
+
+	public static function exportAllLangsAsExcel($args) {
+		global $core;
+
+		$xls = new PHPExcel();
+
+		$dao = new wsDAOLang($core->con);
+		$all = $dao->selectAll();
+
+		$i = 0;
+		foreach ($all as $l) {
+			try {
+				$s = $xls->getSheet($i);
+			} catch (Exception $e) {
+				$s = $xls->createSheet($i);
+			}
+			self::exportLangAsSheet($s, $l->lang_id, 'en');
+			$i++;
+		}
+
+		$xls->setActiveSheetIndex(0);
+
+		ob_end_clean();
+		files::registerMimeTypes(array('xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'));
+		cubeHTTP::forceDownload('Fluidbook_All_Languages.xlsx', false);
+
+		$writer = new PHPExcel_Writer_Excel2007($xls);
+		$writer->save('php://output');
+	}
+
+	public static function exportLangAsSheet($s, $lang_id, $ref_id='en') {
+		global $core;
+		$dao = new wsDAOLang($core->con);
+
 
 		$lang = $dao->selectById($lang_id);
-		$en = $dao->selectById('en');
+		$ref = $dao->selectById($ref_id);
 
+		$lang_name = cubeLang::getNameByCode($lang_id, 'en');
+		$ref_name = cubeLang::getNameByCode($ref_id, 'en');
+
+		$s->setTitle(cubeText::str2URL($lang_name));
 
 		$tab = cubeLang::getTranslationsList(PLAYER_SOURCES, array('php', 'as'), array(), $lang->traductions);
 
 		$s->setCellValueByColumnAndRow(0, 1, 'ID', true);
-		$s->setCellValueByColumnAndRow(1, 1, 'English', true);
+		$s->setCellValueByColumnAndRow(1, 1, $ref_name, true);
 		$s->setCellValueByColumnAndRow(2, 1, $lang_name, true);
 
 		$j = 2;
 		foreach ($tab as $msgid => $msgstr) {
 			$s->setCellValueByColumnAndRow(0, $j, $msgid);
-			$s->setCellValueByColumnAndRow(1, $j, $en->traductions[$msgid]);
+			$s->setCellValueByColumnAndRow(1, $j, $ref->traductions[$msgid]);
 			$s->setCellValueByColumnAndRow(2, $j, $msgstr);
+
+			if ($msgstr == '') {
+				$s->getStyleByColumnAndRow(2, $j)->getFill()->setFillType(PHPExcel_Style_Fill::FILL_SOLID);
+				$s->getStyleByColumnAndRow(2, $j)->getFill()->getStartColor()->setARGB('FFFFFF00');
+			}
 			$j++;
 		}
 
@@ -303,16 +358,7 @@ class wsUrl {
 		$s->getColumnDimensionByColumn(1)->setAutoSize(true);
 		$s->getColumnDimensionByColumn(2)->setAutoSize(true);
 
-		$xls->setActiveSheetIndex(0);
-
-		ob_end_clean();
-		files::registerMimeTypes(array('xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'));
-		cubeHTTP::forceDownload('Fluidbook_' . $lang_name . '.xlsx', false);
-
-		$writer = new PHPExcel_Writer_Excel2007($xls);
-		$writer->save('php://output');
-
-		exit;
+		return $lang_name;
 	}
 
 	public static function getFonts() {
@@ -726,10 +772,11 @@ html{height:100%}' . "\n";
 
 	public static function chooseExistingBook() {
 		wsDroits::creation(true);
-		$res = '<tr><td colspan="2"><p style="width:600px;text-align:justify;"><em>' . __("Si votre nouvelle publication a des paramètres en commun avec une publication existante, veuillez rechercher cette publication afin d'attribuer par défaut à votre nouvelle publication les paramètres de l'existante") . '</em></p></td></tr>';
+		$res = '<tr><td colspan="2"><p style="width:600px;text-align:justify;"><em>a' . __("Si votre nouvelle publication a des paramètres en commun avec une publication existante, veuillez rechercher cette publication afin d'attribuer par défaut à votre nouvelle publication les paramètres de l'existante") . '</em></p></td></tr>';
 		$res .= '<tr><td>' . __('Rechercher une publication') . ' : </td><td>' . form::field('book_nom', 64, 1024) . form::hidden('book', '') . '</td></tr>';
-		// $res .= '<tr><td colspan="2"><hr /></td></tr>';
 		$res .= '<tr><td>' . __('Indiquez le titre de votre nouvelle publication') . '</td><td>' . form::field('title', 64, 1024) . '</td></tr>';
+		$res .= '<tr><td colspan="2"><label>' . form::checkbox('settings', '1', true, '', '', true, '') . __('Importer les paramètres de la publication') . '</td></tr>';
+		$res .= '<tr><td colspan="2"><label>' . form::checkbox('pages', '1', false) . __('Importer les pages et les liens') . '</td></tr>';
 		return $res;
 	}
 
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 14d14cf1b..47571441d 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -119,9 +119,11 @@ class wsDAOBook extends commonDAO {
 		return $this->selectById($book_id);
 	}
 
-	public function duplicate($book_id, $createur, $nom) {
+	public function duplicate($book_id, $createur, $nom,$pages=false) {
 		$r = $this->con->select('SELECT * FROM books_vue WHERE book_id=\'' . $this->con->escape($book_id) . '\'');
 
+		$old_id=$book_id;
+		
 		$parametres = unserialize($r->parametres);
 		$parametres->setParent($this);
 		$parametres->title = $nom;
@@ -140,7 +142,15 @@ class wsDAOBook extends commonDAO {
 		$c->changedate = TIME;
 		$c->compiledate = 0;
 		$c->version = 2;
+		$c->traductions=$r->traductions;
+		$c->specialLinks=$r->specialLinks;
+		$c->specialRulers=$r->specialRulers;
 		$book_id = $c->book_id = $this->getNextId();
+		if($pages){
+			$c->numerotation=$r->numerotation;
+			$c->chapters=$r->chapters;
+			$this->con->execute('INSERT INTO book_pages SELECT '.$book_id.' AS book_id,book_page,document_id,document_page FROM book_pages WHERE book_id='.$old_id);
+		}
 		$c->insert();
 
 		return $this->selectById($book_id);
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index de50f928f..d4db16963 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -147,7 +147,8 @@ class wsBookParametres extends wsParametres {
 		$this->fields['basket'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Panier activé'), 'grade' => 5);
 		$this->fields['basketManager'] = array('type' => 'combo', 'default' => 'classic', 'editable' => true, 'label' => __("Manager de panier"),
 			'datas' => array(__('Classic') => 'com.fluidbook.player.basket.BasketManager',
-				__('Essilor') => 'com.fluidbook.player.basket.custom.essilor.EssilorBasketManager'), 'grade' => 5);
+				__('Essilor') => 'com.fluidbook.player.basket.custom.essilor.EssilorBasketManager',
+				__('Essilor Recap')=>'com.fluidbook.player.basket.cursor.essilorrecap.EssilorRecapBasketManager'), 'grade' => 5);
 		$this->fields['basketReferences'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
 			'label' => __('Références produits'), 'grade' => 5, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'), 'dir' => 'commerce');
 		$this->fields['basketImages'] = array('type' => 'freefile', 'default' => '', 'editable' => true,