RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr35S08CUAsignacionCalendarioLaboralRecursoItEr25S09: Added model to BandboxSearch in order to reload the list of BaseCalendar every time.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-11-24 13:28:49 +01:00 • committed by Javier Moran Rua
parent 2d0da2e175
commit 097e46d686
4 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
View file

@ -22,6 +22,8 @@ package org.navalplanner.web.common;
import static org.navalplanner.web.I18nHelper._;
import java.util.List;
import org.navalplanner.business.calendars.entities.BaseCalendar;
import org.navalplanner.business.common.entities.Configuration;
import org.navalplanner.web.common.components.bandboxsearch.BandboxSearch;
@ -66,6 +68,10 @@ public class ConfigurationController extends GenericForwardComposer {
});
}
public List<BaseCalendar> getCalendars() {
return configurationModel.getCalendars();
}
public BaseCalendar getDefaultCalendar() {
return configurationModel.getDefaultCalendar();
}

8
navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
View file

@ -20,6 +20,8 @@
package org.navalplanner.web.common;
import java.util.List;
import org.navalplanner.business.calendars.daos.IBaseCalendarDAO;
import org.navalplanner.business.calendars.entities.BaseCalendar;
import org.navalplanner.business.common.daos.IConfigurationDAO;
@ -48,6 +50,12 @@ public class ConfigurationModel implements IConfigurationModel {
@Autowired
private IBaseCalendarDAO baseCalendarDAO;
@Override
@Transactional(readOnly = true)
public List<BaseCalendar> getCalendars() {
return baseCalendarDAO.getBaseCalendars();
}
@Override
public BaseCalendar getDefaultCalendar() {
if (configuration == null) {

7
navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
View file

@ -20,6 +20,8 @@
package org.navalplanner.web.common;
import java.util.List;
import org.navalplanner.business.calendars.entities.BaseCalendar;
/**
@ -29,6 +31,11 @@ import org.navalplanner.business.calendars.entities.BaseCalendar;
*/
public interface IConfigurationModel {
/*
* Non conversational steps
*/
List<BaseCalendar> getCalendars();
/*
* Initial conversation steps
*/

1
navalplanner-webapp/src/main/webapp/common/configuration.zul
View file

@ -36,6 +36,7 @@
<label value="${i18n:_('Defautl calendar')}" />
<bandboxSearch id="defaultCalendarBandboxSearch"
finder="BaseCalendarBandboxFinder"
model="@{configurationController.calendars}"
selectedElement="@{configurationController.defaultCalendar}" />
</hbox>