Merge correction trunk
This commit is contained in:
Michael RICOIS
commit
e8893250f7
44
cache/css/rsynthese.css
vendored
44
cache/css/rsynthese.css
vendored
@ -1,31 +1,28 @@
|
||||
#rsynthese { margin :10px; fonst-weight:bold; }
|
||||
.blockh2{ margin:5px; }
|
||||
#rsynthese { margin:10px 10px 10px 30px; font-weight:bold; font-size:16px; }
|
||||
.page { page-break-before:always; }
|
||||
#commentaires h1 {
|
||||
clear:both;
|
||||
margin:15px 0 5px 0;
|
||||
margin:20px 0 5px 0;
|
||||
padding:0;
|
||||
background:none;
|
||||
color:#000000;
|
||||
font:bold 1.2em Arial, Verdana, Sans-serif;
|
||||
border:0;
|
||||
text-decoration:underline;
|
||||
}
|
||||
|
||||
#commentaires h2 {
|
||||
clear:both;
|
||||
margin:15px 0 0 0;
|
||||
margin:20px 0 5px 0;
|
||||
padding:0;
|
||||
background:none;
|
||||
color:#000000;
|
||||
font:italic 1.1em Arial, Verdana, Sans-serif;
|
||||
border:0;
|
||||
text-decoration:underline;
|
||||
}
|
||||
|
||||
#commentaires h3 {
|
||||
clear:both;
|
||||
margin:15px 0 0 0;
|
||||
margin:10px 0;
|
||||
padding:0;
|
||||
background:none;
|
||||
color:#000000;
|
||||
@ -36,7 +33,7 @@
|
||||
|
||||
#commentaires h4 {
|
||||
clear:both;
|
||||
margin:15px 0 0 0;
|
||||
margin:10px 0;
|
||||
padding:0;
|
||||
background:none;
|
||||
color:#000000;
|
||||
@ -51,22 +48,33 @@
|
||||
}
|
||||
|
||||
#commentaires table {
|
||||
color:grey;
|
||||
border-collapse:collapse;
|
||||
margin:5px 0;
|
||||
width:100%;
|
||||
}
|
||||
|
||||
#commentaires table td {
|
||||
color:#000000;
|
||||
}
|
||||
|
||||
#commentaires table.TABLEAUDEFAUTPLUS {
|
||||
width:48%;
|
||||
float:left;
|
||||
margin:2px;
|
||||
}
|
||||
|
||||
#commentaires table.TABLEAUDEFAUTMOINS {
|
||||
width:48%;
|
||||
float:right;
|
||||
float:left;
|
||||
margin:2px;
|
||||
}
|
||||
|
||||
#commentaires table.TABLEAUDEFAUTNORME {
|
||||
clear:both;
|
||||
width:100%;
|
||||
}
|
||||
|
||||
|
||||
#commentaires table tr.TITRES {
|
||||
background:#000000;
|
||||
color:#ffffff;
|
||||
@ -101,4 +109,18 @@
|
||||
|
||||
#commentaires span.point{
|
||||
background: white url('../img/li-point.gif') no-repeat left center;
|
||||
}
|
||||
}
|
||||
|
||||
#commentaires div.texth1 {
|
||||
margin-left:2px;
|
||||
}
|
||||
#commentaires div.texth2 {
|
||||
margin-left:10px;
|
||||
}
|
||||
#commentaires div.texth3 {
|
||||
margin-left:10px;
|
||||
}
|
||||
#commentaires div.texth4 {
|
||||
margin-left:10px;
|
||||
}
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ function setDbConn($name){
|
||||
//$currentConn = $manager->getCurrentConnection();
|
||||
//$manager->closeConnection($currentConn);
|
||||
$manager->setCurrentConnection($name);
|
||||
Doctrine::loadModels(realpath(dirname(__FILE__)).'/dbmodels/'.$name);
|
||||
Doctrine::loadModels(MODELS_PATH . DIRECTORY_SEPARATOR . $name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -209,15 +209,11 @@ function commandesListe($type, $etat, $date, $mode = ''){
|
||||
$table = tableTypeCommande($type);
|
||||
|
||||
$dateTDebut = mktime(0, 0, 0, date('m', $date), 1, date('Y', $date));
|
||||
$dateTFin = mktime(0, 0, 0, date('m', $date)+1, 0, date('Y', $date));
|
||||
|
||||
$dateDebut = date('Y-m-d H:i:s',$dateTDebut);
|
||||
$dateFin = date('Y-m-d H:i:s',$dateTFin);
|
||||
$dateDebut = date('Y-m',$dateTDebut);
|
||||
|
||||
$q = Doctrine_Query::create()
|
||||
->from($table)
|
||||
->Where('dateCommande > ? ', $dateDebut)
|
||||
->andWhere('dateCommande < ? ', $dateFin);
|
||||
->Where('dateCommande LIKE ? ', $dateDebut.'%');
|
||||
|
||||
if (preg_match('/([A-Z])-([0-9]{1,})/', $etat, $matches)){
|
||||
$q->andWhere('statutCommande = ?', $matches[2]);
|
||||
@ -236,41 +232,31 @@ function commandesListe($type, $etat, $date, $mode = ''){
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ($mode!='-'){
|
||||
if ($mode == 'G') {
|
||||
$q->orWhereIn('typeCommande', array('', $mode));
|
||||
$q->andWhereIn('typeCommande', array('', $mode));
|
||||
} else {
|
||||
$q->andWhere('typeCommande = ?', $mode);
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasModeEdition()){
|
||||
$q->andWhere('login = ?', $_SESSION['tabInfo']['login']);
|
||||
}
|
||||
|
||||
FB::log($q->getSqlQuery(),'SQL');
|
||||
FB::log($q->getFlattenedParams(),'SQL');
|
||||
FB::log($q->getSqlQuery(), 'QUERY');
|
||||
FB::log($q->getFlattenedParams(), 'PARAMS');
|
||||
//Résultat
|
||||
$commandes = $q->execute();
|
||||
FB::log($commandes->toArray(), 'commandes');
|
||||
|
||||
//Filtrage
|
||||
$outputCommandes = array();
|
||||
if($type!='-' && count($commandes)>0){
|
||||
$outputCommandes = array();
|
||||
foreach ($commandes as $commande){
|
||||
FB::log($commande->refDocument, 'ref');
|
||||
if (filtreTypeCommande($type, $commande->refDocument)){
|
||||
$outputCommandes[] = $commande;
|
||||
}
|
||||
}
|
||||
}
|
||||
return $outputCommandes;
|
||||
|
||||
|
||||
|
||||
|
||||
return $commandes;
|
||||
}
|
||||
|
||||
function listStatus(){
|
||||
@ -290,13 +276,13 @@ function listStatus(){
|
||||
function raisonSociale($siren){
|
||||
global $client;
|
||||
$rs = '';
|
||||
try {
|
||||
/*try {
|
||||
$O = $client->getIdentite($siren, 0, false);
|
||||
$rs = $O['result']['Nom'];
|
||||
} catch (SoapFault $fault) {
|
||||
require_once 'soaperror.php';
|
||||
processSoapFault($client,$fault,$tabInfo);
|
||||
}
|
||||
}*/
|
||||
return $rs;
|
||||
}
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ function sendMail($sujet, $message, $from, $to, $cc = array())
|
||||
// Envoi du mail
|
||||
try {
|
||||
$body = $message;
|
||||
$body = preg_replace('/\\\/', '', $body);
|
||||
//$body = preg_replace('/\\\/', '', $body);
|
||||
$mail->MessageID = '<'.md5(date('YmdHis')).
|
||||
'@mail.scores-decisions.com>';
|
||||
$mail->AddReplyTo($from['email'], $from['name']);
|
||||
|
||||
@ -5,4 +5,14 @@ function lienTri($tri, $vue, $source, $siret, $idEntreprise)
|
||||
$output.= isset($source) ? '&source='.$source : '' ;
|
||||
$output.= '&tri='.$tri.'&idEntreprise='.$idEntreprise.'&siret='.$siret;
|
||||
return $output;
|
||||
}
|
||||
|
||||
function lienPage($tri, $vue, $source, $siret, $idEntreprise, $position){
|
||||
$output = './?page=surveillance&vue='.$vue;
|
||||
$output.= isset($tri) ? '&tri='.$tri : '';
|
||||
$output.= isset($source) ? '&source='.$source : '';
|
||||
$output.= '&idEntreprise='.$idEntreprise;
|
||||
$output.= '&siret='.$siret;
|
||||
$output.= '&p='.$position;
|
||||
return $output;
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
#rsynthese { margin:10px 10px 10px 30px; fonst-weight:bold; font-size:16px; }
|
||||
#rsynthese { margin:10px 10px 10px 30px; font-weight:bold; font-size:16px; }
|
||||
.page { page-break-before:always; }
|
||||
#commentaires h1 {
|
||||
clear:both;
|
||||
@ -48,12 +48,15 @@
|
||||
}
|
||||
|
||||
#commentaires table {
|
||||
color:grey;
|
||||
border-collapse:collapse;
|
||||
margin:5px 0;
|
||||
width:100%;
|
||||
}
|
||||
|
||||
#commentaires table td {
|
||||
color:#000000;
|
||||
}
|
||||
|
||||
#commentaires table.TABLEAUDEFAUTPLUS {
|
||||
width:48%;
|
||||
float:left;
|
||||
@ -110,18 +113,14 @@
|
||||
|
||||
#commentaires div.texth1 {
|
||||
margin-left:2px;
|
||||
text-align: justify;
|
||||
}
|
||||
#commentaires div.texth2 {
|
||||
margin-left:10px;
|
||||
text-align: justify;
|
||||
}
|
||||
#commentaires div.texth3 {
|
||||
margin-left:10px;
|
||||
text-align: justify;
|
||||
}
|
||||
#commentaires div.texth4 {
|
||||
margin-left:10px;
|
||||
text-align: justify;
|
||||
}
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ table.tablesorter thead tr .header { background:url(../img/bg.gif) no-repeat cen
|
||||
table.tablesorter thead tr .headerSortUp { background-image: url(../img/asc.gif); }
|
||||
table.tablesorter thead tr .headerSortDown { background-image: url(../img/desc.gif); }
|
||||
#tri li {list-syle:none; margin-left:10px; display:inline; font-size:11px; }
|
||||
p.options { margin-left:10px; margin-top:5px; font-size:11px; }
|
||||
.options { margin-left:10px; margin-top:5px; font-size:11px; }
|
||||
#telechargementjsMsg { margin-left:10px; margin-top:5px; }
|
||||
.valign img, .valign span {
|
||||
vertical-align: middle;
|
||||
|
||||
@ -153,11 +153,11 @@ if($vue=='default'){
|
||||
<?php
|
||||
foreach ($tabSource as $s => $perm) {
|
||||
if (hasPerm('surv'.$perm)) {
|
||||
print '<option value="'.$s.'"';
|
||||
echo '<option value="'.$s.'"';
|
||||
if (isset($source) && $source == $s) {
|
||||
print 'selected';
|
||||
echo 'selected';
|
||||
}
|
||||
print '>'.$s.'</option>';
|
||||
echo '>'.$s.'</option>';
|
||||
}
|
||||
}
|
||||
?>
|
||||
@ -179,11 +179,11 @@ if($vue=='default'){
|
||||
<?php
|
||||
foreach($tabSource as $s => $perm) {
|
||||
if (hasPerm('surv'.$perm)) {
|
||||
print '<option value="'.$s.'"';
|
||||
echo '<option value="'.$s.'"';
|
||||
if (isset($source) && $source == $s) {
|
||||
print 'selected';
|
||||
echo 'selected';
|
||||
}
|
||||
print '>'.$s.'</option>';
|
||||
echo '>'.$s.'</option>';
|
||||
}
|
||||
}
|
||||
?>
|
||||
@ -192,20 +192,19 @@ if($vue=='default'){
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$("select[name=type]").change(function() {
|
||||
var value = $(this).val();
|
||||
if (value == '-') {
|
||||
$(location).attr('href', './?page=surveillance');
|
||||
} else {
|
||||
$(location).attr('href',
|
||||
'./?page=surveillance&vue=source&source=' +
|
||||
value + '');
|
||||
}
|
||||
});
|
||||
$("select[name=type]").change(function() {
|
||||
var value = $(this).val();
|
||||
if (value == '-') {
|
||||
$(location).attr('href', './?page=surveillance');
|
||||
} else {
|
||||
$(location).attr('href',
|
||||
'./?page=surveillance&vue=source&source=' + value + '');
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<p class="options">
|
||||
<div class="options">
|
||||
<ul id="tri">
|
||||
<li>
|
||||
<a href="<?=lienTri('siren', $vue, $source, $siret, $idEntreprise)?>">
|
||||
@ -227,7 +226,7 @@ Tri par Référence
|
||||
</li>
|
||||
<li>
|
||||
<a href="<?=lienTri('dateajout', $vue, $source, $siret, $idEntreprise)?>">
|
||||
Tri par Date d'ajout
|
||||
Tri par Date d'ajout
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
@ -239,7 +238,7 @@ Tri par Date de dernier envoi
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
<p class="options">
|
||||
Les options de tri pemettent de trier la liste de vos surveillances.
|
||||
Il est ensuite possible de trier les surveillances affichées dans le tableau en
|
||||
@ -265,13 +264,11 @@ if($totPage != 1)
|
||||
|
||||
//}else{
|
||||
?>
|
||||
<a href="./?page=surveillance&vue=<?=$vue?>
|
||||
<?=isset($tri) ? '&tri='.$tri : '';?>
|
||||
<?=isset($source) ? '&source='.$source : '';?>
|
||||
&idEntreprise=<?=$idEntreprise?>
|
||||
&siret=<?=$siret?>
|
||||
&p=<?=$nbReponses*$countPage?>">
|
||||
<?=$countPage+1?></a>
|
||||
<a href="<?php
|
||||
echo lienPage(
|
||||
$tri, $vue, $source, $siret,
|
||||
$idEntreprise, $nbReponses*$countPage);
|
||||
?>"><?=$countPage+1?></a>
|
||||
<?php
|
||||
//}
|
||||
}
|
||||
@ -322,7 +319,7 @@ foreach($listTrier as $item)
|
||||
foreach($item['sources'][$source] as $surveillance)
|
||||
{
|
||||
if($surveillance['ref']!=''){
|
||||
print '<p>'.$surveillance['ref'].'</p>';
|
||||
echo '<p>'.$surveillance['ref'].'</p>';
|
||||
}else{?> <p>-</p> <?php }
|
||||
}
|
||||
}else{?> <p>-</p> <?php }
|
||||
@ -330,7 +327,7 @@ foreach($listTrier as $item)
|
||||
}
|
||||
?>
|
||||
</td>
|
||||
<td id="type" class="aleft">
|
||||
<td class="aleft">
|
||||
<?php
|
||||
foreach($tabSource as $source => $perm)
|
||||
{
|
||||
@ -342,8 +339,8 @@ foreach($listTrier as $item)
|
||||
foreach($item['sources'][$source] as $surveillance)
|
||||
{
|
||||
?>
|
||||
<div id="a<?php print $item['siren'];?>" class="action">
|
||||
<p><?php print ucfirst($source);?></p>
|
||||
<div class="action">
|
||||
<p><?=ucfirst($source)?></p>
|
||||
<a class="dialogsurv" href="./pages/ajax_surveillance.php?q=ajouter&siret=<?=$item['siren'].$item['nic']?>&source=<?=$source?>"
|
||||
title="Ajouter la surveillance <?=$source?>">
|
||||
<img src="./img/interface/ajouter.png"/>
|
||||
@ -363,7 +360,7 @@ foreach($listTrier as $item)
|
||||
else
|
||||
{
|
||||
?>
|
||||
<div id="a<?=$item['siren']?>" class="action">
|
||||
<div class="action">
|
||||
<p><?=ucfirst($source)?></p>
|
||||
<a class="dialogsurv" href="./pages/ajax_surveillance.php?q=ajouter&siret=<?=$item['siren'].$item['nic']?>&source=<?php print $source;?>" title="Ajouter la surveillance <?=$source?>"><img src="./img/interface/ajouter.png"/></a>
|
||||
</div>
|
||||
@ -425,8 +422,8 @@ foreach($listTrier as $item){
|
||||
?>
|
||||
</td>
|
||||
<td class="aleft">
|
||||
<div id="a<?php print $item['siren'];?>" class="action">
|
||||
<p><?php print ucfirst($item['source']);?></p>
|
||||
<div class="action">
|
||||
<p><?=ucfirst($item['source'])?></p>
|
||||
<a class="dialogsurv" href="./pages/ajax_surveillance.php?q=ajouter&siret=<?=$item['siren'].$item['nic']?>&source=<?php print $item['source'];?>&ref=<?php print $item['ref'];?>&email=<?php print $item['email'];?>" title="Editer la surveillance <?php print $item['source'];?>"><img src="./img/interface/editer.png"/></a>
|
||||
<a href="./?page=surveillance&action=supprimer&siret=<?$item['siren'].$item['nic']?>&ref=<?php print $item['ref']; ?>&source=<?php print $item['source'];?>&email=<?php print $item['email']; ?>" title="Supprimer la surveillance <?php print $item['source'].' '.$item['email'];?>"><img src="./img/interface/supprimer.png"/></a>
|
||||
</div>
|
||||
@ -448,6 +445,6 @@ foreach($listTrier as $item){
|
||||
}
|
||||
}//Fin vue==source
|
||||
?>
|
||||
<tbody>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@ -1560,18 +1560,16 @@ $tabCommentaires = $etab['tabCommentaires'];
|
||||
<div class="blockh2" id="commentaires">
|
||||
<?php
|
||||
require_once 'commentaires/commentaires.php';
|
||||
if(count($tabCommentaires)>0)
|
||||
{
|
||||
$ligne = false;
|
||||
if(count($tabCommentaires)>0){
|
||||
$totalLigne = count($tabCommentaires);
|
||||
$currentLigne = 0;
|
||||
$inH = 0;
|
||||
foreach($tabCommentaires as $key => $commentaires)
|
||||
{
|
||||
$inTable = false;
|
||||
foreach($tabCommentaires as $key => $commentaires){
|
||||
$output = '';
|
||||
$ligne = true;
|
||||
$currentLigne++;
|
||||
if(!is_array($commentaires) && !empty($commentaires))
|
||||
{
|
||||
if(!is_array($commentaires) && !empty($commentaires)){
|
||||
//Traitement préalable des lignes
|
||||
$commentaires = html_entity_decode(
|
||||
$commentaires,
|
||||
@ -1624,17 +1622,27 @@ if(count($tabCommentaires)>0)
|
||||
$commentaires = '</div>'.$commentaires;
|
||||
}
|
||||
$inH++;
|
||||
$ligne = false;
|
||||
}
|
||||
//Fermeture dernier div
|
||||
if ($currentLigne == $totalLigne){
|
||||
$commentaires = $commentaires.'</div>';
|
||||
}
|
||||
|
||||
/*if ( preg_match('/<span(.*?)<\/span>/i', $commentaires) ){
|
||||
$commentaires = $commentaires.'<br/>';
|
||||
}*/
|
||||
//Traitement pour fin bloc texte;
|
||||
$output.= $commentaires."\n";
|
||||
|
||||
//Détection des début et fin de tableau
|
||||
if ( preg_match('/<(table)/i', $commentaires) ){
|
||||
$inTable = true;
|
||||
}
|
||||
if ( preg_match('/<\/(table)>/i', $commentaires) ){
|
||||
$inTable = false;
|
||||
}
|
||||
//Nouvelle ligne
|
||||
|
||||
if($inTable){ $ligne = false;}
|
||||
if($ligne){ $output.= '<br/>'; }
|
||||
echo $output;
|
||||
}
|
||||
}
|
||||
@ -1642,7 +1650,6 @@ if(count($tabCommentaires)>0)
|
||||
//=> FIN BLOC COMMENTAIRES
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
//=> BLOC INDISCORE (evaluation conclusion)
|
||||
?>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user