IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Validace Budov.

Browse Source
This commit is contained in:
František Přibyl
2014-05-19 09:20:49 +02:00
parent 3718e4c088
commit f93021485e
9 changed files with 189 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/info/bukova/isspst/data/Building.java
+7
View File
@@ -3,6 +3,10 @@ package info.bukova.isspst.data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.NotBlank;
import org.hibernate.validator.constraints.NotEmpty;
@Entity
@Table(name="BUILDING")
@@ -22,6 +26,9 @@ public class Building extends BaseData implements DataModel {
/**
* @return the code
*/
@NotBlank(message = "${labels.BuildingsFormCodeConstr}")
@NotNull(message = "${labels.BuildingsFormCodeConstr}")
@NotEmpty(message = "${labels.BuildingsFormCodeConstr}")
public String getCode() {
return code;
}
src/main/java/info/bukova/isspst/services/BuildingService.java → src/main/java/info/bukova/isspst/services/buildings/BuildingService.java
+2 -1
View File
@@ -1,6 +1,7 @@
package info.bukova.isspst.services;
package info.bukova.isspst.services.buildings;
import info.bukova.isspst.data.Building;
import info.bukova.isspst.services.Service;
public interface BuildingService extends Service<Building> {
src/main/java/info/bukova/isspst/services/BuildingServiceImpl.java → src/main/java/info/bukova/isspst/services/buildings/BuildingServiceImpl.java
+2 -1
View File
@@ -1,6 +1,7 @@
package info.bukova.isspst.services;
package info.bukova.isspst.services.buildings;
import info.bukova.isspst.data.Building;
import info.bukova.isspst.services.AbstractService;
public class BuildingServiceImpl extends AbstractService<Building> implements BuildingService{
src/main/java/info/bukova/isspst/ui/BuildingList.java
+1 -1
View File
@@ -1,7 +1,7 @@
package info.bukova.isspst.ui;
import info.bukova.isspst.data.Building;
import info.bukova.isspst.services.BuildingService;
import info.bukova.isspst.services.buildings.BuildingService;
import org.zkoss.bind.annotation.Init;
import org.zkoss.zk.ui.select.annotation.WireVariable;
src/main/java/info/bukova/isspst/ui/ListViewModel.java
+78 -73
View File
@@ -22,7 +22,7 @@ import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Window;
public class ListViewModel<T extends DataModel> {
private boolean confirmDelete = false;
private boolean filter = false;
private Window editWin;
@@ -37,29 +37,29 @@ public class ListViewModel<T extends DataModel> {
private boolean sortDesc = true;
private boolean newRec = false;
private boolean fullFill = false;
protected Service<T> service;
protected Class<T> dataClass;
protected String formZul;
protected Filter<T> dataFilter;
public List<T> getDataList() {
if (dataList == null) {
dataList = new ArrayList<T>();
loadFromDbSync();
}
return dataList;
}
public void setDataBean(T data) {
this.dataBean = data;
}
public void setDataFilter(Filter<T> dataFilter) {
this.dataFilter = dataFilter;
}
public T getFilterTemplate() {
if (filterTemplate == null) {
try {
@@ -70,18 +70,18 @@ public class ListViewModel<T extends DataModel> {
e.printStackTrace();
}
}
return filterTemplate;
}
public T getDataBean() {
return dataBean;
}
public boolean getConfirmDelete() {
return confirmDelete;
}
public boolean getFilter() {
return this.filter;
}
@@ -89,21 +89,20 @@ public class ListViewModel<T extends DataModel> {
public boolean getFullFill() {
return fullFill;
}
protected void newRecMode() {
newRec = true;
}
protected void setEditBean(T edit) {
this.editBean = edit;
}
@Command
@NotifyChange({"filter", "dataList", "dataBean"})
@NotifyChange({ "filter", "dataList", "dataBean" })
public void filter() {
filter = !filter;
if (!filter) {
dataList = fullList;
dataBean = null;
@@ -113,19 +112,19 @@ public class ListViewModel<T extends DataModel> {
dataBean = null;
}
}
@Command
@NotifyChange("dataList")
public void doFilter() {
if (dataFilter == null) {
return;
}
List<T> result = service.filterList(fullList, dataFilter);
selIndex = -1;
dataList = result;
}
@Command
public void addNew() {
try {
@@ -138,66 +137,72 @@ public class ListViewModel<T extends DataModel> {
e.printStackTrace();
}
}
@Command
public void edit() {
int index = dataList.indexOf(dataBean);
newRec = false;
if (index != -1) {
if (index != -1) {
selIndex = index;
}
editBean = service.getById(dataBean.getId());
showForm();
}
@Command
@NotifyChange("confirmDelete")
public void delObject() {
confirmDelete = true;
}
@Command
@NotifyChange({"dataList", "dataBean"})
@NotifyChange({ "dataList", "dataBean" })
public void delete() {
Messagebox.show("Opravdu smazat?", "Smazat záznam", Messagebox.YES|Messagebox.NO,
Messagebox.QUESTION, new EventListener<Event>() {
Messagebox.show("Opravdu smazat?", "Smazat záznam", Messagebox.YES
| Messagebox.NO, Messagebox.QUESTION,
new EventListener<Event>() {
@Override
public void onEvent(Event evt) throws Exception {
if (((Integer)evt.getData()).intValue() == Messagebox.YES) {
if (((Integer) evt.getData()).intValue() == Messagebox.YES) {
try {
service.delete(dataBean);
dataList.remove(dataBean);
dataBean = null;
BindUtils.postNotifyChange(null, null, ListViewModel.this, "dataList");
BindUtils.postNotifyChange(null, null, ListViewModel.this, "dataBean");
BindUtils.postNotifyChange(null, null,
ListViewModel.this, "dataList");
BindUtils.postNotifyChange(null, null,
ListViewModel.this, "dataBean");
} catch (DataIntegrityViolationException e) {
Messagebox.show("Chyba při mazání záznamu", "Chyba", Messagebox.OK, Messagebox.ERROR);
Messagebox.show("Chyba při mazání záznamu",
"Chyba", Messagebox.OK,
Messagebox.ERROR);
}
}
}
});
});
confirmDelete = false;
}
@NotifyChange({"dataList", "dataBean"})
@NotifyChange({ "dataList", "dataBean" })
private void onDelete() {
try {
service.delete(dataBean);
dataList.remove(dataBean);
dataBean = null;
} catch (DataIntegrityViolationException e) {
Messagebox.show("Chyba při mazání záznamu", "Chyba", Messagebox.OK, Messagebox.ERROR);
Messagebox.show("Chyba při mazání záznamu", "Chyba", Messagebox.OK,
Messagebox.ERROR);
}
}
@GlobalCommand
@NotifyChange({"dataList", "dataBean"})
@NotifyChange({ "dataList", "dataBean" })
public void refresh() {
/*if (editBean != null && !editBean.isValid()) {
if (editBean != null && !editBean.isValid()) {
return;
}*/
}
if (editBean.getCreated() == null) {
return;
}
@@ -214,9 +219,9 @@ public class ListViewModel<T extends DataModel> {
dataList.set(selIndex, editBean);
}
}
@GlobalCommand
@NotifyChange({"dataList", "dataBean", "fullFill"})
@NotifyChange({ "dataList", "dataBean", "fullFill" })
public void reload() {
dataBean = null;
dataList.clear();
@@ -229,66 +234,66 @@ public class ListViewModel<T extends DataModel> {
if (editBean != null && !editBean.isValid()) {
return;
}
if (selIndex > dataList.size() -1) {
if (selIndex > dataList.size() - 1) {
selIndex = -1;
}
if (newRec) {
selIndex = dataList.size() -1;
selIndex = dataList.size() - 1;
newRec = false;
}
}
@Command
@NotifyChange("dataBean")
public void onSort(@BindingParam("column") String column) {
if (sortCol == null || this.sortCol.equals(column))
this.sortDesc = !this.sortDesc;
this.sortCol = column;
selIndex = -1;
dataBean = null;
}
public int getSelIndex() {
return this.selIndex;
}
@Command
@NotifyChange({"dataList", "fullFill"})
@NotifyChange({ "dataList", "fullFill" })
public void fullFill() {
if (fullFill && dataList.isEmpty()) {
dataList.addAll(tmpList);
fullList = dataList;
}
}
// private void loadFromDb() {
// Thread fillThread = new Thread(new Runnable() {
//
// @Override
// public void run() {
// tmpList = service.getAll();
//
// try {
// Thread.sleep(200);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
//
// fullFill = true;
// }
// });
//
// fillThread.start();
// }
// private void loadFromDb() {
// Thread fillThread = new Thread(new Runnable() {
//
// @Override
// public void run() {
// tmpList = service.getAll();
//
// try {
// Thread.sleep(200);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
//
// fullFill = true;
// }
// });
//
// fillThread.start();
// }
private void loadFromDbSync() {
dataList.addAll(service.getAll());
fullList = dataList;
}
protected void showForm() {
Map<String, Object> arg = new HashMap<String, Object>();
arg.put("selected", editBean);