fix few routes and basic errors

This commit is contained in:
osaajani 2019-11-09 03:35:12 +01:00
parent adb739775f
commit bb8a114485
29 changed files with 142 additions and 181 deletions

View file

@ -55,12 +55,12 @@
<i class="fa fa-group fa-5x"></i>
</div>
<div class="col-xs-9 text-right">
<div class="huge"><?php echo $nb_groupes; ?></div>
<div class="huge"><?php echo $nb_groups; ?></div>
<div>Groupes</div>
</div>
</div>
</div>
<a href="<?php echo \descartes\Router::url('Groupe', 'list') ?>">
<a href="<?php echo \descartes\Router::url('Group', 'list') ?>">
<div class="panel-footer">
<span class="pull-left">Voir les groupes</span>
<span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>

View file

@ -20,7 +20,7 @@
<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
</li>
<li>
<i class="fa fa-group"></i> <a href="<?php echo \descartes\Router::url('Groupe', 'list'); ?>">Groupes</a>
<i class="fa fa-group"></i> <a href="<?php echo \descartes\Router::url('Group', 'list'); ?>">Groupes</a>
</li>
<li class="active">
<i class="fa fa-plus"></i> Nouveau
@ -37,7 +37,7 @@
<h3 class="panel-title"><i class="fa fa-group fa-fw"></i> Ajout d'un groupe</h3>
</div>
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('Groupe', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
<form action="<?php echo \descartes\Router::url('Group', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
<div class="form-group">
<label>Nom du groupe</label>
<div class="form-group input-group">
@ -49,7 +49,7 @@
<label>Contacts au groupe</label>
<input class="add-contacts form-control" name="contacts[]"/>
</div>
<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Groupe', 'list'); ?>">Annuler</a>
<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Group', 'list'); ?>">Annuler</a>
<input type="submit" class="btn btn-success" value="Enregistrer le groupe" />
</form>
</div>

View file

@ -20,7 +20,7 @@
<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
</li>
<li>
<i class="fa fa-group"></i> <a href="<?php echo \descartes\Router::url('Groupe', 'list'); ?>">Groupes</a>
<i class="fa fa-group"></i> <a href="<?php echo \descartes\Router::url('Group', 'list'); ?>">Groupes</a>
</li>
<li class="active">
<i class="fa fa-edit"></i> Modifier
@ -37,7 +37,7 @@
<h3 class="panel-title"><i class="fa fa-edit fa-fw"></i> Modification de groupes</h3>
</div>
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('Groupe', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
<form action="<?php echo \descartes\Router::url('Group', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
<?php
foreach ($groupes as $groupe)
{
@ -65,7 +65,7 @@
<?php
}
?>
<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Groupe', 'list'); ?>">Annuler</a>
<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Group', 'list'); ?>">Annuler</a>
<input type="submit" class="btn btn-success" value="Enregistrer le groupe" />
</form>
</div>

View file

@ -63,13 +63,13 @@
<?php } ?>
<div>
<div class="col-xs-6 no-padding">
<a class="btn btn-success" href="<?php echo \descartes\Router::url('Groupe', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un groupe</a>
<a class="btn btn-success" href="<?php echo \descartes\Router::url('Group', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un groupe</a>
</div>
<?php if ($groupes) { ?>
<div class="text-right col-xs-6 no-padding">
<strong>Action pour la séléction :</strong>
<button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Groupe', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>
<button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Groupe', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
<button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Group', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>
<button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Group', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
</div>
<?php } ?>
</div>

View file

@ -11,9 +11,9 @@
</audio>
<?php } ?>
<?php if (ENVIRONMENT == 'dev') { ?>
<?php if (ENV == 'dev') { ?>
<script>
<?php while ($message = \modules\DescartesSessionMessages\internals\DescartesSessionMessages::getNext()) { ?>
<?php while ($message = \FlashMessage\FlashMessage::next()) { ?>
alert('<?php echo $message['type'] . ' : ' . $message['text']; ?>');
<?php } ?>
</script>

View file

@ -49,7 +49,7 @@
<a href="<?php echo \descartes\Router::url('Contact', 'list'); ?>"><i class="fa fa-fw fa-user"></i> Contacts</a>
</li>
<li <?php echo $page == 'groupes' ? 'class="active"' : ''; ?>>
<a href="<?php echo \descartes\Router::url('Groupe', 'list'); ?>"><i class="fa fa-fw fa-group"></i> Groupes</a>
<a href="<?php echo \descartes\Router::url('Group', 'list'); ?>"><i class="fa fa-fw fa-group"></i> Groupes</a>
</li>
</ul>
</li>

View file

@ -99,7 +99,7 @@
jQuery('.add-groupes').each(function()
{
jQuery(this).magicSuggest({
data: '<?php echo \descartes\Router::url('Groupe', 'json_list'); ?>',
data: '<?php echo \descartes\Router::url('Group', 'json_list'); ?>',
valueField: 'id',
displayField: 'name',
});

View file

@ -112,7 +112,7 @@
jQuery('.add-groupes').each(function()
{
jQuery(this).magicSuggest({
data: '<?php echo \descartes\Router::url('Groupe', 'json_list'); ?>',
data: '<?php echo \descartes\Router::url('Group', 'json_list'); ?>',
valueField: 'id',
displayField: 'name',
});