47,9 → 47,8 |
|
// Filtres sur les releves |
private InventoryFilterView inventoryFilterView=null; // Containeur filtre date, lieu, lieu-dit ... |
private LocationFilterPanel locationFilterPanel = null; // Filtre sur lieu de releve |
private DateFilterPanel dateFilterPanel = null; // Filtre sur date d'observation |
private StationFilterPanel stationFilterPanel = null; // Filtre sur station d'observation |
private LocationFilterView locationFilterView=null; // Filtre sur lieu de releve |
private DateFilterView dateFilterView = null; // Filtre sur date d'observation |
|
// Saisie d'une observation |
|
59,7 → 58,7 |
private LocationAssistant locationAssistant=null; // Assistant de saisie nom de commune |
|
private TextBox date = null; // date observation |
private TextBox milieu = null; // milieu observation |
private TextBox station = null; // station observation |
private TextBox lieudit = null; // lieu dit observation |
private TextBox comment = null; // commentaire observation |
private InventoryItem inventoryItem=null; // Une observation saisie |
108,27 → 107,27 |
// Navigateur |
|
Viewport viewport = new Viewport(); |
viewport.setStyleName("my-border-layout"); |
viewport.setBorders(true); |
// viewport.setStyleName("my-border-layout"); |
// viewport.setBorders(true); |
viewport.setLayout(new BorderLayout()); |
|
|
center = new WidgetContainer(); |
center.setLayout(new BorderLayout()); |
center.setBorders(true); |
// center.setBorders(true); |
|
west = new WidgetContainer(); |
west.setLayout(new FillLayout()); |
west.setBorders(true); |
// west.setBorders(true); |
|
south = new WidgetContainer(); |
south.setLayout(new FillLayout()); |
south.setBorders(true); |
// south.setBorders(true); |
|
north = new WidgetContainer(); |
north.setLayout(new FillLayout()); |
north.setBorders(true); |
|
// north.setBorders(true); |
|
inventoryListView = new InventoryListView(this); // Liste de releves |
connexionView = new ConnexionView(this); // Identifiant de connection |
195,13 → 194,23 |
|
public void onInit() { |
|
// Filtre par defaut : all et action selection de toutes les stations |
locationFilterView.setIDLocation("all"); // Mise a jour filtre localite |
locationFilterView.setLocation("all"); // Mise a jour filtre localite |
locationFilterView.setLieudit("all"); // Mise a jour filtre localite |
locationFilterView.update(); // Mise a jour affichage |
|
locationFilterPanel.setLocation("all"); |
locationFilterPanel.updateCount(); |
|
this.onLocationSelected("all"); |
|
dateFilterView.setYear("all"); |
dateFilterView.setMonth("all"); |
dateFilterView.setDay("all"); |
|
dateFilterView.update(); |
|
|
this.onLocationSelected("all","all","all"); |
|
|
|
} |
|
|
225,7 → 234,7 |
|
|
/** |
* Action suivant la completion d'un nom |
* Action suivant la completion d'un nom : affichage popup information |
* |
*/ |
|
253,7 → 262,7 |
inventoryItem=new InventoryItem(this); |
} |
|
inventoryItem.setContent(nameAssistant.getText(),nameAssistant.getValue(),locationAssistant.getText(),locationAssistant.getValue(),date.getText(),milieu.getText(),comment.getText(),"null"); |
inventoryItem.setContent(nameAssistant.getText(),nameAssistant.getValue(),locationAssistant.getText(),locationAssistant.getValue(),date.getText(),lieudit.getText(),station.getText(),comment.getText(),"null"); |
inventoryItem.addelement(); |
|
} |
272,7 → 281,7 |
inventoryItem=new InventoryItem(this); |
} |
|
inventoryItem.setContent(nameAssistant.getText(),nameAssistant.getValue(),locationAssistant.getText(),locationAssistant.getValue(),date.getText(),milieu.getText(),comment.getText(),ordre); |
inventoryItem.setContent(nameAssistant.getText(),nameAssistant.getValue(),locationAssistant.getText(),locationAssistant.getValue(),date.getText(),lieudit.getText(),station.getText(),comment.getText(),ordre); |
inventoryItem.updateElement(); |
|
} |
309,17 → 318,34 |
*/ |
|
|
public void onInventoryUpdated(String location) { |
public void onInventoryUpdated(String id_location,String loc, String lieu) { |
|
if (location.compareTo("")==0) { |
location="000null"; |
if (id_location.compareTo("")==0) { |
id_location="000null"; |
} |
|
if (loc.compareTo("")==0) { |
loc="000null"; |
} |
|
locationFilterPanel.setLocation(location); // Mise a jour filtre localite |
locationFilterPanel.updateCount(); |
if (lieu.compareTo("")==0) { |
lieu="000null"; |
} |
|
this.onLocationSelected(location); // Selection localite |
|
locationFilterView.setIDLocation(id_location); // Mise a jour filtre localite |
locationFilterView.setLocation(loc); // Mise a jour filtre localite |
locationFilterView.setLieudit(lieu); // Mise a jour filtre localite |
locationFilterView.update(); // Mise a jour affichage |
|
dateFilterView.setYear("all"); |
dateFilterView.setMonth("all"); |
dateFilterView.setDay("all"); |
|
dateFilterView.update(); |
|
this.onLocationSelected(id_location,loc,lieu); // Selection localite |
|
} |
|
|
365,10 → 391,9 |
this.user=user; |
connexionView.getSignLabel().setText(user+ " (deconnexion)"); |
inventoryListView.setUser(user); |
dateFilterPanel.setUser(user); |
stationFilterPanel.setUser(user); |
dateFilterView.setUser(user); |
entryView.setUser(user); |
locationFilterPanel.setUser(user); |
locationFilterView.setUser(user); |
this.onInit(); |
|
} |
385,10 → 410,9 |
this.user=user; |
connexionView.getSignLabel().setText("Connexion"); |
inventoryListView.setUser(user); |
dateFilterPanel.setUser(user); |
stationFilterPanel.setUser(user); |
dateFilterView.setUser(user); |
entryView.setUser(user); |
locationFilterPanel.setUser(user); |
locationFilterView.setUser(user); |
this.onInit(); |
} |
|
418,45 → 442,22 |
* Action sur selection d'un lieu : affichage de la liste des taxons correspondants au filtrage |
*/ |
|
public void onLocationSelected(String loc) { |
public void onLocationSelected(String id_loc, String loc,String lieu) { |
|
// Positionnement Filtre affichage |
inventoryListView.setIdLocation(id_loc); |
inventoryListView.setLocation(loc); |
inventoryListView.setLieudit(lieu); |
inventoryListView.updateCount(); |
|
// Affichage des filtres |
inventoryListView.displayFilter(); |
|
// Positionnement Filtre affichage |
|
dateFilterPanel.setLocation(loc); |
dateFilterPanel.updateCount(); |
|
// Positionnement Filtre affichage |
|
stationFilterPanel.setLocation(loc); |
stationFilterPanel.updateCount(); |
|
} |
|
|
// Filtre station |
|
/** |
* Action sur selection d'une station : affichage de la liste des taxons correspondants |
*/ |
|
public void onStationSelected(String station) { |
|
inventoryListView.setStation(station); |
inventoryListView.updateCount(); |
|
inventoryListView.displayFilter(); |
|
|
|
} |
|
// Filtre date d'observation |
|
|
464,9 → 465,12 |
* Action sur selection d'une date : affichage de la liste des taxons correspondants |
*/ |
|
public void onDateSelected(String date) { |
public void onDateSelected(String year,String month,String day) { |
|
inventoryListView.setDate(date); |
inventoryListView.setYear(year); |
inventoryListView.setMonth(month); |
inventoryListView.setDay(day); |
|
inventoryListView.updateCount(); |
|
inventoryListView.displayFilter(); |
495,7 → 499,7 |
/** |
* Declaration lieu dit : lieu dit d'observation |
* |
* @param milieu |
* @param lieudit |
*/ |
|
public void registerLieudit(TextBox lieudit) { |
506,13 → 510,13 |
|
|
/** |
* Declaration milieu : milieu d'observation |
* Declaration station : station d'observation |
* |
* @param milieu |
* @param station |
*/ |
|
public void registerMilieu(TextBox milieu) { |
this.milieu=milieu; |
public void registerStation(TextBox station) { |
this.station=station; |
|
} |
|
537,18 → 541,20 |
|
} |
|
|
|
/** |
* Declaration DateFilterPanel : filtre date observation |
* Declaration DateFilterView : filtre date observation |
* @param locationList |
*/ |
|
public void registerDateFilterPanel(DateFilterPanel dateFilterPanel) { |
public void registerDateFilterView(DateFilterView dateFilterView) { |
|
this.dateFilterPanel=dateFilterPanel; |
this.dateFilterView=dateFilterView; |
} |
|
|
|
|
|
/** |
* Declaration LocationAssistant : completion commune |
561,28 → 567,17 |
} |
|
/** |
* Declaration LocationFilterPanel : filtre lieu observation |
* Declaration LocationFilterView : filtre lieu observation |
* @param locationList |
*/ |
|
public void registerLocationFilterPanel(LocationFilterPanel locationFilterPanel) { |
public void registerLocationFilterView(LocationFilterView locationFilterView) { |
|
this.locationFilterPanel=locationFilterPanel; |
this.locationFilterView=locationFilterView; |
} |
|
|
/** |
* Declaration StationFilterPanel : filtre par station |
* @param locationList |
*/ |
|
public void registerStationFilterPanel(StationFilterPanel stationFilterPanel) { |
|
this.stationFilterPanel=stationFilterPanel; |
} |
|
|
|
// Accesseurs et setteurs |
|
|
632,8 → 627,9 |
return inventoryListView; |
} |
|
public LocationFilterPanel getLocationList() { |
return locationFilterPanel; |
|
public LocationFilterView getLocationFilterView() { |
return locationFilterView; |
} |
|
public NameAssistant getNameAssistant() { |