axiom-team
/
gmarche
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Attribution de la bonne antenne en fonction de la saisie du bien ou service. Saisie quantité en numérique. Bouton identification redirige vers la saisie des identifiants

This commit is contained in:
nox 2019-10-14 14:54:18 +02:00
parent 472f53c474
commit fe96c595e5
9 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/ajax/addRecord.php
View File

@ -6,11 +6,11 @@ ini_set('display_errors', 0);
include '../../config/conf.php';
$bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
$params1['slug'] = $_POST['antenne_slug'];
//$params1['slug'] = $_POST['antenne_slug'];
// Récupération de l'id de l'antenne à partir de son slug
$req_search = "SELECT id FROM antennes WHERE slug = :slug";
$stmt = $bdd->prepare($req_search);
$antenne_id = $stmt->execute($params1);
//$req_search = "SELECT id FROM antennes WHERE slug = :slug";
//$stmt = $bdd->prepare($req_search);
//$antenne_id = $stmt->execute($params1);
// Récupération des informations du formulaire
$params = array();
@ -21,7 +21,7 @@ ini_set('display_errors', 0);
$params['quantite'] = $_POST['quantite'];
$params['prix'] = $_POST['prix'];
//$params['created_at'] = date('d-m-Y');
$params['antenne_id'] = $antenne_id;
$params['antenne_id'] = $_POST['antenne_id'];
$params['content'] = '';
// Insertion dans la base

4
public/ajax/readRecords.php
View File

@ -41,7 +41,7 @@ $bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
$data .= '<td>'.$row['name'].'</td>';
$data .= '<td><img src="/uploads/products/'.$row['image'].'" width="100" height="100" /></td>';
$data .= '<td>'.$row['username'].'</td>';
$data .= '<td>'.$row['cle_pub'].'</td>';
$data .= '<td></td>';
$data .= '<td>'.$row['quantite'].'</td>';
$data .= '<td>'.$row['prix'].'</td>';
$data .= '<td>';
@ -81,7 +81,7 @@ $bdd = new \PDO("mysql:host=$host;dbname=$database_name", $username, $password);
else
{
// Il n'y a pas encore de biens/services saisis
$data .= "<tr style='color:white;'><td colspan='6'>Pas d'enregistrement</td></tr>";
$data .= "<tr style='text-align:left;color:white;'><td colspan='10'>Aucun enregistrement saisi</td></tr>";
}
$data .= '</table>';

11
public/ajax/upload.php
View File

@ -3,26 +3,21 @@
// Nom du fichier image
$filename = $_FILES['image']['name'] ?? $_FILES['add_image']['name'];
// Location
// Emplacement
$path = str_replace('\\', '/', dirname(realpath(__DIR__)));
$location = $path.'/uploads/products/'.$filename;
$location2 = '/uploads/products/'.$filename;
//echo "location = ".$location;
// file extension
// Extension du fichier
$file_extension = pathinfo($location, PATHINFO_EXTENSION);
$file_extension = strtolower($file_extension);
// Valid image extensions
// Extensions valides d'image
$image_ext = array("jpg","png","jpeg");
$response = 0;
if(in_array($file_extension,$image_ext)){
// Upload du fichier
//echo "<br />files image= ".$_FILES['image']['tmp_name'];
//echo "<br /><br />";
//var_dump($_FILES);
//die();
if(move_uploaded_file($_FILES['image']['tmp_name'] ?? $_FILES['add_image']['tmp_name'],$location)){
$response = $location2;
}

4
public/js/script.js
View File

@ -1,5 +1,5 @@
// Add Record
function addRecord(antenne_slug, nom_connecte, id_user) {
function addRecord(antenne_slug, antenne_id, nom_connecte, id_user) {
var produit = $("#produit").val();
var image = $("#add_image").val();
@ -16,7 +16,7 @@ function addRecord(antenne_slug, nom_connecte, id_user) {
cle_pub: cle_pub,
quantite: quantite,
prix: prix,
antenne_slug: antenne_slug,
antenne_id: antenne_id,
id_user: id_user
}, function (data, status) {
// close the popup

2
src/Auth/views/login.twig
View File

@ -20,7 +20,7 @@
{{ csrf_input() }}
{{ field('username', null, 'Nom d\'utilisateur') }}
{{ field('password', null, 'Mot de passe', {type: 'password'}) }}
<p><a href="{{ path('auth.password') }}">Mot de passe oublié ?</a></p>
<p><a style="color:gray;" href="{{ path('auth.password') }}">Mot de passe oublié ?</a></p>
<button class="btn btn-primary">Se connecter</button>
</form>
</div>

4
src/Gmarche/Actions/AntenneShowAction.php
View File

@ -51,13 +51,13 @@ class AntenneShowAction
$antennes = $this->antenneTable->findAllbyRegion($region_id)->paginate(10, $page);
$region=$this->regionTable->findBy('slug', $request->getAttribute('slug'));
$antenne = 1;
//$antenne = 1;
/*if ($region->slug !== $slug) {
return $this->redirect('gmarche.show', [
'slug' => $region->slug,
'id' => $region->id
]);
}*/
return $this->renderer->render('@gmarche/antenne', compact('slug', 'region', 'antennes','antenne', 'page'));
return $this->renderer->render('@gmarche/antenne', compact('slug', 'region', 'antennes', 'page'));
}
}

3
src/Gmarche/GmarcheModule.php
View File

@ -3,9 +3,6 @@ namespace App\Gmarche;
use App\Gmarche\Actions\AntenneShowAction;
use App\Gmarche\Actions\RegionIndexAction;
use App\Product\Actions\ProductCrudAction;
use App\Product\Actions\ProductIndexAction;
use Framework\Auth\LoggedInMiddleware;
use Framework\Module;
use Framework\Renderer\RendererInterface;
use Framework\Router;

22
src/Product/views/admin/products/index.twig
View File

@ -47,17 +47,17 @@
{% endif %}
<div class="container">
<div class="row" style="text-align: left;">
<div class="row">
<div class="col-md-12">
<p class="text-right">
<!--<a href="crochet crochet path(routePrefix ~ '.create',{region: explodeUrl()[2], slug: explodeUrl()[3], antenne: explodeUrl()[4]} )}}" class="btn btn-primary">-->
<p>
{% if current_user() %}
<button style="color:black;" class="btn btn-success" data-toggle="modal" data-target="#add_new_record_modal">Ajouter un bien ou service
<button style="color:white; font-size: 14px;" class="btn btn-primary" data-toggle="modal" data-target="#add_new_record_modal">Ajouter un bien ou service
{% else %}
<button style="color:black;" class="btn btn-success" data-toggle="modal" data-target="">Veuillez vous identifier pour ajouter un bien/service
<div class="btn btn-primary">
<a class="nav-link" style="color: white; font-size: 14px;" href="{{ path('auth.login') }}">Veuillez vous identifier pour ajouter un bien/service</a>
</div>
{% endif %}
</button>
<!--</a>-->
</p>
<div class="records_content"></div>
</div>
@ -68,8 +68,8 @@
<div class="modal-dialog" role="document" style="color: black;">
<div class="modal-content" style="text-align: left;">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">Ajouter une ligne</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div>
<div class="modal-body">
<div class="form-group">
@ -97,7 +97,7 @@
</div>
<div class="form-group">
<label for="quantite">Quantité</label>
<input type="text" id="quantite" placeholder="Quantité" class="form-control"/>
<input type="number" id="quantite" placeholder="Quantité" class="form-control"/>
</div>
<div class="form-group has-error has-feedback">
<label for="prix">Prix en junes</label>
@ -111,7 +111,7 @@
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button>
<button type="button" class="btn btn-primary"
onclick="addRecord('{{ antenne_slug }}','{{ current_user().username }}','{{ current_user().id }}')">Ajouter</button>
onclick="addRecord('{{ antenne_slug }}','{{ antenne_id }}','{{ current_user().username }}','{{ current_user().id }}')">Ajouter</button>
</div>
</div>
</div>
@ -146,11 +146,11 @@
</div>
<div class="form-group has-error has-feedback">
<label for="update_quantite">Quantité</label>
<input type="text" id="update_quantite" placeholder="Quantité" class="form-control"/>
<input type="number" id="update_quantite" placeholder="Quantité" class="form-control"/>
</div>
<div class="form-group has-error has-feedback">
<label for="update_prix">Prix en junes</label>
<input type="number" id="update_prix" placeholder="prix" class="form-control"/>
<input type="number" id="update_prix" placeholder="Prix" class="form-control"/>
</div>
</div>
<div class="modal-footer">

12
views/layout.twig
View File

@ -33,8 +33,8 @@
{% endif %}
</ul>
<div class="navbar-nav">
<div class="navbar-text" style="color:lightgray;">
{{ "now"|date('d/m/y') }}&nbsp;&nbsp;&nbsp;
<div class="navbar-text" style="color:lightgray;margin-right:15px; margin-top:-3px;">
{{ "now"|date('d/m/y') }}
</div>
{% if current_user() %}
<div class="navbar-text"><span><img src="\avatar_user.png" width="22" height="22" /></span>
@ -45,11 +45,11 @@
<button class="btn btn-danger" style="font-size:14px;">Se déconnecter</button>
</form>
{% else %}
<div class="nav-item active">
<a class="nav-link" href="{{ path('auth.login') }}">Se connecter</a>
<div class="nav-item">
<a class="nav-link" href="{{ path('auth.login') }}" style="font-size:14px;">Se connecter</a>
</div>
<div class="nav-item active">
<a class="nav-link" href="{{ path('account.signup') }}">S'inscrire</a>
<div class="nav-item">
<a class="nav-link" href="{{ path('account.signup') }}" style="font-size:14px;">S'inscrire</a>
</div>
{% endif %}
</div>