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

progress confidentiel

Browse Source
This commit is contained in:
benoitpotier 2017-03-21 16:17:48 +01:00
parent b9c59977b0
commit 8b6a1300e4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/Metier/Partenaires/MBilans.php
View File

@ -363,7 +363,7 @@ class Metier_Partenaires_MBilans
// --- 0 : consultation de l'application (calcul du score ...) // --- 0 : consultation de l'application (calcul du score ...)
// --- 1 : consultation d'un membre de scores et décisions // --- 1 : consultation d'un membre de scores et décisions
if ($idClient > 1) { if ($idClient > 1) {
$where.= " AND (confidentiel = '".$idClient."' OR confidentiel = 0)"; $where.= " AND (confidentiel_client == '".$idClient."' OR confidentiel = 0)";
} }
$where.= " ORDER BY dateExercice DESC, CASE typeBilan WHEN 'N' THEN 1 WHEN 'S' THEN 2 ELSE 3 END"; $where.= " ORDER BY dateExercice DESC, CASE typeBilan WHEN 'N' THEN 1 WHEN 'S' THEN 2 ELSE 3 END";
@ -371,7 +371,7 @@ class Metier_Partenaires_MBilans
$where.= " LIMIT 0, $nbMaxBilans"; $where.= " LIMIT 0, $nbMaxBilans";
} }
$fields = "typeBilan, dateProvPartenaire, dateExercice, dateExercicePre, dureeExercice, dureeExercicePre, monnaieOrigine, dateInsert, partenaire, confidentiel"; $fields = "typeBilan, dateProvPartenaire, dateExercice, dateExercicePre, dureeExercice, dureeExercicePre, monnaieOrigine, dateInsert, partenaire, confidentiel, confidentiel_client";
$listeNb = 0; $listeNb = 0;
try { try {
$listeSql = "SELECT $fields FROM jo.bilans WHERE $where"; $listeSql = "SELECT $fields FROM jo.bilans WHERE $where";
@ -400,6 +400,7 @@ class Metier_Partenaires_MBilans
'monnaie' => $bil['monnaieOrigine'], 'monnaie' => $bil['monnaieOrigine'],
'source' => $bil['partenaire'], 'source' => $bil['partenaire'],
'confidentiel' => $bil['confidentiel'], 'confidentiel' => $bil['confidentiel'],
'confidentielClient' => $bil['confidentiel_client'],
); );
$tabTri[''.$bil['dateExercice'].'-'.$bil['typeBilan']] = $bil['typeBilan'].$millesime; $tabTri[''.$bil['dateExercice'].'-'.$bil['typeBilan']] = $bil['typeBilan'].$millesime;
} }

1
library/WsScore/Entreprise/v0.8/Service.php
View File

@ -4331,6 +4331,7 @@ class Entreprise extends Scores_Ws_Server
$element->monnaie = $bilan['monnaie']; $element->monnaie = $bilan['monnaie'];
$element->source = $bilan['source']; $element->source = $bilan['source'];
$element->confidentiel = $bilan['confidentiel']; $element->confidentiel = $bilan['confidentiel'];
$element->confidentielClient = $bilan['confidentielClient'];
$tabRet[] = $element; $tabRet[] = $element;
} }