Issue #0001634: amelioration

application/controllers/SaisieController.php

@@ -2324,7 +2324,6 @@ class SaisieController extends Zend_Controller_Action
 	    	          	$message = "Cut-off mis à jour.";
 	    	        }
 	            }
-	            $this->view->assign('message', $message);
 	        }
 	    } else {
 	        $this->view->assign('name', "Définir un Cut-off");
@@ -2332,7 +2331,8 @@ class SaisieController extends Zend_Controller_Action
 	    }
 	    
 	    $getcutoff = json_decode($ws->getScoreCutoff($siren), true);
-	    if(!$getcutoff) {
+	    if(!$getcutoff) {
+	    	$message = "Aucun Cut-off est défini, merci de remplir toutes les valeurs";
 	    	$getcutoff = array(
 	    			'siren' => '',
 	    			'encours' => '',
@@ -2340,13 +2340,14 @@ class SaisieController extends Zend_Controller_Action
 	    			'scoreDir' => '',
 	    			'scoreConf' => '',
 	    			'remarque' => '',
-	    			'dateInsert' => '',
-	    			'dateUpdate' => ''
+	    			'dateInsert' => '0000-00-00',
+	    			'dateUpdate' => '0000-00-00'
 	    	);
 	    }
 	    
 	    $this->view->assign('getcutoff', $getcutoff);
 	    $this->view->assign('siren', $siren);
 		$this->view->assign('typescore', $user->getTypeScore());
+	    $this->view->assign('message', $message);
 	}
 }

application/views/default/scripts/saisie/scorecutoff.phtml

@@ -82,7 +82,7 @@ $wdate = new WDate();
 
 <div>
 <label>Encours</label>
-<input type="text" name="encours" value="<?=$getcutoff['encours']/1000 ?>" required pattern="([0-9]{0,2})|([0-4]{1}[0-9]{0,2})|500" maxlength="3"/>
+<input type="text" name="encours" value="<?php echo $getcutoff['encours']?$getcutoff['encours']/1000:''; ?>" required pattern="([0-9]{0,2})|([0-4]{1}[0-9]{0,2})|500" maxlength="3"/>
 </div>
 <div style="float:left">K€ (de 0 à 500 K€)</div>
 
@@ -93,14 +93,14 @@ foreach($select as $item => $val) {
 <div>
 <label><?=$val?></label>
 <select name="<?=$item ?>" required>
-  <option value=''>---</option>
+  <option value='' selected>---</option>
   	<?php 
   	for($i=0; $i<=$this->typescore; $i++) {
 		$selected = '';
-		if ($i == $getcutoff[$item]) {
+		if (is_numeric($getcutoff[$item]) && $i == $getcutoff[$item]) {
 			$selected = 'selected';
 		}
-  		echo '<option value="'.$i.'" '.$selected.'>'.$i.'</option>';
+		echo '<option value="'.$i.'" '.$selected.'>'.$i.'</option>';
 	}
 	?>
 </select>

public/themes/default/scripts/scorecutoff.js

@@ -39,7 +39,7 @@ $('#dialog').dialog({ buttons: [
         }
     }},
     { text: "Fermer", click: function() {
-        if($(".message p").text()) { location.reload(); } 
+        if($(".message p").text()=='Cut-off mis à jour.') { location.reload(); } 
         $(this).dialog('close'); 
         }
     }