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

correction des liens pour la mise à surveillance

Browse Source
This commit is contained in:
Jean Vladimir TWAHIRWA 2016-11-24 17:09:15 +01:00
parent f6f03bf098
commit c8ceb9d4d6
6 changed files with 175 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/layouts/default/header.phtml
View File

@ -62,7 +62,9 @@
<?php }?>
<?php }?>
<li class="divider"></li>
<li><a href="#">Ajouter au portefeuille</a></li>
<li><a href="#" data-toggle="modal" data-target="#dialog" data-url="<?=$this->url(array('module'=>'user',
'controller'=>'portfolio', 'action'=>'ajouter', 'siret' => $this->siret), 'default', true)?>" >Ajouter au portefeuille</a></li>
</li>
<li><a href="#">Voir le portefeuille</a></li>
<?php }?>
</ul>
@ -147,4 +149,5 @@
</nav>
<div id="dialog" class="modal"><div class="modal-dialog"><div class="modal-content"></div></div></div>

188
application/modules/user/views/default/scripts/portfolio/ajouter.phtml
View File

@ -1,23 +1,94 @@
<style>
form em { color:#FF0000;}
fieldset {border:0; margin:0; padding:0;}
fieldset legend{ padding:0 0 0 10px;}
.fieldgrp label{margin:0;}
.fieldgrp label span{font-weight:normal;}
.fieldgrp label abbr{color:#4B911C; font-size:120%; vertical-align:middle;}
.field {float:left; padding:0 10px 0 0;line-height:22px;_padding-top:3px;}
.field .longfield{width:215px;}
.field .longfield-select{width:220px;}
.field .smallfield{width:95px;}
.field .medfield{width:110px;}
.field input, .field select{ font-size:110%; margin:2px 0; }
.field input[type="radio"] { margin:0 5px 0 5px; }
div.submit{ margin-left:200px; padding-left:0px; margin-top:1em; }
div.submit p.submit-button{margin-top:0;}
div.submit p.details{font-size:85%;color:#666;margin:0;}
div.submit p.required-note{margin-top:1em;}
div.submit p.required-note span{color:#4B911C;_color:#666;font-size:170%;vertical-align:top;}
input.submit {border:none;}
form em {
color: #FF0000;
}
fieldset {
border: 0;
margin: 0;
padding: 0;
}
fieldset legend {
padding: 0 0 0 10px;
}
.fieldgrp label {
margin: 0;
}
.fieldgrp label span {
font-weight: normal;
}
.fieldgrp label abbr {
color: #4B911C;
font-size: 120%;
vertical-align: middle;
}
.field {
float: left;
padding: 0 10px 0 0;
line-height: 22px;
_padding-top: 3px;
}
.field .longfield {
width: 215px;
}
.field .longfield-select {
width: 220px;
}
.field .smallfield {
width: 95px;
}
.field .medfield {
width: 110px;
}
.field input, .field select {
font-size: 110%;
margin: 2px 0;
}
.field input[type="radio"] {
margin: 0 5px 0 5px;
}
div.submit {
margin-left: 200px;
padding-left: 0px;
margin-top: 1em;
}
div.submit p.submit-button {
margin-top: 0;
}
div.submit p.details {
font-size: 85%;
color: #666;
margin: 0;
}
div.submit p.required-note {
margin-top: 1em;
}
div.submit p.required-note span {
color: #4B911C;
_color: #666;
font-size: 170%;
vertical-align: top;
}
input.submit {
border: none;
}
</style>
<div id="survForm">
@ -34,56 +105,75 @@ $('#dialogsurv').dialog({ buttons: [ {
</script>
<?php } else {?>
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">&times;</button>
<h4 class="modal-title">Ajouter une surveillance</h4>
</div>
<div class="modal-body">
<form id="frmSurv" name="frmSurv" action="<?=$this->url(array(
'controller' => 'surveillance',
'action' => 'set'), 'default', true)?>" method="post">
<form id="frmSurv" name="frmSurv" action="<?=$this->url ( array ('controller' => 'surveillance','action' => 'set' ), 'default', true )?>"
method="post">
<input name="siret" type="hidden" value="<?=$this->siret?>"/>
<input name="siret" type="hidden" value="<?=$this->siret?>" />
<?php if (is_array($this->source)) { ?>
<div class="fieldgrp">
<label>Types</label>
<div class="field">
<label>Types</label>
<div class="field">
<?php foreach($this->source as $s) { ?>
<input type="checkbox" name="source" value="<?=$s['id']?>"<?=$s['checked']?>/>&nbsp;<?=$s['txt']?><br/>
<input type="checkbox" name="source" value="<?=$s['id']?>"
<?=$s['checked']?> />&nbsp;<?=$s['txt']?><br />
<?php } ?>
</div>
</div>
</div>
<?php } else { ?>
<input name="source" type="hidden" value="<?=$this->source?>"/>
<input name="source" type="hidden" value="<?=$this->source?>" />
<?php } ?>
<div class="fieldgrp">
<label class="StyleInfoLib">Votre référence</label>
<div class="field">
<input class="longfield" name="ref" type="text" value="<?=$this->ref?>" size="10"/></div>
</div>
<label class="StyleInfoLib">Votre référence </label>
<div class="field">
<input class="longfield" name="ref" type="text"
value="<?=$this->ref?>" size="10" />
</div>
</div>
<?php if (!is_array($this->source) && $this->source=='score') { ?>
<div class="fieldgrp">
<label class="StyleInfoLib">Votre encours (&euro;)</label>
<div class="field">
<input class="longfield" name="encours" type="text" value="<?=$this->encours?>" size="10"/></div>
</div>
<label class="StyleInfoLib">Votre encours (&euro;)</label>
<div class="field">
<input class="longfield" name="encours" type="text"
value="<?=$this->encours?>" size="10" />
</div>
</div>
<?php } ?>
<div class="fieldgrp">
<label class="StyleInfoLib">Adresse email du destinataire</label>
<div class="field">
<input class="longfield" name="email" type="text" value="<?=$this->email?>" size="100"/>
</div>
</div>
<label class="StyleInfoLib">Adresse email du destinataire</label>
<div class="field">
<input class="longfield" name="email" type="text"
value="<?=$this->email?>" size="100" />
</div>
</div>
</form>
</form>
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-success" onclick="survSubmit()" id="submit">Enregistrer</button>
<button type="button" class="btn btn-danger" data-dismiss="modal"> Close
</button>
</div>
</div>
<script>
var windowhref = window.location.href;
$('#dialogsurv').dialog({ buttons: [
{ text: "Ok", click: function() { survSubmit(); } },
{ text: "Annuler", click: function() { $(this).dialog("close"); } }
]});
// var windowhref = window.location.href;
// $('#dialogsurv').dialog({ buttons: [
// { text: "Ok", click: function() { survSubmit(); } },
// { text: "Annuler", click: function() { $(this).dialog("close"); } }
// ]});
function survSubmit(){
$('#dialogsurv').dialog({buttons: []});
@ -114,12 +204,12 @@ function survSubmit(){
}
});
$('#dialogsurv').dialog({ buttons: [ {
text: "Fermer", click: function() { window.location.href = windowhref; }
text: "Fermer", click: function() {$(this).dialog("close"); }
} ]});
} else {
$('#frmSurv').replaceWith('<div id="frmSurv">Aucune source !</div>');
$('#dialogsurv').dialog({ buttons: [ {
text: "Fermer", click: function() { window.location.href = windowhref; }
text: "Fermer", click: function() { $(this).dialog("close"); }
} ]});
}
}

27
application/modules/user/views/default/scripts/portfolio/index.phtml
View File

@ -52,7 +52,7 @@ par
</div>
<div id="formSurveillance">
<form name="recherche" action="<?=$this->url(array('controller'=>'surveillance', 'action'=>'liste'))?>">
<form name="recherche" action="<?=$this->url(array('module'=>'user', 'controller'=>'surveillance', 'action'=>'liste'))?>">
<input type="text" name="q" class="search" value="<?=($this->q != null)? $this->q : "Siren, Référence, Dénomination Sociale"?>" />
<input type="submit" value="Rechercher" class="submit"/>
</form>
@ -76,6 +76,7 @@ par
<tr>
<td class="aleft">
<a href="<?=$this->url(array(
'module' =>'legal',
'controller' => 'identite',
'action' => 'fiche',
'siret' => $item['siren'].$item['nic'],
@ -110,16 +111,18 @@ par
?>
<div class="action">
<p><?=ucfirst($surveillance['source'])?></p>
<a class="dialogsurv" href="<?=$this->url(array(
'controller' => 'surveillance',
<a href="#" data-toggle="modal" data-target="#dialog" data-url="<?=$this->url(array(
'module'=>'user',
'controller' => 'portfolio',
'action' => 'ajouter',
'siret' => $item['siren'].$item['nic'],
'source' => $surveillance['source'],
), 'default', true)?>" title="Ajouter la surveillance <?=$surveillance['source']?>">
<img src="/themes/default/images/interfaces/ajouter.png"/>
</a>
<a class="dialogsurv" href="<?=$this->url(array(
'controller' => 'surveillance',
<a href="#" data-toggle="modal" data-target="#dialog" data-url="<?=$this->url(array(
'module'=>'user',
'controller' => 'portfolio',
'action' => 'ajouter',
'siret' => $item['siren'].$item['nic'],
'ref' => $surveillance['ref'],
@ -129,13 +132,14 @@ par
<img src="/themes/default/images/interfaces/editer.png"/>
</a>
<a href="<?=$this->url(array(
'controller' => 'surveillance',
'module'=>'user',
'controller' => 'portfolio',
'action' => 'supprimer',
'siret' => $item['siren'].$item['nic'],
'ref' => urlencode($surveillance['ref']),
'email' => $surveillance['email'],
'source' => $surveillance['source']
))?>" title="Supprimer la surveillance <?=$surveillance['source']?>">
))?>" title="Supprimer la surveillance<?=$surveillance['source']?>">
<img src="/themes/default/images/interfaces/supprimer.png"/>
</a>
</div>
@ -147,7 +151,7 @@ par
?>
<div class="action">
<p><?=ucfirst($source)?></p>
<a class="dialogsurv" href="<?=$this->url(array(
<a href="#" data-toggle="modal" data-target="#dialog" data-url="<?=$this->url(array(
'controller' => 'surveillance',
'action' => 'ajouter',
'siret' => $item['siren'].$item['nic'],
@ -223,10 +227,11 @@ function submitTri() {
var triMode = $('select[name=triMode] option:selected').val();
var source = $('select[name=type] option:selected').val();
window.location.href = '<?=$this->url(array(
'controller'=>'surveillance' ,
'action'=>'liste',
'module'=>'user',
'controller'=>'portfolio' ,
'action'=>'index',
'q' => $this->q,
), 'default', true)?>/source/'+source+'/tri/'+tri+'/triMode/'+triMode;
), 'default', true)?>/index/source/'+source+'/tri/'+tri+'/triMode/'+triMode;
}
$(function() {

2
library/Application/Controller/Plugin/Suivi.php
View File

@ -31,6 +31,8 @@ class Application_Controller_Plugin_Suivi extends Zend_Controller_Plugin_Abstrac
$siret = $request->getParam('siret');
$siren = substr($siret, 0, 9);
$view->siren=$siren;
$view->siret=$siret;
/*if (intval($siren) != 0) {
$ws = new Scores_Ws_Client('entreprise', '0.8');

1
library/Application/Controller/Plugin/Theme.php
View File

@ -107,6 +107,7 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
->appendFile('/libs/ui-1.11.4/datepicker-fr.js', 'text/javascript')
->appendFile('/themes/default/scripts/bridge.js', 'text/javascript')
->appendFile('/themes/default/scripts/print.js', 'text/javascript')
->appendFile('/themes/default/scripts/main.js', 'text/javascript')
->appendFile('/libs/bootstrap-3.3.7/js/bootstrap.min.js', 'text/javascript');
if ( ! $UserLogin ) {

13
public/themes/default/scripts/main.js Normal file
View File

@ -0,0 +1,13 @@
$(function(){
$('[data-toggle="tooltip"]').tooltip();
$('[data-toggle="popover"]').popover();
$('div#dialog').on('hidden.bs.modal', function (e) {
$(this).removeData('bs.modal');
$(this).find('.modal-content').html('');
});
$('div#dialog').on('shown.bs.modal', function (e) {
var url = $(e.relatedTarget).data('url');
$(this).find('.modal-content').load(url);
});
});