Commit 7ba0ed29 authored by lucas64500's avatar lucas64500
parents 89bdc693 114ad2e3
......@@ -125,23 +125,23 @@
<div id="inscription_contenu" class="contenu formulaire">
<form class="formulaire" id="form-inscription">
<div>
<label for="apibundle_pscustomer_firstname" class="required">Prénom</label>
<label for="apibundle_pscustomer_firstname" class="required">Prénom<span style="color: red">*</span></label>
<input type="text" id="apibundle_pscustomer_firstname" name="apibundle_pscustomer[firstname]" placeholder="Prénom" maxlength="32" />
</div>
<div>
<label for="apibundle_pscustomer_lastname" class="required">Nom</label>
<label for="apibundle_pscustomer_lastname" class="required">Nom<span style="color: red">*</span></label>
<input type="text" id="apibundle_pscustomer_lastname" name="apibundle_pscustomer[lastname]" placeholder="Nom" maxlength="32" />
</div>
<div>
<label for="apibundle_pscustomer_email" class="required">Email</label>
<label for="apibundle_pscustomer_email" class="required">Email<span style="color: red">*</span></label>
<input type="email" id="apibundle_pscustomer_email" name="apibundle_pscustomer[email]" placeholder="Adresse mail" maxlength="128" />
</div>
<div>
<label for="apibundle_pscustomer_telephone" class="required">Téléphone</label>
<label for="apibundle_pscustomer_telephone" class="required">Téléphone<span style="color: red">*</span></label>
<input type="tel" id="apibundle_pscustomer_telephone" name="apibundle_pscustomer[telephone]" placeholder="Numéro de téléphone" maxlength="128" />
</div>
<div>
<label for="apibundle_pscustomer_password" class="required">Mot de passe</label>
<label for="apibundle_pscustomer_password" class="required">Mot de passe<span style="color: red">*</span></label>
<input type="password" id="apibundle_pscustomer_password" name="apibundle_pscustomer[password]" maxlength="32" />
</div>
<div class="bouton"><span>S'INSCRIRE</span></div>
......@@ -196,8 +196,9 @@
<div id="create_hive_contenu" class="contenu">
<div class="sizing"></div>
<form class="formulaire" id="form-create-hive">
<span style="color: red">*</span>Champ obligatoire
<div>
<label for="apibundle_pshive_name">Nom</label>
<label for="apibundle_pshive_name">Nom<span style="color: red">*</span></label>
<input type="text" id="apibundle_pshive_name" name="apibundle_pshive[name]" maxlength="64" />
<div class="cl"></div>
</div>
......@@ -254,14 +255,17 @@
</select>
</div>
<div>
<label for="apibundle_pshive_harvest" class="required">Récolte</label>
<label for="apibundle_pshive_harvest" class="required">Récolte (kg)<span style="color: red">*</span></label>
<input type="number" id="apibundle_pshive_harvest" name="apibundle_pshive[harvest]" required="required" min="0" max="100" />
</div>
<div>
<label for="apibundle_pshive_date_installation">Date d'installation</label>
<input type="number" id="apibundle_pshive_date_installation" name="apibundle_pshive[dateInstall]" min="1990" max="2025" step=1 />
</div>
<div class="bouton"><span>CREER</span></div>
<div style="display: inline-block;">
<div class="bouton" id="creer_ruche" style="display: inline-block; vertical-align : top;"><span>CREER</span></div>
<div class="bouton" id="creer_sans_boitier" style="display: inline-block; vertical-align : top;"><span>CREER SANS BOITIER</span></div>
</div>
</form>
<div style="clear:left;"></div>
</div>
......@@ -282,10 +286,11 @@
<h1></h1>
</div>
<div id="add_logger_contenu" class="contenu formulaire">
<span style="color: red">*</span>Champ obligatoire
<div class="sizing"></div>
<form class="formulaire" id="form-add-logger">
<div>
<label for="apibundle_psbox_serialNumber" class="required">Numéro de série du boîtier</label>
<label for="apibundle_psbox_serialNumber" class="required">Numéro de série du boîtier<span style="color: red">*</span></label>
<input type="text" id="apibundle_psbox_serialNumber" name="apibundle_psbox[serialNumber]" required="required" maxlength="32" />
</div>
<div class="bouton"><span>ENREGISTRER</span></div>
......
......@@ -142,7 +142,7 @@ var seuils = [
function testSeuil(ruche,s,v){
console.log(v+" / "+ruche.data[s.champ].v);
//console.log(v+" / "+ruche.data[s.champ].v);
if(s.type=="max"&&parseFloat(v)<parseFloat(ruche.data[s.champ].v)){
return true;
}
......@@ -153,7 +153,7 @@ function testSeuil(ruche,s,v){
}
function actualiserSeuils(){
getListHiveGroups(function() {
console.log("Actualisation des seuils");
//console.log("Actualisation des seuils");
getHivesForHiveGroups(-1,function(){//Pour chaque ruche
for(var r=0;r<donneesRuches.hivegroups.length;r++){
......@@ -181,13 +181,13 @@ var slider_ruchers;
var $window=[];
var tScroll=[];
function accueil(){
cordova.plugins.notification.local.cancelAll();
//cordova.plugins.notification.local.cancelAll();
//Carte
_("btCarte").addEventListener(evtclick, goToMap);
//_("btHistorique").addEventListener(evtclick, goToHistorique);
nbRuchers=donneesRuches.hivegroups.length;
console.log("Nb de ruchers : "+nbRuchers);
//console.log("Nb de ruchers : "+nbRuchers);
setInterval(function(){actuNotifs();}, 300000);
......@@ -203,7 +203,7 @@ function accueil(){
nbRuches[m] = 0;
donneesRuches.hivegroups[m-1].hives = [];
}
console.log("Nb de ruches dans le rucher "+m+" : "+nbRuches[m]);
//console.log("Nb de ruches dans le rucher "+m+" : "+nbRuches[m]);
$window[m] = $("#rucher"+m).children(".ruches");
organiserRuches(m);
}
......@@ -237,7 +237,7 @@ function nouveauRucher(){
$("#nav_droite_rucher").css("visibility","hidden");
//
createHiveGroup(function(){getListHiveGroups(function() {
console.log("récupération des listes de ruches par rucher");
//console.log("récupération des listes de ruches par rucher");
getHivesForHiveGroups(1);
});});
......@@ -313,7 +313,7 @@ function liensAccueil(r){
$("#ruche"+r+"_"+i+"_selectionnee_reglages").click( function(e) { $(this).off("click");
e.preventDefault();
e.preventDefault();
console.log($(".ruche_selectionnee_reglages").index());
//console.log($(".ruche_selectionnee_reglages").index());
var i,j,idd;
idd=$(this).attr('id');
var t = idd.substr(5,idd.length-5).split("_");
......@@ -322,7 +322,7 @@ function liensAccueil(r){
idHiveGroup = i;
idHive = j;
console.log($(".ruche_selectionnee_reglages").index());
//console.log($(".ruche_selectionnee_reglages").index());
goToHiveParameters();
});
......@@ -330,7 +330,7 @@ function liensAccueil(r){
$("#ruche"+r+"_"+i+"_selectionnee_courbes").click( function(e) { $(this).off("click");
e.preventDefault();
console.log($(".ruche_selectionnee_reglages").index());
//console.log($(".ruche_selectionnee_reglages").index());
var i,j,idd;
idd=$(this).attr('id');
var t = idd.substr(5,idd.length-5).split("_");
......@@ -342,7 +342,7 @@ function liensAccueil(r){
});
$("#ruche"+r+"_"+i+"_selectionnee_historique").click( function(e) { $(this).off("click");
e.preventDefault();
console.log($(".ruche_selectionnee_reglages").index());
//console.log($(".ruche_selectionnee_reglages").index());
var i,j,idd;
idd=$(this).attr('id');
var t = idd.substr(5,idd.length-5).split("_");
......@@ -355,7 +355,7 @@ function liensAccueil(r){
$("#ruche"+r+"_"+i).find(".ruche_selectionnee_infos").click( function(e) { $(this).off("click");
e.preventDefault();
console.log($(this)[0].id);
//console.log($(this)[0].id);
var i,j,idd;
idd=$(this).parent().parent().parent().attr('id');
......@@ -472,7 +472,7 @@ function organiserRuches(rucher){
_("ruche"+rucher+"_"+i).style.top = (d+decalTop+h*(0.76*(i-1)))+'px';
_("ruche"+rucher+"_"+i).style.right = (decal+w*(0.5*((i%2==0)?1:0)))+'px';
}
console.log(i+" "+_("ruche"+rucher+"_"+i).style.top+", "+_("ruche"+rucher+"_"+i).style.right);
//console.log(i+" "+_("ruche"+rucher+"_"+i).style.top+", "+_("ruche"+rucher+"_"+i).style.right);
}
}else{
afficherBd("Vous n'avez aucune ruche référencée sur nos serveurs pour l'instant. Rendez-vous sur www.label-abeille.org.","OK")
......
......@@ -19,7 +19,7 @@ function createHive() {
}
else {
$("#form-create-hive").find(".bouton").click(function(e){$(this).off("click");
var bouton = $(this);
//console.log("début ajout");
e.preventDefault();
var donnees = $("#form-create-hive").serialize();
......@@ -33,13 +33,26 @@ function createHive() {
},
data: donnees + '&apibundle_pshive%5BidHiveGroup%5D=' + donneesRuches.hivegroups[idHiveGroup].id_hive_group,
success: function(data) {
finCharge();
$("#form-create-hive")[0].reset();
finCharge();
console.log(data);
idHive = donneesRuches.hivegroups[idHiveGroup].hives.length; //change idHive
console.log(idHive);
updateLocalHive(data); // locally update list hive
console.log(donneesRuches.hivegroups[idHiveGroup].hives[idHive]);
goToAddLogger(); // add if needed a logger to the hive
console.log(bouton);
console.log(bouton[0].id);
if(bouton[0].id == "creer_ruche") {
console.log("goToAddLogger");
goToAddLogger(); // add if needed a logger to the hive
}
else {
console.log("no need to add a logguer");
getListHiveGroups(function() {
console.log("récupération des listes de ruches par rucher");
getHivesForHiveGroups(1);
});
}
},
error: function (xhr, ajaxOptions, thrownError) {
console.log(xhr.responseText);
......@@ -107,11 +120,11 @@ function goToAddLogger() {
data: donnees+ '&apibundle_psbox%5BidHive%5D=' + donneesRuches.hivegroups[idHiveGroup].hives[idHive].id_hive + '&apibundle_psbox%5BidClient%5D=' + idClient + '&apibundle_psbox%5Bversion%5D=test&apibundle_psbox%5Bnote%5D=&apibundle_psbox%5Bactive%5D=1&apibundle_psbox%5BdateAdd%5D%5Bdate%5D%5Byear%5D=2011&apibundle_psbox%5BdateAdd%5D%5Bdate%5D%5Bmonth%5D=1&apibundle_psbox%5BdateAdd%5D%5Bdate%5D%5Bday%5D=1&apibundle_psbox%5BdateAdd%5D%5Btime%5D%5Bhour%5D=0&apibundle_psbox%5BdateAdd%5D%5Btime%5D%5Bminute%5D=0&apibundle_psbox%5BdateUpd%5D%5Bdate%5D%5Byear%5D=2011&apibundle_psbox%5BdateUpd%5D%5Bdate%5D%5Bmonth%5D=1&apibundle_psbox%5BdateUpd%5D%5Bdate%5D%5Bday%5D=1&apibundle_psbox%5BdateUpd%5D%5Btime%5D%5Bhour%5D=0&apibundle_psbox%5BdateUpd%5D%5Btime%5D%5Bminute%5D=0',
success: function(data) {
console.log(data);
finCharge();
getListHiveGroups(function() {
console.log("récupération des listes de ruches par rucher");
getHivesForHiveGroups(1);
});
finCharge();
getListHiveGroups(function() {
console.log("récupération des listes de ruches par rucher");
getHivesForHiveGroups(1);
});
},
error: function (xhr, ajaxOptions, thrownError) {
......
......@@ -73,7 +73,18 @@ document.addEventListener('deviceready', function () {
}, false);
function detectExitExternalPage(window, ref) {
var interval = window.setInterval(function() {
try {
if (ref == null || ref.closed) {
window.clearInterval(interval);
_("ch").style.visibility="hidden";
}
}
catch (e) {
}
}, 100);
}
function debut(){
......@@ -87,16 +98,15 @@ function debut(){
_("ch").style.visibility="visible";
var ref=window.open('http://www.label-abeille.org', '_blank', 'location=yes,closebuttoncaption=Fermer');
ref.addEventListener('exit', function(event) { _("ch").style.visibility="hidden"; } );
detectExitExternalPage(window, ref);
ref.addEventListener('loaderror', function(event) { afficherBd("Erreur de chargement","OK"); } );
});
_("faq").addEventListener(evtclick,function(){
_("ch").style.visibility="visible";
var ref=window.open('http://www.label-abeille.org/faq', '_blank', 'location=yes,closebuttoncaption=Fermer');
ref.addEventListener('exit', function(event) { _("ch").style.visibility="hidden"; } );
var ref = window.open('http://www.label-abeille.org/faq', '_blank', 'location=yes,closebuttoncaption=Fermer');
detectExitExternalPage(window, ref);
ref.addEventListener('loaderror', function(event) { afficherBd("Erreur de chargement","OK"); } );
});
......@@ -104,7 +114,7 @@ function debut(){
_("ch").style.visibility="visible";
var ref=window.open('https://www.facebook.com/Label-Abeille-679782012107769/?fref=ts', '_blank', 'location=yes,closebuttoncaption=Fermer');
ref.addEventListener('exit', function(event) { _("ch").style.visibility="hidden"; } );
detectExitExternalPage(window, ref);
ref.addEventListener('loaderror', function(event) { afficherBd("Erreur de chargement","OK"); } );
});
......@@ -112,7 +122,7 @@ function debut(){
_("ch").style.visibility="visible";
var ref=window.open('https://twitter.com/labelabeille', '_blank', 'location=yes,closebuttoncaption=Fermer');
ref.addEventListener('exit', function(event) { _("ch").style.visibility="hidden"; } );
detectExitExternalPage(window, ref);
ref.addEventListener('loaderror', function(event) { afficherBd("Erreur de chargement","OK"); } );
});
......@@ -120,7 +130,7 @@ function debut(){
_("ch").style.visibility="visible";
var ref=window.open('http://plus.google.com/share?url=https://www.label-abeille.org/fr', '_blank', 'location=yes,closebuttoncaption=Fermer');
ref.addEventListener('exit', function(event) { _("ch").style.visibility="hidden"; } );
detectExitExternalPage(window, ref);
ref.addEventListener('loaderror', function(event) { afficherBd("Erreur de chargement","OK"); } );
});
......
......@@ -24,7 +24,7 @@ function inscription() {
success: function(data) {
console.log(data);
customer = data;
finCharge();
finCharge();
inscription_success(data);
},
error: function (xhr, ajaxOptions, thrownError) {
......
......@@ -135,8 +135,8 @@ function goToHiveGroupParameters() {
},
data: donnees,
success: function(data) {
console.log(data);
console.log(donneesRuches.hivegroups[idHiveGroup].hives[idHive]);
//console.log(data);
//console.log(donneesRuches.hivegroups[idHiveGroup].hives[idHive]);
finCharge();
/* go back to details */
donneesRuches.hivegroups[idHiveGroup].name = $("#apibundle_pshivegroup_name").val();
......@@ -144,7 +144,7 @@ function goToHiveGroupParameters() {
//console.log("fin modif");
},
error: function (xhr, ajaxOptions, thrownError) {
console.log(xhr.responseText);
//console.log(xhr.responseText);
finCharge();
afficherBd("Un erreur est survenue","Fermer");
}
......@@ -169,7 +169,7 @@ function goToHiveParameters() {
}
//create option for state selection
var stateP = [];
console.log(state);
//console.log(state);
for(var i = 0 ; i < state.length ; i++) {
var s = state[i];
s.isState = donneesRuches.hivegroups[idHiveGroup].hives[idHive].state == s.v;
......@@ -204,7 +204,7 @@ function goToHiveParameters() {
supportTypeP.push(s);
}
var donneesHive = { 'hive' : donneesRuches.hivegroups[idHiveGroup].hives[idHive], 'hivegroups' : hivegroups, 'state' : stateP, 'materialType' : materialP, 'hiveType' : hiveTypeP, 'beeType' : beeTypeP, 'supportType' : supportTypeP };
console.log(hivegroups);
//console.log(hivegroups);
console.log(donneesHive);
var h = Mustache.render(template, donneesHive);
......@@ -244,28 +244,28 @@ function goToHiveParameters() {
function submitParamsHive(){
//console.log("début modif");
var donnees = $("#form-params-hive").serialize();
console.log(donnees);
//console.log(donnees);
var params = donnees.split("&apibundle_pshive%5Bnumero_serie%5D=");
var num_serie = params[1];
var data = params[0];
console.log(num_serie);
console.log(data);
console.log(donneesRuches.hivegroups[idHiveGroup].hives[idHive]);
//console.log(donneesRuches.hivegroups[idHiveGroup].hives[idHive]);
charge();
$.ajax({
type: 'PATCH',
url: url+'pshive/' + donneesRuches.hivegroups[idHiveGroup].hives[idHive].id_hive + '/update',
xhrFields: {
withCredentials: true
},
data: data,
success: function(data) {
console.log(data);
type: 'PATCH',
url: url+'pshive/' + donneesRuches.hivegroups[idHiveGroup].hives[idHive].id_hive + '/update',
xhrFields: {
withCredentials: true
},
data: data,
success: function(data) {
//console.log(data);
/* modify the box */
if(donneesRuches.hivegroups[idHiveGroup].hives[idHive].data.idLogger == null) {
if(donneesRuches.hivegroups[idHiveGroup].hives[idHive].data.idLogger == null && num_serie != "") {
//create
console.log("create");
//console.log("create");
$.ajax({
type: 'POST',
url: url+'psbox/create',
......@@ -274,7 +274,7 @@ function submitParamsHive(){
},
data: 'apibundle_psbox%5BserialNumber%5D=' + num_serie + '&apibundle_psbox%5BidHive%5D=' + donneesRuches.hivegroups[idHiveGroup].hives[idHive].id_hive + '&apibundle_psbox%5BidClient%5D=' + donneesRuches.hivegroups[idHiveGroup].hives[idHive].id_client ,
success: function(data) {
console.log(data);
//console.log(data);
donneesRuches.hivegroups[idHiveGroup].hives[idHive].data.serialNumber = num_serie;
finCharge();
},
......@@ -286,45 +286,45 @@ function submitParamsHive(){
});
}
else {
console.log("update");
//console.log("update");
//update
changeLogger(donneesRuches.hivegroups[idHiveGroup].hives[idHive].data.idLogger, num_serie, donneesRuches.hivegroups[idHiveGroup].hives[idHive].id_hive);
donneesRuches.hivegroups[idHiveGroup].hives[idHive].data.serialNumber = num_serie;
}
updateLocalHive(data);
updateLocalHive(data);
console.log(donneesRuches.hivegroups[idHiveGroup].hives[idHive]);
/* go back to details */
finCharge();
goToDataHive(true);
//console.log("fin modif");
},
error: function (xhr, ajaxOptions, thrownError) {
console.log(xhr.responseText);
},
error: function (xhr, ajaxOptions, thrownError) {
//console.log(xhr.responseText);
finCharge();
afficherBd("Une erreur est survenue","Fermer");
}
});
}
});
}
/**
* display the parameters for the floor and ceiling value (launching the notifications)
*/
function goToHiveSeuils() {
console.log('goToHiveSeuils : begin');
//console.log('goToHiveSeuils : begin');
var template = $(templates).filter('#tpl-params-ruche-seuils').html();
for(s=0;s<seuils.length;s++) {
console.log(seuils[s].nom);
console.log(donneesRuches.hivegroups[idHiveGroup].hives[idHive].data[seuils[s].nom].v);
//console.log(seuils[s].nom);
//console.log(donneesRuches.hivegroups[idHiveGroup].hives[idHive].data[seuils[s].nom].v);
seuils[s].v = donneesRuches.hivegroups[idHiveGroup].hives[idHive].data[seuils[s].nom].v;
}
var seuilsMustache = { 'seuils': seuils};
console.log(seuils);
//console.log(seuils);
var h = Mustache.render(template, seuilsMustache);
//console.log(h);
document.getElementById("corps-params-ruche-seuils").innerHTML = h;
//console.log(document.getElementById("corps-params-ruche").innerHTML);
console.log('goToHiveSeuils : before transition');
//console.log('goToHiveSeuils : before transition');
transition(_("pparametres-ruche-seuils"), "slide");
$("#pparametres-ruche-seuils").find(".sous_titre").find("h1").html("Seuils ("+donneesRuches.hivegroups[idHiveGroup].hives[idHive].name+")");
if(isTest) {
......@@ -350,8 +350,8 @@ function goToHiveSeuils() {
finCharge();
//console.log(data);
//customer = data;
console.log("Succes de la modification des seuils");
console.log(data);
//console.log("Succes de la modification des seuils");
//console.log(data);
getDataHive(donneesRuches.hivegroups[idHiveGroup].hives[idHive].id_hive, idHive, donneesRuches.hivegroups[idHiveGroup].hives[idHive].name, function(data) { updateLimitsHive(data); goToDataHive(true);});
actualiserSeuils();
/* on retourne aux détails */
......@@ -359,7 +359,7 @@ function goToHiveSeuils() {
//console.log("fin modif");
},
error: function (xhr, ajaxOptions, thrownError) {
console.log(xhr.responseText);
//console.log(xhr.responseText);
finCharge();
afficherBd("Une erreur est survenue","Fermer");
......@@ -405,7 +405,7 @@ function changeHiveGroup(idHive, idHiveGroup, action) {
//console.log("fin modif");
},
error: function (xhr, ajaxOptions, thrownError) {
console.log(xhr.responseText);
//console.log(xhr.responseText);
finCharge();
afficherBd("Une erreur est survenue","Fermer");
......
......@@ -57,11 +57,11 @@
<div class="contenu">
<form class="formulaire" id="form-create-hive-group">
<div>
<label for="apibundle_pshivegroup_name">Nom</label>
<label for="apibundle_pshivegroup_name">Nom<span style="color: red">*</span></label>
<input type="text" id="apibundle_pshivegroup_name" name="apibundle_pshivegroup[name]" maxlength="64" />
</div>
<div>
<label for="apibundle_pshivegroup_harvest" class="required">Récolte</label>
<label for="apibundle_pshivegroup_harvest" class="required">Récolte<span style="color: red">*</span></label>
<input type="number" id="apibundle_pshivegroup_harvest" name="apibundle_pshivegroup[harvest]" required="required" />
</div>
<div class="bouton"><span>CREER</span></div>
......@@ -211,21 +211,22 @@
</script>
<script type="text/html" id="tpl-params-generaux">
<form class="formulaire" id="form-params-generaux" method="POST">
<span style="color: red">*</span>Champ obligatoire
<div id="apibundle_pscustomer">
<div>
<label for="apibundle_pscustomer_firstname" class="required">Prénom</label>
<label for="apibundle_pscustomer_firstname" class="required">Prénom<span style="color: red">*</span></label>
<input type="text" id="apibundle_pscustomer_firstname" name="apibundle_pscustomer[firstname]" value="{{ firstname }}" maxlength="32" />
</div>
<div>
<label for="apibundle_pscustomer_lastname" class="required">Nom</label>
<label for="apibundle_pscustomer_lastname" class="required">Nom<span style="color: red">*</span></label>
<input type="text" id="apibundle_pscustomer_lastname" name="apibundle_pscustomer[lastname]" value="{{ lastname }}" maxlength="32" />
</div>
<div>
<label for="apibundle_pscustomer_email" class="required">Email</label>
<label for="apibundle_pscustomer_email" class="required">Email<span style="color: red">*</span></label>
<input type="text" id="apibundle_pscustomer_email" name="apibundle_pscustomer[email]" value="{{ email }}" maxlength="128" />
</div>
<div>
<label for="apibundle_pscustomer_password" class="required">Mot de passe</label>
<label for="apibundle_pscustomer_password" class="required">Mot de passe<span style="color: red">*</span></label>
<input type="password" id="apibundle_pscustomer_password" name="apibundle_pscustomer[password]" maxlength="32" />
</div>
</div>
......@@ -239,12 +240,13 @@
<script type="text/html" id="tpl-params-rucher">
<form class="formulaire" method="POST" id="form-params-ruchers">
<div id="apibundle_pshivegroup">
<span style="color: red">*</span>Champ obligatoire
<!--<div>
<label for="apibundle_pshivegroup_idClient" class="required">Id client</label>-->
<!--<input type="hidden" id="apibundle_pshivegroup_idClient" name="apibundle_pshivegroup[idClient]" value="" />
<!--</div>-->
<div>
<label for="apibundle_pshivegroup_name">Nom</label>
<label for="apibundle_pshivegroup_name">Nom<span style="color: red">*</span></label>
<input type="text" id="apibundle_pshivegroup_name" name="apibundle_pshivegroup[name]" value="{{name}}" maxlength="64" />
<div class="cl"></div>
</div>
......@@ -253,7 +255,7 @@
<textarea id="apibundle_pshivegroup_note" name="apibundle_pshivegroup[note]" maxlength="65535"></textarea>
</div>-->
<div>
<label for="apibundle_pshivegroup_harvest" class="required">Récolte</label>
<label for="apibundle_pshivegroup_harvest" class="required">Récolte (kg)<span style="color: red">*</span></label>
<input type="number" id="apibundle_pshivegroup_harvest" name="apibundle_pshivegroup[harvest]" value="{{harvest}}" required="required" />
<div class="cl"></div>
......@@ -272,13 +274,14 @@
<div id="goToSeuils" class="bouton2" style="text-align:center;clear:none;" >Notifications</div>
<form class="formulaire" id="form-params-hive" >
<span style="color: red">*</span>Champ obligatoire
<div id="apibundle_pshive">
<!--<div>
<label for="apibundle_pshive_idClient" class="required">Id client</label>
<input type="hidden" id="apibundle_pshive_idClient" name="apibundle_pshive[idClient]"/>
</div>-->
<div>
<label for="apibundle_pshive_name">Nom</label>
<label for="apibundle_pshive_name">Nom<span style="color: red">*</span></label>
<input type="text" value="{{ hive.name }}" id="apibundle_pshive_name" name="apibundle_pshive[name]" maxlength="64" />
<div class="cl"></div>
......@@ -298,7 +301,7 @@
<input type="text" id="apibundle_pshive_longitude" value="{{ hive.longitude }}" name="apibundle_pshive[longitude]" />
</div>-->
<div>
<label for="apibundle_pshive_hivegroup">Rucher</label>
<label for="apibundle_pshive_hivegroup">Rucher<span style="color: red">*</span></label>
<select type="text" id="apibundle_pshive_hivegroup" name="apibundle_pshive[idHiveGroup]">
{{#hivegroups}}
<option value="{{ id_hive_group }}" {{#isHiveGroup}}selected{{/isHiveGroup}}>{{ name }}</option>
......@@ -351,7 +354,7 @@
</select>
</div>
<div>
<label for="apibundle_pshive_harvest" class="required">Récolte (kg)</label>
<label for="apibundle_pshive_harvest" class="required">Récolte (kg)<span style="color: red">*</span></label>
<input type="number" id="apibundle_pshive_harvest" value="{{ hive.harvest }}" name="apibundle_pshive[harvest]" required="required" min="0" max="100" />
</div>
<!--<div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment