scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

suppression renseignement du confidentiel ou non lors de la saisie du bilan

Browse Source
This commit is contained in:
benoitpotier 2017-03-21 08:53:24 +01:00
parent 3510df43e2
commit 5313c9265b
5 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/modules/default/controllers/SaisieController.php
View File

@ -925,7 +925,6 @@ class SaisieController extends Zend_Controller_Action
if ( !empty($selection) ) { if ( !empty($selection) ) {
list($date, $type) = explode(':', $selection); list($date, $type) = explode(':', $selection);
$confidentiel = 0;
// --- Correction d'un bilan // --- Correction d'un bilan
if ($date!='NEW') { if ($date!='NEW') {
@ -942,7 +941,6 @@ class SaisieController extends Zend_Controller_Action
$milDatePre = $item->dateExercice; $milDatePre = $item->dateExercice;
} }
} }
$confidentiel = $item->confidentiel;
} }
} }
@ -957,7 +955,7 @@ class SaisieController extends Zend_Controller_Action
$infos->dureeMois = $response->DUREE_MOIS; $infos->dureeMois = $response->DUREE_MOIS;
$infos->dureeMoisPre = $response->DUREE_MOIS_PRE; $infos->dureeMoisPre = $response->DUREE_MOIS_PRE;
$infos->unite = empty($response->MONNAIE_LIV_UNITE) ? 'U' : $response->MONNAIE_LIV_UNITE; $infos->unite = empty($response->MONNAIE_LIV_UNITE) ? 'U' : $response->MONNAIE_LIV_UNITE;
$confidentiel = $response->TOP_CONFIDENTIEL;
$postes = array(); $postes = array();
foreach ($response->POSTES->item as $item) { foreach ($response->POSTES->item as $item) {
$postes[$item->id] = $item->val; $postes[$item->id] = $item->val;
@ -973,7 +971,7 @@ class SaisieController extends Zend_Controller_Action
$infos->dateCloturePre = $response->DATE_CLOTURE; $infos->dateCloturePre = $response->DATE_CLOTURE;
$infos->dureeMoisPre = $response->DUREE_MOIS; $infos->dureeMoisPre = $response->DUREE_MOIS;
$infos->unite = empty($response->MONNAIE_LIV_UNITE) ? 'U' : $response->MONNAIE_LIV_UNITE; $infos->unite = empty($response->MONNAIE_LIV_UNITE) ? 'U' : $response->MONNAIE_LIV_UNITE;
$confidentiel = $response->TOP_CONFIDENTIEL;
$postesN1 = array(); $postesN1 = array();
foreach ($response->POSTES->item as $item) { foreach ($response->POSTES->item as $item) {
$postesN1[$item->id] = $item->val; $postesN1[$item->id] = $item->val;
@ -1309,7 +1307,6 @@ class SaisieController extends Zend_Controller_Action
$this->view->assign('dureeMoisPre', $dureeMoisPre); $this->view->assign('dureeMoisPre', $dureeMoisPre);
$this->view->assign('unite', $unite); $this->view->assign('unite', $unite);
$this->view->assign('typeBilan', $type); $this->view->assign('typeBilan', $type);
$this->view->assign('confidentiel', $confidentiel);
$this->view->assign('ancres', $ancres[$type]); $this->view->assign('ancres', $ancres[$type]);
$this->view->inlineScript()->appendFile('/libs/editable/jquery.jeditable.js'); $this->view->inlineScript()->appendFile('/libs/editable/jquery.jeditable.js');
@ -1361,8 +1358,7 @@ class SaisieController extends Zend_Controller_Action
$params['dureeMoisPre'], $params['dureeMoisPre'],
$params['typeBilan'], $params['typeBilan'],
$params['postes'], $params['postes'],
$params['step'], $params['step']
$params['confidentiel']
); );
$this->logger->info(print_r($response,1)); $this->logger->info(print_r($response,1));

1
application/modules/default/views/default/scripts/saisie/liasse.phtml
View File

@ -37,7 +37,6 @@ span.poste input { width:50px; }
$params = array( $params = array(
'ancres' => $this->ancres, 'ancres' => $this->ancres,
'typeBilan' => $this->typeBilan, 'typeBilan' => $this->typeBilan,
'confidentiel' => $this->confidentiel,
'unite' => $this->unite, 'unite' => $this->unite,
'dateCloture' => $this->dateCloture, 'dateCloture' => $this->dateCloture,
'dureeMois'=> $this->dureeMois, 'dureeMois'=> $this->dureeMois,

4
application/modules/default/views/default/scripts/saisie/liasse/2033.phtml
View File

@ -3,10 +3,6 @@
<label>Type de bilan</label> <label>Type de bilan</label>
<span id="typeBilan"><?=$this->typeBilan?></span> <span id="typeBilan"><?=$this->typeBilan?></span>
</div> </div>
<div class="clearfix">
<label>Confidentiel</label>
<input id="confidentiel" class="confidentiel" value="<?=$this->confidentiel?>">
</div>
<div class="clearfix"> <div class="clearfix">
<label>Valeurs exprimées en </label> <label>Valeurs exprimées en </label>
<span id="unit" class="unit editable"><?=$this->unite?></span>&nbsp;&euro; <span id="unit" class="unit editable"><?=$this->unite?></span>&nbsp;&euro;

4
application/modules/default/views/default/scripts/saisie/liasse/2050.phtml
View File

@ -3,10 +3,6 @@
<label>Type de bilan</label> <label>Type de bilan</label>
<span id="typeBilan" class="editable"><?=$this->typeBilan?></span> <span id="typeBilan" class="editable"><?=$this->typeBilan?></span>
</div> </div>
<div class="clearfix">
<label>Confidentiel</label>
<input id="confidentiel" class="confidentiel" value="<?=$this->confidentiel?>">
</div>
<div class="clearfix"> <div class="clearfix">
<label>Valeurs exprimées en </label> <label>Valeurs exprimées en </label>
<span id="unit" class="unit editable"><?=$this->unite?></span>&nbsp;&euro; <span id="unit" class="unit editable"><?=$this->unite?></span>&nbsp;&euro;

3
library/Scores/WsScores.php
View File

@ -899,7 +899,7 @@ class WsScores
} }
} }
public function setBilan($siren, $originalDateCloture, $originalTypeBilan, $unite, $dateCloture, $dureeMois, $dateCloturePre, $dureeMoisPre, $typeBilan, $postes, $step = 'normal', $confidentiel=0) public function setBilan($siren, $originalDateCloture, $originalTypeBilan, $unite, $dateCloture, $dureeMois, $dateCloturePre, $dureeMoisPre, $typeBilan, $postes, $step = 'normal')
{ {
$params = new stdClass(); $params = new stdClass();
$params->siren = $siren; $params->siren = $siren;
@ -913,7 +913,6 @@ class WsScores
$params->data->typeBilan = $typeBilan; $params->data->typeBilan = $typeBilan;
$params->data->postes = $postes; $params->data->postes = $postes;
$params->step = $step; $params->step = $step;
$params->confidentiel = $confidentiel;
$client = $this->loadClient('saisie'); $client = $this->loadClient('saisie');
try { try {
$reponse = $client->setBilan($params); $reponse = $client->setBilan($params);