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

Ajout enrichissements et référence

Browse Source
This commit is contained in:
Michael RICOIS 2012-06-26 14:25:43 +00:00
parent 2590f8d1ab
commit eb08f6dcdc
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
application/controllers/DashboardController.php
View File

@ -148,11 +148,11 @@ class DashboardController extends Zend_Controller_Action
->where('login = ?', $user->username)
->where('id = ?', $comptageId);
$criteres = $criteresM->fetchRow($sql)->toArray();
$infosCriteres = array();
if ($criteres != null) {
$comptageRef = $criteres['reference'];
$decodeCriteres = json_decode($criteres['criteres'], true);
//Construction affichage des critères
@ -175,16 +175,20 @@ class DashboardController extends Zend_Controller_Action
->where('idDefinition = ?', $comptageId)
->order('dateAjout DESC');
$comptages = $comptageM->fetchAll($sql)->toArray();
Zend_Registry::get('firebug')->info($comptages[0]);
//Lecture enrichissement existe
$enrichissementsM = new Application_Model_EnrichissementIdentifiants();
$sql = $enrichissementsM->select()
->where('idCriteres = ?', $comptageId);
$enrichissements = $enrichissementsM->fetchAll($sql);
//Affichage
$this->view->comptageId = $comptageId;
$this->view->comptageId = $comptageId;
$this->view->comptageRef = $comptageRef;
$this->view->criteres = $infosCriteres;
$this->view->comptages = $comptages;
$this->view->enrichissements = $enrichissement;
$this->view->enrichissements = $enrichissements;
}
}

4
application/views/default/scripts/index/criteres.phtml
View File

@ -49,8 +49,8 @@
<a style="color:white; text-decoration:none;" href="/comptage/reset">Initialiser les critères</a>
</div>
<div style="text-align:center; border:1px solid #ffffff; background-color:#182838; padding:5px;">
<a style="color:white; text-decoration:none;" class="saveciblage" href="/comptage/savedialog">Sauvegarder</a>
<a style="color:white; text-decoration:none;" class="previsualisation" href="/comptage/previsualisation">Prévisualisation</a>
</div>
<div style="text-align:center; border:1px solid #ffffff; background-color:#182838; padding:5px;">
<a style="color:white; text-decoration:none;" class="previsualisation" href="/comptage/previsualisation">Prévisualisation</a>
<a style="color:white; text-decoration:none;" class="saveciblage" href="/comptage/savedialog">Extraire</a>
</div>

2
public/themes/default/styles/dashboard.css
View File

@ -17,7 +17,7 @@
#dashboard fieldset {
border:1px solid black;
padding:20px;
padding: 10px 20px;
}
#dashboard table {