Skip to content

Commit

Permalink
Dev configuration du parking :
Browse files Browse the repository at this point in the history
- Ajout des informations de parking et de niveau au composant map
- La modale places multiples commence maintenant à zéro par défaut TODO : paramétrer toutes les valeurs par défaut via les props
- Structuration d'une requête AJAX dans le store de la map pour chercher les infos nécessaire à l'affichage initial du parking
- Création de la structure des modèles grace à la nouvelle commande generate

Nouvelle lib PHP :
- Installation de https://github.com/JeffreyWay/Laravel-4-Generators
- composer update nécessaire
  • Loading branch information
YannPl committed Mar 27, 2015
1 parent f045ac9 commit 00f0fb9
Show file tree
Hide file tree
Showing 15 changed files with 129 additions and 41 deletions.
10 changes: 9 additions & 1 deletion app/assets/js/mods/composants/maps/admin_parking_map.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ var parkingMap = React.createClass({
propTypes: {
divId: React.PropTypes.string.isRequired,
imgUrl: React.PropTypes.string.isRequired,
parkingId: React.PropTypes.number.isRequired,
niveauId: React.PropTypes.number.isRequired,
mapHeight: React.PropTypes.number,
defaultDrawMode: React.PropTypes.number,
calibre: React.PropTypes.number
Expand Down Expand Up @@ -101,7 +103,13 @@ var parkingMap = React.createClass({

// AJOUT DE L'IMAGE DE FOND
L.imageOverlay(this.props.imgUrl, [origine, haut_droit]).addTo(this._inst.map);
Actions.map.map_initialized(this._inst.map, this.props.calibre);

// Transmission des données du parking au store:
var parkingData = {
parkingId: this.props.parkingId,
niveauId: this.props.niveauId
};
Actions.map.map_initialized(this._inst.map, this.props.calibre, parkingData);

// INIT des layers
this._inst.placesGroup = new L.geoJson();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ var ModalPlaces = React.createClass({
label: Lang.get('administration_parking.carte.incr'),
min: '0',
name: "increment",
value: 1,
value: 0,
required: false,
groupClassName: 'row',
wrapperClassName: 'col-md-9',
Expand Down
32 changes: 30 additions & 2 deletions app/assets/js/mods/stores/admin_parking_map_store.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,42 @@ var store = Reflux.createStore({
getInitialState: function () {
return {};
},
// INITIAL SETUP
init: function () {

},


/**
* Appellé lors de l'initialisation de la map pour renseigner le calibre initial
* et charger les données des zones, places et allées de ce niveau
*
* @param map : objet leaflet
* @param calibre : calibre initial de la carte (cm/deg)
* @param parkingInfos : object avec deux clés idParking et niveauId
*/
onMap_initialized: function (map, calibre) {
onMap_initialized: function (map, calibre, parkingInfos) {

console.log('Calibre au niveau du store : ' + calibre);
this._inst.calibre = calibre;

// Récupération en BDD des données du parking sélectionné
$.ajax({
method: 'GET',
url: BASE_URI + 'configuration_parking/infos_parking/' + parkingInfos.parkingId, /* TODO */
dataType: 'json',
context: this,
async: true,
data: {
parkingId: parkingInfos.parkingId,
niveauId: parkingInfos.niveauId
},
success: function (data) {
console.log('Retour AJAX init map : %o', data);
},
error: function (xhr, status, err) {
console.error(status, err);
}
})
},

/**
Expand Down Expand Up @@ -239,6 +261,12 @@ var store = Reflux.createStore({
inc,
suff);

this._inst.places = this._inst.places.concat(places);
console.log('Tableau des places dans le store : %o', this._inst.places);

// Enregistrement des places via le serveur

// Envoi des infos à afficher sur la carte
var retour = {
type: mapOptions.type_messages.add_formes,
data: places
Expand Down
1 change: 1 addition & 0 deletions app/config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
// LIBS TIERCE
'JsLocalization\JsLocalizationServiceProvider',
'Laracasts\Flash\FlashServiceProvider',
'Way\Generators\GeneratorsServiceProvider',

),

Expand Down
9 changes: 9 additions & 0 deletions app/controllers/ConfigurationParkingController.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,14 @@ public function destroy($id)
//
}

/**
* TODO : retourner toutes les données dont on a besoin
* @param $id
*/
public function parkingInfos($id)
{
return array('test' => 'Infos parking');
}


}
5 changes: 5 additions & 0 deletions app/models/Afficheur.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

class Afficheur extends \Eloquent {
protected $fillable = [];
}
5 changes: 5 additions & 0 deletions app/models/Allee.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

class Allee extends \Eloquent {
protected $fillable = [];
}
5 changes: 5 additions & 0 deletions app/models/Niveau.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

class Niveau extends \Eloquent {
protected $fillable = [];
}
5 changes: 5 additions & 0 deletions app/models/Parking.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

class Parking extends \Eloquent {
protected $fillable = [];
}
5 changes: 5 additions & 0 deletions app/models/Place.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

class Place extends \Eloquent {
protected $fillable = [];
}
5 changes: 5 additions & 0 deletions app/models/Type_place.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

class Type_place extends \Eloquent {
protected $fillable = [];
}
5 changes: 5 additions & 0 deletions app/models/Zone.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

class Zone extends \Eloquent {
protected $fillable = [];
}
1 change: 1 addition & 0 deletions app/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
* Configuration d'un parking
*/
Route::resource('configuration_parking', 'ConfigurationParkingController');
Route::get('configuration_parking/infos_parking/{id}', 'ConfigurationParkingController@parkingInfos');

/* **************************************************************************
* Calendrier
Expand Down
Binary file modified app/storage/documents/photo/yannpltvgmailcom.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
80 changes: 43 additions & 37 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,45 @@
{
"name": "laravel/laravel",
"description": "The Laravel Framework.",
"keywords": ["framework", "laravel"],
"license": "MIT",
"type": "project",
"require": {
"laravel/framework": "4.2.*",
"andywer/js-localization": "dev-master",
"laracasts/flash" : "~1.0"
},
"autoload": {
"classmap": [
"app/commands",
"app/controllers",
"app/models",
"app/database/migrations",
"app/database/seeds",
"app/tests/TestCase.php"
]
},
"scripts": {
"post-install-cmd": [
"php artisan clear-compiled",
"php artisan optimize"
],
"post-update-cmd": [
"php artisan clear-compiled",
"php artisan optimize"
],
"post-create-project-cmd": [
"php artisan key:generate"
]
},
"config": {
"preferred-install": "dist"
},
"minimum-stability": "stable"
"name": "laravel/laravel",
"description": "The Laravel Framework.",
"keywords": [
"framework",
"laravel"
],
"license": "MIT",
"type": "project",
"require-dev": {
"way/generators": "~2.0"
},
"require": {
"laravel/framework": "4.2.*",
"andywer/js-localization": "dev-laravel-4.2",
"laracasts/flash": "~1.0"
},
"autoload": {
"classmap": [
"app/commands",
"app/controllers",
"app/models",
"app/database/migrations",
"app/database/seeds",
"app/tests/TestCase.php"
]
},
"scripts": {
"post-install-cmd": [
"php artisan clear-compiled",
"php artisan optimize"
],
"post-update-cmd": [
"php artisan clear-compiled",
"php artisan optimize"
],
"post-create-project-cmd": [
"php artisan key:generate"
]
},
"config": {
"preferred-install": "dist"
},
"minimum-stability": "stable"
}

0 comments on commit 00f0fb9

Please sign in to comment.