Merge branch 'fixes/fix-devis-list-show' into staging

gestion/src/js/objects/devis.mjs

@@ -23,7 +23,21 @@ export class Devis {
     this.tid = ((myresp.tid == null || myresp.tid.length === 0) ? '-' : myresp.tid);
     this.nom = ((myresp.nom == null || myresp.nom.length === 0) ? '-' : myresp.nom);
     this.prenom = ((myresp.prenom == null || myresp.prenom.length === 0) ? '-' : myresp.prenom);
-    this.nomThanato = ((myresp.nom_thanato == null || myresp.prenom_thanato.length === 0) ? '-' : `${myresp.nom_thanato +' '+ myresp.prenom_thanato}`);
+    let thanatoPrenom = "";
+    let thanatoNom = "";
+    let thanatoFullName = "";
+    if(myresp.nom_thanato != null || myresp.nom_thanato.length != 0){
+      thanatoNom = myresp.nom_thanato;
+      thanatoFullName += thanatoNom;
+    }
+    if(myresp.prenom_thanato != null || myresp.prenom_thanato.length != 0){
+      thanatoPrenom = myresp.prenom_thanato;
+      if(thanatoNom.length > 0 && thanatoPrenom.length > 0){
+        thanatoFullName += ' '
+      }
+      thanatoFullName += thanatoPrenom;
+    }
+    this.nomThanato = (thanatoFullName.length === 0) ? '-' : thanatoFullName;
     this.version = ((myresp.version == null || myresp.version.length === 0) ? '-' : myresp.version);
     this.lieu = ((myresp.lieu == null || myresp.lieu.length === 0) ? '-' : myresp.lieu);
     this.mentions = ((myresp.mentions == null || myresp.mentions.length === 0) ? '-' : myresp.mentions);