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

Opravena chyba zacyklani requestu pri trideni gridu s vybranym zaznamem.

Browse Source 
Nasazani cache entit.
closes #269
master
Josef Rokos 9 years ago
parent 7d4d693b2e
commit a8dc7f1306
24 changed files with 173 additions and 70 deletions
Show Stats Download Patch File Download Diff File

7
pom.xml
Unescape Escape View File

@ -229,7 +229,12 @@
<artifactId>hibernate-search</artifactId> <artifactId>hibernate-search</artifactId>
<version>4.4.6.Final</version> <version>4.4.6.Final</version>
</dependency> </dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
<version>4.2.8.Final</version>
</dependency>
<!-- ZK --> <!-- ZK -->
<dependency> <dependency>
<groupId>org.zkoss.zk</groupId> <groupId>org.zkoss.zk</groupId>

11
src/main/java/info/bukova/isspst/data/BaseData.java
Unescape Escape View File

@ -1,6 +1,9 @@
package info.bukova.isspst.data; package info.bukova.isspst.data;
import java.util.Date; import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.IndexedEmbedded;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.FetchType; import javax.persistence.FetchType;
@ -10,9 +13,7 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.MappedSuperclass; import javax.persistence.MappedSuperclass;
import javax.persistence.Transient; import javax.persistence.Transient;
import java.util.Date;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.IndexedEmbedded;
@MappedSuperclass @MappedSuperclass
@Indexed @Indexed
@ -29,10 +30,12 @@ public abstract class BaseData implements OwnedDataModel {
@ManyToOne(fetch=FetchType.LAZY) @ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(name="OWNED_BY_ID") @JoinColumn(name="OWNED_BY_ID")
@IndexedEmbedded @IndexedEmbedded
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private User ownedBy; private User ownedBy;
@ManyToOne(fetch=FetchType.LAZY) @ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(name="MODIFIED_BY_ID") @JoinColumn(name="MODIFIED_BY_ID")
@IndexedEmbedded @IndexedEmbedded
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private User modifiedBy; private User modifiedBy;
@Transient @Transient
private boolean valid; private boolean valid;

6
src/main/java/info/bukova/isspst/data/JobMapping.java
Unescape Escape View File

@ -1,5 +1,8 @@
package info.bukova.isspst.data; package info.bukova.isspst.data;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.FetchType; import javax.persistence.FetchType;
@ -11,6 +14,7 @@ import javax.persistence.Table;
@Entity @Entity
@Table(name = "JOBMAPPING") @Table(name = "JOBMAPPING")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public class JobMapping { public class JobMapping {
@Id @Id
@ -19,9 +23,11 @@ public class JobMapping {
private int id; private int id;
@ManyToOne(fetch = FetchType.EAGER) @ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "MEMBER_ID") @JoinColumn(name = "MEMBER_ID")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private Member member; private Member member;
@ManyToOne(fetch = FetchType.EAGER) @ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "ROLE_ID") @JoinColumn(name = "ROLE_ID")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private Role role; private Role role;
public JobMapping() { public JobMapping() {

15
src/main/java/info/bukova/isspst/data/Member.java
Unescape Escape View File

@ -1,8 +1,9 @@
package info.bukova.isspst.data; package info.bukova.isspst.data;
import java.util.ArrayList; import org.hibernate.annotations.Cache;
import java.util.Date; import org.hibernate.annotations.CacheConcurrencyStrategy;
import java.util.List; import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
@ -15,12 +16,13 @@ import javax.persistence.JoinColumn;
import javax.persistence.JoinTable; import javax.persistence.JoinTable;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import javax.persistence.Transient; import javax.persistence.Transient;
import java.util.ArrayList;
import org.hibernate.annotations.LazyCollection; import java.util.Date;
import org.hibernate.annotations.LazyCollectionOption; import java.util.List;
@Entity @Entity
@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public abstract class Member implements DataModel { public abstract class Member implements DataModel {
@Id @Id
@ -33,6 +35,7 @@ public abstract class Member implements DataModel {
@ManyToMany @ManyToMany
@LazyCollection(LazyCollectionOption.TRUE) @LazyCollection(LazyCollectionOption.TRUE)
@JoinTable(name="MEMBER_PARENT", joinColumns={@JoinColumn(name="MEMBER_ID")}, inverseJoinColumns={@JoinColumn(name="PARENT_ID")}) @JoinTable(name="MEMBER_PARENT", joinColumns={@JoinColumn(name="MEMBER_ID")}, inverseJoinColumns={@JoinColumn(name="PARENT_ID")})
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private List<Workgroup> parents; private List<Workgroup> parents;
@Transient @Transient
private boolean valid; private boolean valid;

6
src/main/java/info/bukova/isspst/data/Permission.java
Unescape Escape View File

@ -1,6 +1,9 @@
package info.bukova.isspst.data; package info.bukova.isspst.data;
import info.bukova.isspst.Constants; import info.bukova.isspst.Constants;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.springframework.security.core.GrantedAuthority;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
@ -8,10 +11,9 @@ import javax.persistence.EnumType;
import javax.persistence.Enumerated; import javax.persistence.Enumerated;
import javax.persistence.Table; import javax.persistence.Table;
import org.springframework.security.core.GrantedAuthority;
@Entity @Entity
@Table(name="PERMISSION") @Table(name="PERMISSION")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public class Permission extends BaseSimpleData implements GrantedAuthority { public class Permission extends BaseSimpleData implements GrantedAuthority {
/** /**

13
src/main/java/info/bukova/isspst/data/Requirement.java
Unescape Escape View File

@ -1,9 +1,7 @@
package info.bukova.isspst.data; package info.bukova.isspst.data;
import java.math.BigDecimal; import org.hibernate.search.annotations.Indexed;
import java.util.ArrayList; import org.hibernate.search.annotations.IndexedEmbedded;
import java.util.Date;
import java.util.List;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
@ -11,9 +9,10 @@ import javax.persistence.Entity;
import javax.persistence.FetchType; import javax.persistence.FetchType;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import java.math.BigDecimal;
import org.hibernate.search.annotations.Indexed; import java.util.ArrayList;
import org.hibernate.search.annotations.IndexedEmbedded; import java.util.Date;
import java.util.List;
@Entity @Entity
@Table(name = "REQUIREMENT") @Table(name = "REQUIREMENT")

6
src/main/java/info/bukova/isspst/data/RequirementBase.java
Unescape Escape View File

@ -1,6 +1,8 @@
package info.bukova.isspst.data; package info.bukova.isspst.data;
import info.bukova.isspst.Constants; import info.bukova.isspst.Constants;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption; import org.hibernate.annotations.LazyCollectionOption;
import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Analyze;
@ -24,6 +26,7 @@ import java.util.List;
@MappedSuperclass @MappedSuperclass
@Indexed @Indexed
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public class RequirementBase extends BaseData implements FilterableRequirement, SeasonsAware { public class RequirementBase extends BaseData implements FilterableRequirement, SeasonsAware {
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@ -43,9 +46,11 @@ public class RequirementBase extends BaseData implements FilterableRequirement,
private String description; private String description;
@ManyToOne(fetch = FetchType.EAGER) @ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "CENTRE_ID") @JoinColumn(name = "CENTRE_ID")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private Workgroup centre; private Workgroup centre;
@ManyToOne(fetch = FetchType.EAGER) @ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "WORKGROUP_ID") @JoinColumn(name = "WORKGROUP_ID")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private Workgroup workgroup; private Workgroup workgroup;
@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
@LazyCollection(LazyCollectionOption.TRUE) @LazyCollection(LazyCollectionOption.TRUE)
@ -56,6 +61,7 @@ public class RequirementBase extends BaseData implements FilterableRequirement,
private RequirementState state; private RequirementState state;
@ManyToOne(fetch = FetchType.EAGER) @ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "SEASON_ID") @JoinColumn(name = "SEASON_ID")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private Season season; private Season season;
public RequirementBase() { public RequirementBase() {

16
src/main/java/info/bukova/isspst/data/Role.java
Unescape Escape View File

@ -1,9 +1,11 @@
package info.bukova.isspst.data; package info.bukova.isspst.data;
import info.bukova.isspst.Constants; import info.bukova.isspst.Constants;
import org.hibernate.annotations.Cache;
import java.util.ArrayList; import org.hibernate.annotations.CacheConcurrencyStrategy;
import java.util.List; import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption;
import org.springframework.security.core.GrantedAuthority;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
@ -11,13 +13,12 @@ import javax.persistence.JoinColumn;
import javax.persistence.JoinTable; import javax.persistence.JoinTable;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import javax.persistence.Table; import javax.persistence.Table;
import java.util.ArrayList;
import org.hibernate.annotations.LazyCollection; import java.util.List;
import org.hibernate.annotations.LazyCollectionOption;
import org.springframework.security.core.GrantedAuthority;
@Entity @Entity
@Table(name="ROLE") @Table(name="ROLE")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public class Role extends BaseSimpleData implements GrantedAuthority, DataModel { public class Role extends BaseSimpleData implements GrantedAuthority, DataModel {
/** /**
@ -32,6 +33,7 @@ public class Role extends BaseSimpleData implements GrantedAuthority, DataModel
@ManyToMany @ManyToMany
@LazyCollection(LazyCollectionOption.FALSE) @LazyCollection(LazyCollectionOption.FALSE)
@JoinTable(name="ROLE_PERMISSION", joinColumns={@JoinColumn(name="ROLE_ID")}, inverseJoinColumns={@JoinColumn(name="PERMISSION_ID")}) @JoinTable(name="ROLE_PERMISSION", joinColumns={@JoinColumn(name="ROLE_ID")}, inverseJoinColumns={@JoinColumn(name="PERMISSION_ID")})
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private List<Permission> permissions; private List<Permission> permissions;
@Column(name = "WORKGROUP") @Column(name = "WORKGROUP")
private boolean workgroup; private boolean workgroup;

4
src/main/java/info/bukova/isspst/data/Season.java
Unescape Escape View File

@ -1,5 +1,8 @@
package info.bukova.isspst.data; package info.bukova.isspst.data;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
@ -10,6 +13,7 @@ import java.util.Date;
*/ */
@Entity @Entity
@Table(name = "SEASON") @Table(name = "SEASON")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public class Season extends BaseData { public class Season extends BaseData {
@Column(name = "DESCRIPTION") @Column(name = "DESCRIPTION")
private String description; private String description;

4
src/main/java/info/bukova/isspst/data/TripBill.java
Unescape Escape View File

@ -2,6 +2,8 @@ package info.bukova.isspst.data;
import info.bukova.isspst.Constants; import info.bukova.isspst.Constants;
import info.bukova.isspst.storage.EntityWithAttachment; import info.bukova.isspst.storage.EntityWithAttachment;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption; import org.hibernate.annotations.LazyCollectionOption;
import org.hibernate.search.annotations.Analyze; import org.hibernate.search.annotations.Analyze;
@ -31,6 +33,7 @@ public class TripBill extends BaseData implements EntityWithAttachment, SeasonsA
@OneToOne(fetch = FetchType.EAGER) @OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "REQUIREMENT_ID") @JoinColumn(name = "REQUIREMENT_ID")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private TripRequirement requirement; private TripRequirement requirement;
@Column(name = "RESULT_MESSAGE_DATE") @Column(name = "RESULT_MESSAGE_DATE")
private Date resultMessageDate; private Date resultMessageDate;
@ -72,6 +75,7 @@ public class TripBill extends BaseData implements EntityWithAttachment, SeasonsA
private Date paidDate; private Date paidDate;
@ManyToOne(fetch = FetchType.EAGER) @ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "SEASON_ID") @JoinColumn(name = "SEASON_ID")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private Season season; private Season season;
public TripBill() { public TripBill() {

24
src/main/java/info/bukova/isspst/data/TripRequirement.java
Unescape Escape View File

@ -1,11 +1,13 @@
package info.bukova.isspst.data; package info.bukova.isspst.data;
import info.bukova.isspst.storage.EntityWithAttachment; import info.bukova.isspst.storage.EntityWithAttachment;
import org.hibernate.annotations.LazyCollection;
import java.math.BigDecimal; import org.hibernate.annotations.LazyCollectionOption;
import java.util.ArrayList; import org.hibernate.search.annotations.Analyze;
import java.util.Date; import org.hibernate.search.annotations.Field;
import java.util.List; import org.hibernate.search.annotations.Index;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.IndexedEmbedded;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
@ -16,14 +18,10 @@ import javax.persistence.JoinTable;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import java.math.BigDecimal;
import org.hibernate.annotations.LazyCollection; import java.util.ArrayList;
import org.hibernate.annotations.LazyCollectionOption; import java.util.Date;
import org.hibernate.search.annotations.Analyze; import java.util.List;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Index;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.IndexedEmbedded;
@Entity @Entity
@Table(name = "TRIPREQUIREMENT") @Table(name = "TRIPREQUIREMENT")

20
src/main/java/info/bukova/isspst/data/User.java
Unescape Escape View File

@ -1,9 +1,13 @@
package info.bukova.isspst.data; package info.bukova.isspst.data;
import info.bukova.isspst.StringUtils; import info.bukova.isspst.StringUtils;
import org.hibernate.annotations.Cache;
import java.util.ArrayList; import org.hibernate.annotations.CacheConcurrencyStrategy;
import java.util.List; import org.hibernate.search.annotations.Analyze;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Index;
import org.hibernate.search.annotations.Indexed;
import org.springframework.security.core.userdetails.UserDetails;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Embedded; import javax.persistence.Embedded;
@ -13,16 +17,13 @@ import javax.persistence.JoinColumn;
import javax.persistence.JoinTable; import javax.persistence.JoinTable;
import javax.persistence.ManyToMany; import javax.persistence.ManyToMany;
import javax.persistence.Table; import javax.persistence.Table;
import java.util.ArrayList;
import org.hibernate.search.annotations.Analyze; import java.util.List;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Index;
import org.hibernate.search.annotations.Indexed;
import org.springframework.security.core.userdetails.UserDetails;
@Entity @Entity
@Table(name="USER") @Table(name="USER")
@Indexed @Indexed
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public class User extends Member implements UserDetails, DataModel { public class User extends Member implements UserDetails, DataModel {
/** /**
@ -50,6 +51,7 @@ public class User extends Member implements UserDetails, DataModel {
private boolean notify; private boolean notify;
@ManyToMany(fetch=FetchType.EAGER) @ManyToMany(fetch=FetchType.EAGER)
@JoinTable(name="USER_ROLE", joinColumns={@JoinColumn(name="USER_ID")}, inverseJoinColumns={@JoinColumn(name="ROLE_ID")}) @JoinTable(name="USER_ROLE", joinColumns={@JoinColumn(name="USER_ID")}, inverseJoinColumns={@JoinColumn(name="ROLE_ID")})
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private List<Role> authorities; private List<Role> authorities;
@Column(name="SETTINGS", length=1048576) @Column(name="SETTINGS", length=1048576)
private String settings; private String settings;

18
src/main/java/info/bukova/isspst/data/Workgroup.java
Unescape Escape View File

@ -1,11 +1,10 @@
package info.bukova.isspst.data; package info.bukova.isspst.data;
import info.bukova.isspst.StringUtils; import info.bukova.isspst.StringUtils;
import org.hibernate.annotations.Cache;
import java.io.Serializable; import org.hibernate.annotations.CacheConcurrencyStrategy;
import java.math.BigDecimal; import org.hibernate.annotations.LazyCollection;
import java.util.ArrayList; import org.hibernate.annotations.LazyCollectionOption;
import java.util.List;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
@ -17,12 +16,14 @@ import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient; import javax.persistence.Transient;
import java.io.Serializable;
import org.hibernate.annotations.LazyCollection; import java.math.BigDecimal;
import org.hibernate.annotations.LazyCollectionOption; import java.util.ArrayList;
import java.util.List;
@Entity @Entity
@Table(name = "WORKGROUP") @Table(name = "WORKGROUP")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public class Workgroup extends Member implements OwnedDataModel, Serializable { public class Workgroup extends Member implements OwnedDataModel, Serializable {
/** /**
@ -37,6 +38,7 @@ public class Workgroup extends Member implements OwnedDataModel, Serializable {
@ManyToMany(cascade = {CascadeType.ALL}) @ManyToMany(cascade = {CascadeType.ALL})
@LazyCollection(LazyCollectionOption.TRUE) @LazyCollection(LazyCollectionOption.TRUE)
@JoinTable(name="WORKGROUP_MEMBER", joinColumns={@JoinColumn(name="WORKGROUP_ID")}, inverseJoinColumns={@JoinColumn(name="JOBMAPPING_ID")}) @JoinTable(name="WORKGROUP_MEMBER", joinColumns={@JoinColumn(name="WORKGROUP_ID")}, inverseJoinColumns={@JoinColumn(name="JOBMAPPING_ID")})
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private List<JobMapping> members; private List<JobMapping> members;
@Column(name = "CENTRE") @Column(name = "CENTRE")
private boolean centre; private boolean centre;

22
src/main/java/info/bukova/isspst/ui/ListViewModel.java
Unescape Escape View File

@ -23,6 +23,7 @@ import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.select.annotation.WireVariable; import org.zkoss.zk.ui.select.annotation.WireVariable;
import org.zkoss.zul.Listheader;
import org.zkoss.zul.Messagebox; import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Window; import org.zkoss.zul.Window;
@ -48,6 +49,7 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
private boolean sortDesc = true; private boolean sortDesc = true;
private boolean newRec = false; private boolean newRec = false;
private boolean fullFill = false; private boolean fullFill = false;
private Listheader sortHeader;
@WireVariable @WireVariable
private SeasonService seasonService; private SeasonService seasonService;
@ -280,9 +282,13 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
dataList.set(selIndex, editBean); dataList.set(selIndex, editBean);
} }
} }
BindUtils.postGlobalCommand(null, null, "reloadRelated", null); BindUtils.postGlobalCommand(null, null, "reloadRelated", null);
if (sortHeader != null) {
sortHeader.setSortDirection("natural");
}
} }
@GlobalCommand @GlobalCommand
@ -334,13 +340,13 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
} }
} }
} }
if (selIndex > -1) { if (selIndex > -1) {
this.setDataBean(dataList.get(selIndex)); this.setDataBean(dataList.get(selIndex));
afterSelect(); afterSelect();
} }
} }
protected void beforeSelectViaUrl() { protected void beforeSelectViaUrl() {
} }
@ -360,6 +366,14 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
dataBean = null; dataBean = null;
} }
@Command
@NotifyChange({"dataBean", "canApprove"})
public void onSortHeader(@BindingParam("header") Listheader header) {
sortHeader = header;
selIndex = -1;
dataBean = null;
}
public int getSelIndex() { public int getSelIndex() {
return this.selIndex; return this.selIndex;
} }

2
src/main/webapp/WEB-INF/jdbc.properties
Unescape Escape View File

@ -1,5 +1,5 @@
jdbc.driverClassName=com.mysql.jdbc.Driver jdbc.driverClassName=com.mysql.jdbc.Driver
jdbc.dialect=org.hibernate.dialect.MySQLDialect jdbc.dialect=org.hibernate.dialect.MySQLDialect
jdbc.databaseurl=jdbc:mysql://127.0.0.1:3306/isspst?characterEncoding=latin2&autoReconnect=true jdbc.databaseurl=jdbc:mysql://127.0.0.1:3306/isspst-ostra?characterEncoding=latin2&autoReconnect=true
jdbc.username=isspst jdbc.username=isspst
jdbc.password=xsacfgd jdbc.password=xsacfgd

4
src/main/webapp/WEB-INF/spring/root-context.xml
Unescape Escape View File

@ -58,6 +58,10 @@
<prop key="hibernate.search.default.directory_provider">filesystem</prop> <prop key="hibernate.search.default.directory_provider">filesystem</prop>
<prop key="hibernate.search.default.indexBase">${storage.fulltextIndex}</prop> <prop key="hibernate.search.default.indexBase">${storage.fulltextIndex}</prop>
<prop key="hibernate.search.analyzer">org.apache.lucene.analysis.cz.CzechAnalyzer</prop> <prop key="hibernate.search.analyzer">org.apache.lucene.analysis.cz.CzechAnalyzer</prop>
<prop key="hibernate.cache.use_second_level_cache">true</prop>
<prop key="hibernate.cache.use_query_cache">true</prop>
<prop key="hibernate.generate_statistics">true</prop>
<prop key="hibernate.cache.region.factory_class">org.hibernate.cache.ehcache.EhCacheRegionFactory</prop>
<!-- <prop key="hibernate.enable_lazy_load_no_trans">true</prop> --> <!-- <prop key="hibernate.enable_lazy_load_no_trans">true</prop> -->
</props> </props>
</property> </property>

2
src/main/webapp/app/template.zhtml
Unescape Escape View File

@ -51,6 +51,6 @@
<div id="mainData"> <div id="mainData">
<u:include src="${gridZul}" /> <u:include src="${gridZul}" />
</div> </div>
<div id="footer"> Verze 3.1 </div> <div id="footer"> Verze 4.1 </div>
</div> </div>
</html> </html>

10
src/main/webapp/main/orders/requirements/reqListMyAll.zul
Unescape Escape View File

@ -3,7 +3,7 @@
vflex="1" vflex="1"
hflex="7" hflex="7"
itemRenderer="@load(vm.requirementsItemRenderer)" itemRenderer="@load(vm.requirementsItemRenderer)"
selectedItem="@bind(vm.dataBean)" selectedItem="@save(vm.dataBean)"
model="@load(vm.dataList)" model="@load(vm.dataList)"
mold="paging" mold="paging"
autopaging="true" autopaging="true"
@ -13,34 +13,42 @@
<listheader <listheader
label="${labels.StudentProjectAbr}" label="${labels.StudentProjectAbr}"
sort="auto(project)" sort="auto(project)"
onSort="@command('onSortHeader', header=self)"
hflex="5" /> hflex="5" />
<listheader <listheader
label="${labels.RequirementsGridNumberSerie}" label="${labels.RequirementsGridNumberSerie}"
sort="czech(numser)" sort="czech(numser)"
onSort="@command('onSortHeader', header=self)"
hflex="7" /> hflex="7" />
<listheader <listheader
label="${labels.RequirementsGridReqDate}" label="${labels.RequirementsGridReqDate}"
sort="auto(reqDate)" sort="auto(reqDate)"
onSort="@command('onSortHeader', header=self)"
hflex="13" /> hflex="13" />
<listheader <listheader
label="${labels.RequirementsGridCenter}" label="${labels.RequirementsGridCenter}"
sort="auto(centre.fullName)" sort="auto(centre.fullName)"
onSort="@command('onSortHeader', header=self)"
hflex="15" /> hflex="15" />
<listheader <listheader
label="${labels.RequirementsGridDeliveryDate}" label="${labels.RequirementsGridDeliveryDate}"
sort="auto(reqDate)" sort="auto(reqDate)"
onSort="@command('onSortHeader', header=self)"
hflex="13" /> hflex="13" />
<listheader <listheader
label="${labels.Amount}" label="${labels.Amount}"
sort="auto(sumTotal)" sort="auto(sumTotal)"
onSort="@command('onSortHeader', header=self)"
align="right" align="right"
hflex="10" /> hflex="10" />
<listheader <listheader
label="${labels.RequirementsGridDescription}" label="${labels.RequirementsGridDescription}"
sort="czech(description)" sort="czech(description)"
onSort="@command('onSortHeader', header=self)"
hflex="20" /> hflex="20" />
<listheader <listheader
sort="auto(ownedBy.fullName)" sort="auto(ownedBy.fullName)"
onSort="@command('onSortHeader', header=self)"
label="${labels.ownedBy}" label="${labels.ownedBy}"
hflex="15" /> hflex="15" />
</listhead> </listhead>

10
src/main/webapp/main/orders/requirements/reqListMyCenters.zul
Unescape Escape View File

@ -3,7 +3,7 @@
vflex="1" vflex="1"
hflex="7" hflex="7"
itemRenderer="@load(vm.requirementsItemRenderer)" itemRenderer="@load(vm.requirementsItemRenderer)"
selectedItem="@bind(vm.dataBean)" selectedItem="@save(vm.dataBean)"
mold="paging" mold="paging"
autopaging="true" autopaging="true"
model="@load(vm.dataList)" model="@load(vm.dataList)"
@ -13,34 +13,42 @@
<listheader <listheader
label="${labels.StudentProjectAbr}" label="${labels.StudentProjectAbr}"
sort="auto(project)" sort="auto(project)"
onSort="@command('onSortHeader', header=self)"
hflex="5" /> hflex="5" />
<listheader <listheader
label="${labels.RequirementsGridNumberSerie}" label="${labels.RequirementsGridNumberSerie}"
sort="czech(numser)" sort="czech(numser)"
onSort="@command('onSortHeader', header=self)"
hflex="7" /> hflex="7" />
<listheader <listheader
label="${labels.RequirementsGridReqDate}" label="${labels.RequirementsGridReqDate}"
sort="auto(reqDate)" sort="auto(reqDate)"
onSort="@command('onSortHeader', header=self)"
hflex="13" /> hflex="13" />
<listheader <listheader
label="${labels.RequirementsGridCenter}" label="${labels.RequirementsGridCenter}"
sort="auto(centre.fullName)" sort="auto(centre.fullName)"
onSort="@command('onSortHeader', header=self)"
hflex="15" /> hflex="15" />
<listheader <listheader
label="${labels.RequirementsGridDeliveryDate}" label="${labels.RequirementsGridDeliveryDate}"
sort="auto(reqDate)" sort="auto(reqDate)"
onSort="@command('onSortHeader', header=self)"
hflex="13" /> hflex="13" />
<listheader <listheader
label="${labels.Amount}" label="${labels.Amount}"
sort="auto(sumTotal)" sort="auto(sumTotal)"
onSort="@command('onSortHeader', header=self)"
align="right" align="right"
hflex="10" /> hflex="10" />
<listheader <listheader
label="${labels.RequirementsGridDescription}" label="${labels.RequirementsGridDescription}"
sort="czech(description)" sort="czech(description)"
onSort="@command('onSortHeader', header=self)"
hflex="20" /> hflex="20" />
<listheader <listheader
sort="auto(ownedBy.fullName)" sort="auto(ownedBy.fullName)"
onSort="@command('onSortHeader', header=self)"
label="${labels.ownedBy}" label="${labels.ownedBy}"
hflex="15" /> hflex="15" />
</listhead> </listhead>

10
src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul
Unescape Escape View File

@ -3,7 +3,7 @@
vflex="1" vflex="1"
hflex="7" hflex="7"
itemRenderer="@load(vm.requirementsItemRenderer)" itemRenderer="@load(vm.requirementsItemRenderer)"
selectedItem="@bind(vm.dataBean)" selectedItem="@save(vm.dataBean)"
mold="paging" mold="paging"
autopaging="true" autopaging="true"
model="@load(vm.dataList)" model="@load(vm.dataList)"
@ -13,34 +13,42 @@
<listheader <listheader
label="${labels.StudentProjectAbr}" label="${labels.StudentProjectAbr}"
sort="auto(project)" sort="auto(project)"
onSort="@command('onSortHeader', header=self)"
hflex="5" /> hflex="5" />
<listheader <listheader
label="${labels.RequirementsGridNumberSerie}" label="${labels.RequirementsGridNumberSerie}"
sort="czech(numser)" sort="czech(numser)"
onSort="@command('onSortHeader', header=self)"
hflex="7" /> hflex="7" />
<listheader <listheader
label="${labels.RequirementsGridReqDate}" label="${labels.RequirementsGridReqDate}"
sort="auto(reqDate)" sort="auto(reqDate)"
onSort="@command('onSortHeader', header=self)"
hflex="13" /> hflex="13" />
<listheader <listheader
label="${labels.RequirementsGridCenter}" label="${labels.RequirementsGridCenter}"
sort="auto(centre.fullName)" sort="auto(centre.fullName)"
onSort="@command('onSortHeader', header=self)"
hflex="15" /> hflex="15" />
<listheader <listheader
label="${labels.RequirementsGridDeliveryDate}" label="${labels.RequirementsGridDeliveryDate}"
sort="auto(reqDate)" sort="auto(reqDate)"
onSort="@command('onSortHeader', header=self)"
hflex="13" /> hflex="13" />
<listheader <listheader
label="${labels.Amount}" label="${labels.Amount}"
sort="auto(sumTotal)" sort="auto(sumTotal)"
onSort="@command('onSortHeader', header=self)"
align="right" align="right"
hflex="10" /> hflex="10" />
<listheader <listheader
label="${labels.RequirementsGridDescription}" label="${labels.RequirementsGridDescription}"
sort="czech(description)" sort="czech(description)"
onSort="@command('onSortHeader', header=self)"
hflex="20" /> hflex="20" />
<listheader <listheader
sort="auto(ownedBy.fullName)" sort="auto(ownedBy.fullName)"
onSort="@command('onSortHeader', header=self)"
label="${labelsownedBy}" label="${labelsownedBy}"
hflex="15" /> hflex="15" />
</listhead> </listhead>

7
src/main/webapp/main/trips/bill/tripBillGridInt.zul
Unescape Escape View File

@ -12,7 +12,7 @@
model="@load(vm.dataList)" model="@load(vm.dataList)"
mold="paging" mold="paging"
autopaging="true" autopaging="true"
selectedItem="@bind(vm.dataBean)" selectedItem="@save(vm.dataBean)"
itemRenderer="@load(vm.itemRenderer)" itemRenderer="@load(vm.itemRenderer)"
onAfterRender="@command('afterRender')" onAfterRender="@command('afterRender')"
selectedIndex="@bind(vm.selIndex)"> selectedIndex="@bind(vm.selIndex)">
@ -20,22 +20,27 @@
<listheader <listheader
label="${labels.TravelOrdersGridNumser}" label="${labels.TravelOrdersGridNumser}"
sort="czech(bill.requirement.numser)" sort="czech(bill.requirement.numser)"
onSort="@command('onSortHeader', header=self)"
width="30%" /> width="30%" />
<listheader <listheader
label="${labels.TravelOrdersGridReqDate}" label="${labels.TravelOrdersGridReqDate}"
sort="auto(bill.requirement.reqDate)" sort="auto(bill.requirement.reqDate)"
onSort="@command('onSortHeader', header=self)"
width="70%" /> width="70%" />
<listheader <listheader
label="${labels.TravelOrdersGridFrom}" label="${labels.TravelOrdersGridFrom}"
sort="czech(bill.requirement.from)" sort="czech(bill.requirement.from)"
onSort="@command('onSortHeader', header=self)"
width="70%" /> width="70%" />
<listheader <listheader
label="${labels.TravelOrdersGridTo}" label="${labels.TravelOrdersGridTo}"
sort="czech(bill.requirement.to)" sort="czech(bill.requirement.to)"
onSort="@command('onSortHeader', header=self)"
width="70%" /> width="70%" />
<listheader <listheader
label="${labels.TravelOrdersGridTotal}" label="${labels.TravelOrdersGridTotal}"
sort="auto(bill.total)" sort="auto(bill.total)"
onSort="@command('onSortHeader', header=self)"
align="right" align="right"
width="70%" /> width="70%" />
<listheader <listheader

9
src/main/webapp/main/trips/requirements/reqListMyAll.zul
Unescape Escape View File

@ -10,7 +10,7 @@
<hbox vflex="1"> <hbox vflex="1">
<listbox <listbox
model="@load(vm.dataList)" model="@load(vm.dataList)"
selectedItem="@bind(vm.dataBean)" selectedItem="@save(vm.dataBean)"
mold="paging" mold="paging"
autopaging="true" autopaging="true"
hflex="7" hflex="7"
@ -21,30 +21,37 @@
<listheader <listheader
label="${labels.RequirementsGridNumberSerie}" label="${labels.RequirementsGridNumberSerie}"
sort="czech(numser)" sort="czech(numser)"
onSort="@command('onSortHeader', header=self)"
width="10%" /> width="10%" />
<listheader <listheader
label="${labels.RequirementsGridReqDate}" label="${labels.RequirementsGridReqDate}"
sort="auto(reqDate)" sort="auto(reqDate)"
onSort="@command('onSortHeader', header=self)"
width="13%" /> width="13%" />
<listheader <listheader
label="${labels.RequirementsGridCenter}" label="${labels.RequirementsGridCenter}"
sort="auto(centre.fullName)" sort="auto(centre.fullName)"
onSort="@command('onSortHeader', header=self)"
width="10%" /> width="10%" />
<listheader <listheader
label="${labels.RequirementsGridWorkgroup}" label="${labels.RequirementsGridWorkgroup}"
sort="auto(workgroup.fullName)" sort="auto(workgroup.fullName)"
onSort="@command('onSortHeader', header=self)"
width="10%" /> width="10%" />
<listheader <listheader
label="${labels.RequirementsGridFrom}" label="${labels.RequirementsGridFrom}"
sort="czech(from)" sort="czech(from)"
onSort="@command('onSortHeader', header=self)"
width="30%" /> width="30%" />
<listheader <listheader
label="${labels.RequirementsGridTo}" label="${labels.RequirementsGridTo}"
sort="czech(to)" sort="czech(to)"
onSort="@command('onSortHeader', header=self)"
width="30%" /> width="30%" />
<listheader <listheader
label="${labels.RequirementsGridOwnedBy}" label="${labels.RequirementsGridOwnedBy}"
sort="auto(ownedBy.fullName)" sort="auto(ownedBy.fullName)"
onSort="@command('onSortHeader', header=self)"
width="20%" /> width="20%" />
</listhead> </listhead>
<auxhead <auxhead

8
src/main/webapp/main/trips/requirements/reqListMyCenters.zul
Unescape Escape View File

@ -8,7 +8,7 @@
<hbox vflex="1"> <hbox vflex="1">
<listbox <listbox
model="@load(vm.dataList)" model="@load(vm.dataList)"
selectedItem="@bind(vm.dataBean)" selectedItem="@save(vm.dataBean)"
mold="paging" mold="paging"
autopaging="true" autopaging="true"
hflex="7" hflex="7"
@ -19,26 +19,32 @@
<listheader <listheader
label="${labels.RequirementsGridNumberSerie}" label="${labels.RequirementsGridNumberSerie}"
sort="czech(numser)" sort="czech(numser)"
onSort="@command('onSortHeader', header=self)"
width="10%" /> width="10%" />
<listheader <listheader
label="${labels.RequirementsGridReqDate}" label="${labels.RequirementsGridReqDate}"
sort="auto(reqDate)" sort="auto(reqDate)"
onSort="@command('onSortHeader', header=self)"
width="13%" /> width="13%" />
<listheader <listheader
label="${labels.RequirementsGridCenter}" label="${labels.RequirementsGridCenter}"
sort="auto(centre.fullName)" sort="auto(centre.fullName)"
onSort="@command('onSortHeader', header=self)"
width="10%" /> width="10%" />
<listheader <listheader
label="${labels.RequirementsGridFrom}" label="${labels.RequirementsGridFrom}"
sort="auto(from)" sort="auto(from)"
onSort="@command('onSortHeader', header=self)"
width="40%" /> width="40%" />
<listheader <listheader
label="${labels.RequirementsGridTo}" label="${labels.RequirementsGridTo}"
sort="czech(to)" sort="czech(to)"
onSort="@command('onSortHeader', header=self)"
width="40%" /> width="40%" />
<listheader <listheader
label="${labels.RequirementsGridOwnedBy}" label="${labels.RequirementsGridOwnedBy}"
sort="auto(ownedBy.fullName)" sort="auto(ownedBy.fullName)"
onSort="@command('onSortHeader', header=self)"
width="20%" /> width="20%" />
</listhead> </listhead>
<auxhead <auxhead

9
src/main/webapp/main/trips/requirements/reqListMyWorkgroups.zul
Unescape Escape View File

@ -8,7 +8,7 @@
<hbox vflex="1"> <hbox vflex="1">
<listbox <listbox
model="@load(vm.dataList)" model="@load(vm.dataList)"
selectedItem="@bind(vm.dataBean)" selectedItem="@save(vm.dataBean)"
mold="paging" mold="paging"
autopaging="true" autopaging="true"
hflex="7" hflex="7"
@ -19,30 +19,37 @@
<listheader <listheader
label="${labels.RequirementsGridNumberSerie}" label="${labels.RequirementsGridNumberSerie}"
sort="czech(numser)" sort="czech(numser)"
onSort="@command('onSortHeader', header=self)"
width="10%" /> width="10%" />
<listheader <listheader
label="${labels.RequirementsGridReqDate}" label="${labels.RequirementsGridReqDate}"
sort="auto(reqDate)" sort="auto(reqDate)"
onSort="@command('onSortHeader', header=self)"
width="13%" /> width="13%" />
<listheader <listheader
label="${labels.RequirementsGridCenter}" label="${labels.RequirementsGridCenter}"
sort="auto(centre.fullName)" sort="auto(centre.fullName)"
onSort="@command('onSortHeader', header=self)"
width="10%" /> width="10%" />
<listheader <listheader
label="${labels.RequirementsGridWorkgroup}" label="${labels.RequirementsGridWorkgroup}"
sort="auto(workgroup.fullName)" sort="auto(workgroup.fullName)"
onSort="@command('onSortHeader', header=self)"
width="10%" /> width="10%" />
<listheader <listheader
label="${labels.RequirementsGridFrom}" label="${labels.RequirementsGridFrom}"
sort="czech(from)" sort="czech(from)"
onSort="@command('onSortHeader', header=self)"
width="30%" /> width="30%" />
<listheader <listheader
label="${labels.RequirementsGridTo}" label="${labels.RequirementsGridTo}"
sort="czech(to)" sort="czech(to)"
onSort="@command('onSortHeader', header=self)"
width="30%" /> width="30%" />
<listheader <listheader
label="${labels.RequirementsGridOwnedBy}" label="${labels.RequirementsGridOwnedBy}"
sort="auto(ownedBy.fullName)" sort="auto(ownedBy.fullName)"
onSort="@command('onSortHeader', header=self)"
width="20%" /> width="20%" />
</listhead> </listhead>
<auxhead <auxhead

Write Preview
Loading…
Cancel
Save