7,6 → 7,7 |
import org.tela_botanica.client.vues.BarrePaginationVue; |
|
import com.google.gwt.core.client.GWT; |
import com.google.gwt.user.client.Window; |
import com.gwtext.client.core.EventObject; |
import com.gwtext.client.data.FieldDef; |
import com.gwtext.client.data.IntegerFieldDef; |
174,21 → 175,9 |
return ""; |
} |
|
String[] obsTab = nomObs.split(";;"); |
String valeurTransmis = "0"; |
|
if(obsTab.length >= 1) { |
String[] elementsObs = obsTab[0].split("#"); |
|
if(elementsObs.length >= 3) { |
nomObs = elementsObs[1]; |
//if(elementsObs[2] == "1") { |
valeurTransmis = "1"; |
//} |
} |
} |
boolean transmise = estAssocieeTransmise(nomObs)[1]; |
|
if(valeurTransmis.equals("1")) |
if(transmise) |
{ |
return "<img src=\"tela.png\"/></img>" ; |
} |
337,17 → 326,10 |
if(nomObs == null) { |
return ""; |
} |
String[] obsTab = nomObs.split(";;"); |
|
if(obsTab.length >= 1) { |
String[] elementsObs = obsTab[0].split("#"); |
|
if(elementsObs.length >= 3) { |
nomObs = elementsObs[1]; |
} |
} |
|
return "<div class=\"centered-list\">" + nomObs |
String nomFormate = getNomsObservationsFormatees(nomObs); |
|
return "<div class=\"centered-list\">" + nomFormate |
+ "</div>"; |
} |
|
431,8 → 413,8 |
|
// gestion du clic sur une ligne |
public void onRowClick(GridPanel grid, int rowIndex, EventObject e) { |
|
// on notifie le médiateur et on lui passe le nuémro de ligne |
|
// on notifie le médiateur et on lui passe le numéro de ligne |
getIMediateur().clicListeImage(rowIndex); |
} |
|
684,5 → 666,60 |
|
return res; |
} |
|
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; |
} |
|
} |