issue #0001517 : Correction affichage

application/Bootstrap.php

@@ -12,19 +12,19 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 			->appendHttpEquiv('Content-Type', 'text/html; charset=UTF-8')
             ->appendHttpEquiv('Content-Language', 'fr-FR');
 		$view->headTitle()->setSeparator(' - ');
-		
+
 		$view->headLink()
-			->appendStylesheet('/styles/reset.css', 'all')
+			->appendStylesheet('/styles/normalize.css', 'all')
 			->appendStylesheet('/styles/main.css', 'all')
 			->appendStylesheet('/jqueryui/jquery-ui.css', 'all');
-		
+
 		$view->headScript()
 			->appendFile('/scripts/jquery.js', 'text/javascript')
 			->appendFile('/scripts/jquery-ui.js', 'text/javascript')
 			->appendFile('/scripts/enrichissement.js', 'text/javascript');
 
 		$view->headTitle()->setSeparator(' - ');
-		
+
 		$view->headTitle('Enrichissement de fichier');
 	}
 
@@ -39,7 +39,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 		}
 		Zend_Registry::set('db', $db);
 	}
-	
+
 	//Initialisation global des paramètres de log
 	protected function _initLogging()
 	{
@@ -51,7 +51,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 		$logger = new Zend_Log($writer);
 		Zend_Registry::set('firebug', $logger);
 	}
-	
+
 	protected function _initCache()
 	{
 		//MetadataCache pour la base de données
@@ -62,7 +62,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 		$backendOptions  = array();
 		$cache = Zend_Cache::factory('Core','Apc', $frontendOptions, $backendOptions);
 		Zend_Db_Table_Abstract::setDefaultMetadataCache($cache);
-	
+
 		//Cache pour les données de la base à stocker
 	}
 }

application/controllers/DoublonController.php

@@ -0,0 +1,104 @@
+<?php
+class DoublonController extends Zend_Controller_Action
+{
+	public function indexAction()
+	{
+
+
+	}
+
+	public function fileformAction()
+	{
+		$this->view->headScript()->appendFile('/scripts/jquery.form.js', 'text/javascript');
+		$this->view->headScript()->appendFile('/scripts/jqueryprogressbar.js', 'text/javascript');
+		$this->view->assign('filesize', ini_get('upload_max_filesize'));
+	}
+
+	public function fileuploadAction()
+	{
+		$this->_helper->layout()->disableLayout();
+		$this->_helper->viewRenderer->setNoRender(true);
+
+		$request = $this->getRequest();
+		$config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/configuration.ini', 'path');
+		$path = realpath($config->data).'/doublon';
+		if(!file_exists($path)) mkdir($path);
+
+		if ( isset($_FILES) && count($_FILES)==1 ){
+			$n = $_FILES['fichier']['name'];
+			$s = $_FILES['fichier']['size'];
+			$tmp_name = $_FILES['fichier']['tmp_name'];
+
+			$extValide = array('csv');
+			$extension = strrchr($n,'.');
+			$extension = substr($extension,1);
+			//Vérifier l'extension du fichier
+			if(!in_array($extension, $extValide)){
+				echo "Extension de fichier incorrect !";
+			} elseif (move_uploaded_file($tmp_name, $path.'/'.$idClient.'-'.$name.'.'.$extension)){
+				echo "Fichier envoyé, <a href=\"".
+				$this->view->url(array(
+					'controller'	=> 'envoi',
+					'action'		=> 'checkfile',
+					'file'			=> $idClient.'-'.$name.'.'.$extension,
+				))
+				."\">Vérifier le format</a>";
+			} else {
+				echo "Erreur : ".$_FILES['fichier']['error'];
+			}
+		}
+	}
+
+	/**
+	 * Etat de progression de l'upload du fichier
+	 */
+	public function fileprogressAction()
+	{
+		$this->_helper->layout()->disableLayout();
+		$this->_helper->viewRenderer->setNoRender(true);
+
+		$request = $this->getRequest();
+		$key = $request->getParam('key', '');
+		if (!empty($key)) {
+			//$rep sera égal à false si la clef n'existe pas dans le cache apc
+			$rep = apc_fetch('upload_'.$key);
+			echo json_encode($rep);
+		}
+	}
+
+	public function checkfileAction()
+	{
+		$request = $this->getRequest();
+		$file = $request->getParam('file');
+
+		$config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/configuration.ini', 'path');
+
+		$pathIn = $config->data.'/doublon';
+		$pathOut = $config->data.'/doublon';
+		if(!file_exists($pathOut)) mkdir($pathOut);
+
+		//Vérifier le format du fichier
+		require_once 'Scores/Enrichissement.php';
+		$data = new Enrichissement();
+
+		$result = $data->checkFileEntete($pathIn.'/'.$file);
+		if ($result===FALSE)
+		{
+			$this->view->assign('errors',array("Impossible de lire le fichier !"));
+			//Supprimer le fichier
+			unlink($pathIn.'/'.$file);
+		}
+		elseif (is_array($result))
+		{
+			$this->view->assign('errors',$result);
+			//Supprimer le fichier
+			unlink($pathIn.'/'.$file);
+		}
+		elseif (is_int($result))
+		{
+
+			$this->view->assign('nb', $result);
+		}
+	}
+
+}

application/controllers/EnrichissementController.php

@@ -1,6 +0,0 @@
-<?php
-class EnrichissementController extends Zend_Controller_Action
-{
-	
-	
-}

application/views/scripts/profil/create.phtml

@@ -1,4 +1,8 @@
 <style>
+h1 {
+    margin:0;
+}
+
 div#entete {
 	width:350px;
 	float:left;
@@ -8,6 +12,10 @@ div#entete {
 	margin:2px;
 }
 
+div#entete ul {
+    margin:0;
+}
+
 div#entete li {
 	background-color:#4D90FE;
 	border-top:2px solid #ffffff;
@@ -15,8 +23,9 @@ div#entete li {
 	line-height:20px;
 	font-weight:bold;
 	color:#000000;
-	margin-left:30px;
+	padding:5px;
-	padding:5px 10px;
+	margin-left:-20px;
+	width:300px;
 }
 
 div#dico {
@@ -28,21 +37,32 @@ div#dico {
 	margin:2px;
 }
 
+div#dico ul {
+    margin:0;
+}
+
 div#dico li {
 	list-style-type:none;
-	padding:5px 10px;
+	padding:5px;
 	background-color:#4D90FE;
 	border-top:2px solid #ffffff;
 	border-bottom:2px solid #ffffff;
 	line-height:20px;
 	font-weight:bold;
 	color:#000000;
+	width:300px;
+	margin-left:-30px;
 }
 
 div#help {
     float:left;
     width:280px;
     margin:2px;
+    overflow:auto;
+}
+
+div#help li {
+    padding: 5px 10px;
 }
 
 input[type="text"] {

application/views/scripts/profil/help.phtml

@@ -1,6 +1,6 @@
 <p>Element : <?=$this->lib?></p>
 <p><?=$this->help?></p>
-
+<br/>
 <p>Colonnes de sortie</p>
 <ul>
 <?php if ( count($this->columns)>0 ) {?>

config/stockage.php

@@ -1,8 +1,8 @@
 <?php
 /** Dossiers locaux pour les documents a telecharger (PDF kbis, marques, etc...) **/
-define('DOC_WEB_LOCAL', realpath('d:/www/dataenrichissement/').'/');
+define('DOC_WEB_LOCAL', realpath('C:/Users/mricois/www/dataenrichissement/').'/');
 define('DOC_WEB_URL', '/data/');
 
 /** LOGGING **/
-define('LOG_PATH', realpath('d:/www/dataenrichissement/log/'));
+define('LOG_PATH', realpath('C:/Users/mricois/www/dataenrichissement/log/'));
 

public/styles/normalize.css

@@ -0,0 +1,375 @@
+/*! normalize.css v2.0.1 */
+
+/* ==========================================================================
+   HTML5 display definitions
+   ========================================================================== */
+
+/**
+ * Correct `block` display not defined in IE 8/9.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+nav,
+section,
+summary {
+    display: block;
+}
+
+/**
+ * Correct `inline-block` display not defined in IE 8/9.
+ */
+
+audio,
+canvas,
+video {
+    display: inline-block;
+}
+
+/**
+ * Prevent modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+    display: none;
+    height: 0;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+[hidden] {
+    display: none;
+}
+
+/* ==========================================================================
+   Base
+   ========================================================================== */
+
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
+ *    user zoom.
+ */
+
+html {
+    font-family: sans-serif; /* 1 */
+    -webkit-text-size-adjust: 100%; /* 2 */
+    -ms-text-size-adjust: 100%; /* 2 */
+}
+
+/**
+ * Remove default margin.
+ */
+
+body {
+    margin: 0;
+}
+
+/* ==========================================================================
+   Links
+   ========================================================================== */
+
+/**
+ * Address `outline` inconsistency between Chrome and other browsers.
+ */
+
+a:focus {
+    outline: thin dotted;
+}
+
+/**
+ * Improve readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+    outline: 0;
+}
+
+/* ==========================================================================
+   Typography
+   ========================================================================== */
+
+/**
+ * Address variable `h1` font size within `section` and `article` contexts in
+ * Firefox 4+, Safari 5, and Chrome.
+ */
+
+h1 {
+    font-size: 2em;
+}
+
+/**
+ * Address styling not present in IE 8/9, Safari 5, and Chrome.
+ */
+
+abbr[title] {
+    border-bottom: 1px dotted;
+}
+
+/**
+ * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
+ */
+
+b,
+strong {
+    font-weight: bold;
+}
+
+/**
+ * Address styling not present in Safari 5 and Chrome.
+ */
+
+dfn {
+    font-style: italic;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+mark {
+    background: #ff0;
+    color: #000;
+}
+
+/**
+ * Correct font family set oddly in Safari 5 and Chrome.
+ */
+
+code,
+kbd,
+pre,
+samp {
+    font-family: monospace, serif;
+    font-size: 1em;
+}
+
+/**
+ * Improve readability of pre-formatted text in all browsers.
+ */
+
+pre {
+    white-space: pre;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+
+/**
+ * Set consistent quote types.
+ */
+
+q {
+    quotes: "\201C" "\201D" "\2018" "\2019";
+}
+
+/**
+ * Address inconsistent and variable font size in all browsers.
+ */
+
+small {
+    font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+}
+
+sup {
+    top: -0.5em;
+}
+
+sub {
+    bottom: -0.25em;
+}
+
+/* ==========================================================================
+   Embedded content
+   ========================================================================== */
+
+/**
+ * Remove border when inside `a` element in IE 8/9.
+ */
+
+img {
+    border: 0;
+}
+
+/**
+ * Correct overflow displayed oddly in IE 9.
+ */
+
+svg:not(:root) {
+    overflow: hidden;
+}
+
+/* ==========================================================================
+   Figures
+   ========================================================================== */
+
+/**
+ * Address margin not present in IE 8/9 and Safari 5.
+ */
+
+figure {
+    margin: 0;
+}
+
+/* ==========================================================================
+   Forms
+   ========================================================================== */
+
+/**
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+    border: 1px solid #c0c0c0;
+    margin: 0 2px;
+    padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct `color` not being inherited in IE 8/9.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+    border: 0; /* 1 */
+    padding: 0; /* 2 */
+}
+
+/**
+ * 1. Correct font family not being inherited in all browsers.
+ * 2. Correct font size not being inherited in all browsers.
+ * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
+ */
+
+button,
+input,
+select,
+textarea {
+    font-family: inherit; /* 1 */
+    font-size: 100%; /* 2 */
+    margin: 0; /* 3 */
+}
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+button,
+input {
+    line-height: normal;
+}
+
+/**
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ *    and `video` controls.
+ * 2. Correct inability to style clickable `input` types in iOS.
+ * 3. Improve usability and consistency of cursor style between image-type
+ *    `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+    -webkit-appearance: button; /* 2 */
+    cursor: pointer; /* 3 */
+}
+
+/**
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+html input[disabled] {
+    cursor: default;
+}
+
+/**
+ * 1. Address box sizing set to `content-box` in IE 8/9.
+ * 2. Remove excess padding in IE 8/9.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+    box-sizing: border-box; /* 1 */
+    padding: 0; /* 2 */
+}
+
+/**
+ * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
+ * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
+ *    (include `-moz` to future-proof).
+ */
+
+input[type="search"] {
+    -webkit-appearance: textfield; /* 1 */
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box; /* 2 */
+    box-sizing: content-box;
+}
+
+/**
+ * Remove inner padding and search cancel button in Safari 5 and Chrome
+ * on OS X.
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+    -webkit-appearance: none;
+}
+
+/**
+ * Remove inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+    border: 0;
+    padding: 0;
+}
+
+/**
+ * 1. Remove default vertical scrollbar in IE 8/9.
+ * 2. Improve readability and alignment in all browsers.
+ */
+
+textarea {
+    overflow: auto; /* 1 */
+    vertical-align: top; /* 2 */
+}
+
+/* ==========================================================================
+   Tables
+   ========================================================================== */
+
+/**
+ * Remove most spacing between table cells.
+ */
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}