Commit a388b21a authored by lucas64500's avatar lucas64500

Pb d'actualisation des seuils apres modif / Swipe right sur page creer rucher...

Pb d'actualisation des seuils apres modif / Swipe right sur page creer rucher / Nouveaux boutons page connexion / Bug graphique page historique
parent 33817920
......@@ -105,10 +105,10 @@
}
#connexion .bouton {
margin-top:10%;
width:50px;
height:28px;
padding-top:15px;
width:70px;
height:43px;
padding-top:22px;
vertical-align: top;
}
#connexion .bouton span { font-size:9px; }
......@@ -207,4 +207,4 @@
100% {
-moz-transform: rotate(360deg);
}
}
\ No newline at end of file
}
......@@ -52,17 +52,18 @@
.elt_histo_titre{
display:inline-block;
color:white;
width:calc(75% - 40px);
width:calc(65% - 40px);
padding:0 10px 0 3px;
word-wrap: break-word;
}
.elt_histo_date{
display:inline-block;
color:white;
width:calc(25% - 24px);
word-wrap: break-word;
width:calc(35% - 24px);
vertical-align:top;
padding:0 3px 0 3px;
}
.details_histo{
width:calc(100% - 30px);
......
......@@ -275,4 +275,4 @@ body {
margin-top:10px;
margin-bottom:20px;
}
\ No newline at end of file
}
......@@ -93,8 +93,8 @@
<form>
<input class="zone_texte" type="text" value="Adresse e-mail" id="email_connexion" onfocus="if(this.value=='Adresse e-mail'){this.value=''}" onblur="if(this.value==''){this.value = 'Adresse e-mail'}"/>
<input class="zone_texte" type="text" value="Mot de passe" id="mdp_connexion" onfocus="if(this.value=='Mot de passe'){this.value='';this.type='password'}" onblur="if(this.value==''){this.value = 'Mot de passe'; this.type='text'}"/>
<div class="bouton" id="valider_connexion" style="display:inline-block;"><span>VALIDER</span></div>
<div class="bouton" id="commencer_inscription" style="display:inline-block;"><span>S'INSCRIRE</span></div>
<div class="bouton" id="valider_connexion" style="display:inline-block;"><span>CONNEXION</span></div>
<div class="bouton" id="commencer_inscription" style="display:inline-block;"><span>CR&Eacute;ER UN COMPTE</span></div>
<!-- <div class="bouton" id="test" style="display:inline-block;"><span>TESTER</span></div> -->
</form>
<div style="clear:left;"></div>
......
......@@ -240,6 +240,9 @@ function nouveauRucher(){
else {
$("#nav_gauche_rucher").css("visibility","visible");
$("#nav_gauche_rucher").click(function(){allerAuRucher(rucher-1);});
Hammer(document.getElementById("nouveaurucher")).off("swiperight");
Hammer(document.getElementById("nouveaurucher")).on("swiperight", function(){allerAuRucher(rucher-1);});
}
$("#nav_droite_rucher").css("visibility","hidden");
//
......
......@@ -21,7 +21,7 @@ function getDataHive(id, id2, name, action) {
dataHive.id_hive_group=hg.hives[i].id_hive_group;
dataHive.name_hive_group=hg.name;
dataHive.id_hive=id;
action(i, name, dataHive);
action(dataHive);
}
}
}
......@@ -37,6 +37,7 @@ function getDataHive(id, id2, name, action) {
success: function(data) {
idHive = id2;
console.log(data);
if((parseInt(data.ORI.v)<=45)||315<=parseInt(data.ORI.v))data.ORICARD="Nord";
if(45<=parseInt(data.ORI.v)&&parseInt(data.ORI.v)<=135)data.ORICARD="Est";
if(135<=parseInt(data.ORI.v)&&parseInt(data.ORI.v)<=225)data.ORICARD="Sud";
......@@ -48,7 +49,7 @@ function getDataHive(id, id2, name, action) {
//console.log(id2);
//console.log(JSON.stringify(data));
//console.log(JSON.stringify(data["param.poids_essaim"]));
action(id2, name, data);
action(data);
}
});
}
......
......@@ -78,6 +78,7 @@ function afficherNotes(data, indexHive){
}
}
if(note.date_add.indexOf("NaN")!=-1)note.date_add="Date inconnue";
else note.date_add = note.date_add.substr(0,10);
notes.push(note);
};
for(var i in customNotesSetByUser) {
......@@ -89,6 +90,7 @@ function afficherNotes(data, indexHive){
}
}
if(note.date_add.indexOf("NaN")!=-1)note.date_add="Date inconnue";
else note.date_add = note.date_add.substr(0,10);
notes.push(note);
};
notes.sort(function(a, b) {
......
......@@ -345,13 +345,15 @@ function goToHiveSeuils() {
},
data: donnees,
success: function(data) {
finCharge();
//console.log(data);
//customer = 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();
updateLimitsHive();
finCharge();
//getDataHive(donneesRuches.hivegroups[idHiveGroup].hives[idHive].id_hive, idHive, donneesRuches.hivegroups[idHiveGroup].hives[idHive].name, function(data) { console.log(data); updateLimitsHive(); goToDataHive(true);finCharge();});
/* on retourne aux détails */
//goToDataHive(true);
//console.log("fin modif");
......@@ -374,10 +376,12 @@ function goToHiveSeuils() {
* update the values of the limits for launching a notification
* @Object data : contains list of the new limits
*/
function updateLimitsHive(data) {
for(var limit in data) {
donneesRuches.hivegroups[idHiveGroup].hives[idHive].data[limit] = data[limit];
function updateLimitsHive() {
console.log("Update local des seuils");
for(s=0;s<seuils.length;s++) {
donneesRuches.hivegroups[idHiveGroup].hives[idHive].data[seuils[s].nom].v = document.getElementById(seuils[s].nom).value;
}
console.log(donneesRuches.hivegroups[idHiveGroup].hives[idHive].data);
}
/**
......
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