Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
DoliSCAN
client-cordova
Commits
60980cd6
Commit
60980cd6
authored
Mar 19, 2021
by
Eric Seigne
Browse files
mise à jour des vehicules au login ok
parent
01556e97
Changes
3
Hide whitespace changes
Inline
Side-by-side
www/js/src/moncompte.js
View file @
60980cd6
...
...
@@ -36,6 +36,7 @@ function updateLocalUserFromServer(result, callback) {
let
ret
=
false
;
// myDebug(JSON.stringify(result));
if
((
typeof
result
!=
'
undefined
'
)
&&
(
result
!==
null
)
&&
(
result
!=
""
))
{
for
(
let
key
of
globalSrvKeys
)
{
myDebug
(
"
updateLocalUserFromServer: on cherche
"
+
key
);
if
((
typeof
result
.
data
!=
'
undefined
'
)
&&
(
result
.
data
!==
null
)
&&
(
result
.
data
!=
""
))
{
...
...
@@ -56,9 +57,34 @@ function updateLocalUserFromServer(result, callback) {
}
}
}
//Les données des véhicules
myDebug
(
"
on cherche si on a des vehicules ...
"
);
myDebug
(
result
.
vehicules
);
if
((
typeof
result
.
vehicules
!=
'
undefined
'
)
&&
(
result
.
vehicules
!==
null
)
&&
(
result
.
vehicules
!=
""
))
{
myDebug
(
"
on a des vehicules ...
"
);
//On vide la liste : si on change de compte sur le smartphone il ne faut pas garder les "autres véhicules"
localStoreData
(
"
vehicules
"
,
null
);
localStoreData
(
"
vehiculesPro
"
,
null
);
result
.
vehicules
.
forEach
((
v
,
key
)
=>
{
let
storageKey
=
"
vehiculesPro
"
if
(
v
.
is_perso
)
storageKey
=
"
vehicules
"
;
addVehicule
(
storageKey
,
v
.
name
,
v
.
energy
,
v
.
power
,
v
.
type
,
v
.
kmbefore
,
v
.
number
);
// let vehiculeNew = { "nom": v.name, "energie": v.energy, "puissance": v.power, "type": v.type, "kmbefore": v.kmbefore, "immat": v.number };
// myDebug(" valeur non nulle on stocke le vehicule : " + JSON.stringify(vehiculeNew));
});
// localStoreData(key, result.vehicules[key]);
ret
=
true
;
}
myDebug
(
"
=== updateLocalUserFromServer appel de callback
"
+
callback
+
"
pour
"
+
ret
);
callback
(
ret
);
}
myDebug
(
"
=== updateLocalUserFromServer appel de callback
"
+
callback
+
"
pour
"
+
ret
);
callback
(
ret
);
}
//Factorisation de code: on envoie le profil utilisateur sur le serveur
...
...
www/js/src/storage.js
View file @
60980cd6
...
...
@@ -39,6 +39,15 @@ function addLocalStorageEntry(liste, entry) {
*/
function
localStoreData
(
lakey
,
lavalue
)
{
localStorage
.
setItem
(
lakey
,
lavalue
);
//Si c'est un véhicule on garde la date de dernière mise à jour locale pour
//pouvoir faire une sync serveur si nécessaire
if
(
lakey
==
"
vehicules
"
||
lakey
==
"
vehiculesPro
"
)
{
let
ladate
=
new
Date
();
let
lastUpdate
=
ladate
.
toISOString
();
localStorage
.
setItem
(
"
vehiculesLastUpdate
"
,
lastUpdate
);
}
// myDebug('localStoreData : ' + key + ' et ' + value);
//Pas la peine de stocker ça en SQL
if
(
lakey
==
'
history
'
)
{
...
...
www/js/src/vehicules.js
View file @
60980cd6
...
...
@@ -2,8 +2,6 @@
* (c) Éric Seigne <eric.seigne@cap-rel.fr> - 2019 - GNU AGPLv3
*/
const
{
storage
}
=
require
(
"
../../../simulation/app-host
"
);
//Supprime le véhicule "id"
function
rmVehicule
(
storageKey
,
id
)
{
// myDebug("rmVehicule :" + id);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment