| 250,7 → 250,7 |
|---|
| new String[] { |
| "<tpl for='.'>", |
| "<div class='thumb-wrap' id='{num_image}'>", |
| "<div class='thumb dview-list'>{indication_transmission}{indication_liaison}<img class='miniature_galerie' src='{url_image_M}' width='{taille_x_s} px' height='{taille_y_s} px' title='{nom_original}' /></div>", |
| "<div class='thumb dview-list'>{indication_transmission}{indication_liaison}<img class='miniature_galerie' src='{url_image_M}' width='{taille_x_s} px' height='{taille_y_s} px' title='{infobulle}' /></div>", |
| "<span class='info_image'>{nom_obs_associees_formatees}</span></div>", "</tpl>", |
| "<div class='x-clear'></div>" }); |
| // pour des raisons de performances on compile le template en une |
| 281,25 → 281,27 |
|---|
| data.setProperty("taille_y_s", XYresize[1]); |
| |
| String nomObs = data.getProperty("obs_associees"); |
| String[] obsTab = nomObs.split(";;"); |
| |
| String htmltransmis = ""; |
| String htmllie = ""; |
| |
| if(obsTab.length >= 1) { |
| String[] elementsObs = obsTab[0].split("#"); |
| |
| if(elementsObs.length >= 3) { |
| nomObs = elementsObs[1]; |
| //if(elementsObs[2] == "1") { |
| htmltransmis = "<img class='picto_haut_gauche' src='tela.png' />"; |
| htmllie = "<img class='picto_haut_droite' src='chain.png' />"; |
| //} |
| } |
| |
| boolean associee = estAssocieeTransmise(nomObs)[0]; |
| boolean transmise = estAssocieeTransmise(nomObs)[1]; |
| |
| String nomFormate = getNomsObservationsFormatees(nomObs); |
| |
| if(associee) { |
| htmllie = "<img class='picto_haut_droite' src='chain.png' />"; |
| } |
| |
| if(transmise) { |
| htmltransmis = "<img class='picto_haut_gauche' src='tela.png' />"; |
| } |
| |
| data.setProperty("infobulle", nomFormate); |
| data.setProperty("indication_transmission", htmltransmis); |
| data.setProperty("indication_liaison", htmllie); |
| data.setProperty("nom_obs_associees_formatees", nomObs); |
| data.setProperty("nom_obs_associees_formatees", nomFormate); |
| |
| } |
| }; |
| 503,4 → 505,58 |
|---|
| |
| }); |
| } |
| |
| private String getNomsObservationsFormatees(String nomObs) { |
| |
| String htmlInfobulle = ""; |
| |
| String[][] obs = getObservationsAssociees(nomObs); |
| |
| for(int i = 0; i < obs.length; i++) { |
| if(obs[i].length == 3 && obs[i][1] != null && !obs[i][1].equals("")) { |
| htmlInfobulle += ", "+obs[i][1]; |
| } |
| } |
| |
| htmlInfobulle = htmlInfobulle.replaceFirst(", ", ""); |
| |
| return htmlInfobulle; |
| } |
| |
| private String[][] getObservationsAssociees(String nomObs) { |
| |
| if(nomObs.trim().equals("")) { |
| return new String[0][0]; |
| } |
| |
| String[] obsTab = nomObs.split(";;"); |
| String[][] obsAnalysees = new String[obsTab.length][3]; |
| |
| for(int i = 0; i < obsTab.length; i++) { |
| |
| obsAnalysees[i] = obsTab[i].split("#"); |
| |
| } |
| |
| return obsAnalysees; |
| } |
| |
| private boolean[] estAssocieeTransmise(String nomObs) { |
| |
| String[][] obs = getObservationsAssociees(nomObs); |
| boolean[] associeesTranmises = {false, false}; |
| |
| if(obs.length > 0) { |
| associeesTranmises[0] = true; |
| } |
| |
| for(int i = 0; i < obs.length; i++) { |
| |
| if(obs[i].length == 3 && obs[i][2] != null && obs[i][2].equals("1")) { |
| associeesTranmises[1] = true; |
| } |
| } |
| |
| return associeesTranmises; |
| } |
| } |