Commit 4f1b2a1f authored by Eric Seigne's avatar Eric Seigne
Browse files

ressere un peu l'interface d'accueil + duplication de code pour la gestion...

ressere un peu l'interface d'accueil + duplication de code pour la gestion d'une mise à jour du client
parent b338c31a
......@@ -90,7 +90,7 @@
</ons-col>
</ons-row>
<ons-row style="margin-top:50px;">
<ons-row style="margin-top:15px;">
<ons-col>
<ons-button modifier="material large" type="button" onclick="loginButtonPressed();" class="menubutton"><i class="zmdi zmdi-sign-in"></i> Authentification</ons-button>
&nbsp;
......@@ -326,24 +326,25 @@
if (typeof result.data.api_token !== 'undefined') {
hideWait();
if (result.data.api_version == globalCompatibleWithAPIVersion) {
if (result.data.app_version != 'undefined' && compareVersions(result.data.app_version, globalAppVersion) > 0) {
ons.notification.alert(result.data.app_version_message, { title: "Nouvelle version" });
}
updateLocalUserFromServer(result, updateLocalUserFromServerSuccess);
}
else {
// myDebug("result.data.api_token undefined : " + result);
$("#messagePopupMessage").replaceWith(result.data.api_version_message);
$("#messagePopup").show();
// myDebug("carouselLogin 2");
carouselLogin();
// setTimeout(function(){ $("#erreurLogin").hide(); }, 5000);
if (typeof result.data.api_version_message !== 'undefined') {
$("#messagePopupMessage").replaceWith(result.data.api_version_message);
$("#messagePopup").show();
}
}
// myDebug("carouselLogin 2");
carouselLogin();
// setTimeout(function(){ $("#erreurLogin").hide(); }, 5000);
}
else {
hideWait();
// myDebug("result.data.api_token undefined : " + result);
$("#erreurLogin").show();
// myDebug("carouselLogin 2");
carouselLogin();
// setTimeout(function(){ $("#erreurLogin").hide(); }, 5000);
}
}
else {
......
Supports Markdown
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