Compare commits

..

No commits in common. 'master' and 'Verze_3.0' have entirely different histories.

@ -229,11 +229,6 @@
<artifactId>hibernate-search</artifactId>
<version>4.4.6.Final</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
<version>4.2.8.Final</version>
</dependency>
<!-- ZK -->
<dependency>

@ -6,7 +6,6 @@ import info.bukova.isspst.data.NumberSeries;
import info.bukova.isspst.data.Permission;
import info.bukova.isspst.data.RequirementType;
import info.bukova.isspst.data.Role;
import info.bukova.isspst.data.Season;
import info.bukova.isspst.data.SettingsData;
import info.bukova.isspst.data.User;
import info.bukova.isspst.reporting.Report;
@ -18,8 +17,6 @@ import info.bukova.isspst.services.munits.MUnitService;
import info.bukova.isspst.services.numberseries.NumberSeriesService;
import info.bukova.isspst.services.requirement.RequirementTypeService;
import info.bukova.isspst.services.settings.GlobalSettingsService;
import info.bukova.isspst.services.settings.SeasonException;
import info.bukova.isspst.services.settings.SeasonService;
import info.bukova.isspst.services.users.PermissionService;
import info.bukova.isspst.services.users.RoleService;
import info.bukova.isspst.services.users.UserService;
@ -32,7 +29,6 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.List;
public class AppInitListener implements ServletContextListener {
@ -47,7 +43,6 @@ public class AppInitListener implements ServletContextListener {
private RequirementTypeService reqTypeService;
private GlobalSettingsService gSettingsService;
private FullTextService ftService;
private SeasonService seasonService;
@Override
public void contextDestroyed(ServletContextEvent arg0) {
@ -69,7 +64,6 @@ public class AppInitListener implements ServletContextListener {
gSettingsService = ctx.getBean(GlobalSettingsService.class);
reqTypeService = ctx.getBean(RequirementTypeService.class);
ftService = ctx.getBean(FullTextService.class);
seasonService = ctx.getBean(SeasonService.class);
userService.grantAdmin();
this.checkDbInfo();
@ -292,40 +286,28 @@ public class AppInitListener implements ServletContextListener {
}
}
private void checkNumberSeriesForSeason(Season season) {
for (String modId : Constants.NUM_SERIES_PREFIX.keySet()) {
NumberSeries ns = nsService.getNumberSerieForSeason(modId, season);
if (ns == null) {
ns = new NumberSeries();
ns.setModule(modId);
ns.setPrefix(Constants.NUM_SERIES_PREFIX.get(modId));
ns.setNumber(1);
ns.setSeason(season);
nsService.add(ns);
}
}
}
private void checkNumberSeries()
{
Season season;
try {
season = seasonService.getActive();
} catch (SeasonException e) {
season = null;
}
NumberSeries ns = nsService.getNumberSerie(Constants.MOD_REQUIREMENTS);
if (season == null) {
season = new Season();
Calendar cal = Calendar.getInstance();
season.setDescription(String.valueOf(cal.get(Calendar.YEAR)));
season.setValidFrom(cal.getTime());
season.setActive(true);
seasonService.add(season);
if (ns == null)
{
ns = new NumberSeries();
ns.setModule(Constants.MOD_REQUIREMENTS);
ns.setPrefix("");
ns.setNumber(1);
nsService.add(ns);
}
for (Season s : seasonService.getAllSeasons()) {
checkNumberSeriesForSeason(s);
ns = nsService.getNumberSerie(Constants.MOD_ORDER);
if (ns == null)
{
ns = new NumberSeries();
ns.setModule(Constants.MOD_ORDER);
ns.setPrefix("");
ns.setNumber(1);
nsService.add(ns);
}
}

@ -4,7 +4,6 @@ import java.math.BigDecimal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.commons.lang.StringUtils.strip;
public class BigDecimalUtils
{
@ -24,17 +23,6 @@ public class BigDecimalUtils
String valueS = value.toPlainString();
String searchS = search.toPlainString();
if (valueS.contains(".") || valueS.contains(",")) {
valueS = strip(valueS, "0");
valueS = strip(valueS, ".,");
}
if (searchS.contains(".") || searchS.contains(",")) {
searchS = strip(searchS, "0");
searchS = strip(searchS, ".,");
}
boolean result = (valueS.compareTo(searchS) == 0);
String s = "search='" + searchS + "', value='" + valueS + "', equal=" + (result ? "true" : "false");

@ -15,7 +15,6 @@ import info.bukova.isspst.services.addressbook.AdbService;
import info.bukova.isspst.services.buildings.BuildingService;
import info.bukova.isspst.services.fulltext.FullTextService;
import info.bukova.isspst.services.invoicing.InvoicingService;
import info.bukova.isspst.services.limits.LimitService;
import info.bukova.isspst.services.munits.MUnitService;
import info.bukova.isspst.services.orders.ApprovedService;
import info.bukova.isspst.services.orders.OrderService;
@ -36,7 +35,7 @@ import java.util.Map;
public class Constants {
public final static long DB_VERSION = 7;
public final static long DB_VERSION = 5;
public final static String DEF_ADMIN = "admin";
public final static String DEF_ADMIN_PASSWD = "admin";
@ -89,7 +88,6 @@ public class Constants {
public final static String MOD_INVOICING = "INVOICING";
public final static String MOD_SEARCH = "SEARCH";
public final static String MOD_SIGNEDDOCS = "SIGNEDDOCS";
public final static String MOD_LIMITS = "LIMITS";
public final static Module MODULES[] = {
new Module(MOD_USERS, "Uživatelé", UserService.class),
new Module(MOD_PERMISSIONS, "Práva", RoleService.class),
@ -108,7 +106,6 @@ public class Constants {
new Module(MOD_INVOICING, "Fakturace požadavků", InvoicingService.class),
new Module(MOD_SEARCH, "Fulltextové vyhledávání", FullTextService.class, true, false),
new Module(MOD_SIGNEDDOCS, "Podepsané dokumenty", SignedDocumentService.class, true, false),
new Module(MOD_LIMITS, "Limity komisi", LimitService.class),
};
public final static String PERM_APPROVE = "PERM_APPROVE";
@ -151,26 +148,14 @@ public class Constants {
new ReportMapping(MOD_ORDER, new Report(5, false, "Objednávka", "order", true, true)),
new ReportMapping(MOD_REQUIREMENTS, new Report(6, false, "Požadavky", "requirements")),
new ReportMapping(MOD_TRIPREQUIREMENTS, new Report(7, true, "Žádost o SC", "tripRequirementApp", false, true)),
new ReportMapping(MOD_REQUIREMENTS, new Report(8, true, "Protokol o kontrole", "orderRequirement", false, true)),
new ReportMapping(MOD_INVOICING, new Report(9, false, "Přehled o protokolech předběžné kontroly", "requirementProtocol")),
new ReportMapping(MOD_TRIPREQUIREMENTS, new Report(10, true, "Přehled o protokolech předběžné kontroly", "tripRequirementProtocol"))
new ReportMapping(MOD_REQUIREMENTS, new Report(8, true, "Protokol o kontrole", "orderRequirement", false, true))
};
public final static long TRIB_BILLS_REP_ID = 100;
public final static long TRIB_BILLS_NP_REP_ID = 101;
// pokud je v agnde vic nez jedena podepisovaci sestava, musi se definovat ktera sestava nalezi jake entite
public final static Map<Class<?>, Integer> SIGN_REPORT_MAP = Collections.unmodifiableMap(new HashMap<Class<?>, Integer>() {{
put(TripBillApproval.class, 4);
put(TripRequirement.class, 7);
}});
// vychozi prefixy ciselnych rad. Pokud se prida agenda s vlastni ciselnou radou, je potreba zadefinovat vychozi prefix
public final static Map<String, String> NUM_SERIES_PREFIX = Collections.unmodifiableMap(new HashMap<String, String>() {{
put(MOD_REQUIREMENTS, "P");
put(MOD_ORDER, "O");
}});
public final static String REQTYPE_ORDER = "ORDER";
public final static String REQTYPE_BUSINESSTRIP = "BUSINESSTRIP";
public final static RequirementType REQTYPES[] = {

@ -1,135 +1,85 @@
package info.bukova.isspst;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import org.apache.commons.lang.time.DateUtils;
public class DateTimeUtils {
public static Date getDate(Date value) {
if (value == null) {
return value;
}
// Keep date - truncate time
return DateUtils.truncate(value, Calendar.DAY_OF_MONTH);
}
public static int getYear(Date value) {
if (value == null) {
return 0;
}
Calendar cal =Calendar.getInstance();
cal.setTime(value);
return cal.get(Calendar.YEAR);
}
public static boolean isEqualByDate(Date d1, Date d2) {
if (d1 != null && d2 != null) {
d1 = DateTimeUtils.getDate(d1);
d2 = DateTimeUtils.getDate(d2);
boolean equals = (d1.compareTo(d2) == 0);
return equals;
}
return false;
}
public static boolean isEqualByYear(Date d1, Date d2) {
if (d1 != null && d2 != null) {
int year1 = DateTimeUtils.getYear(d1);
int year2 = DateTimeUtils.getYear(d2);
boolean equals = (year1 == year2);
return equals;
}
return false;
}
public static boolean isEqualByDateForFilter(Date value, Date search) {
if (search == null) {
return true;
} else if (value != null) {
return DateTimeUtils.isEqualByDate(value, search);
}
return false;
}
public static String getFormatedDate(Date value) {
if (value == null) {
return "";
}
SimpleDateFormat sdf = new SimpleDateFormat(StringUtils.localize("DateFormat"));
String result = sdf.format(value);
return result;
}
public static String getFormatedDirDate(Date value) {
if (value == null) {
return "";
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
String result = sdf.format(value);
return result;
}
public static String getFormatedDirDateDDMM(Date value) {
if (value == null) {
return "";
}
SimpleDateFormat sdf = new SimpleDateFormat("MMdd");
String result = sdf.format(value);
return result;
}
public static String getFormatedYear(Date value) {
if (value == null) {
return "";
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
String result = sdf.format(value);
return result;
}
public static Date getCurrDateTime() {
return new Date();
}
public static Date getCurrDate() {
return DateTimeUtils.getDate(DateTimeUtils.getCurrDateTime());
}
public static Calendar getCalendarDelta(Date value, int calendarType, int delta) {
if (value == null) {
value = DateTimeUtils.getCurrDate();
}
Calendar calendar = new GregorianCalendar();
calendar.setTime(value);
int deltaValue = calendar.get(calendarType);
calendar.set(calendarType, deltaValue + delta);
return calendar;
}
public static Calendar getCalendar(Date value) {
if (value == null) {
value = DateTimeUtils.getCurrDate();
}
Calendar calendar = new GregorianCalendar();
calendar.setTime(value);
return calendar;
}
public static Date getDateDelta(Date value, int calendarType, int delta) {
Calendar calendar = DateTimeUtils.getCalendarDelta(value, calendarType, delta);
return calendar.getTime();
}
public class DateTimeUtils
{
public static Date getDate(Date value)
{
if (value == null)
{
return value;
}
// Keep date - truncate time
return DateUtils.truncate(value, Calendar.DAY_OF_MONTH);
}
public static boolean isEqualByDate(Date d1, Date d2)
{
if (d1 != null && d2 != null)
{
d1 = DateTimeUtils.getDate(d1);
d2 = DateTimeUtils.getDate(d2);
boolean equals = (d1.compareTo(d2) == 0);
return equals;
}
return false;
}
public static boolean isEqualByDateForFilter(Date value, Date search)
{
if (search == null)
{
return true;
}
else if (value != null)
{
return DateTimeUtils.isEqualByDate(value, search);
}
return false;
}
public static Date getCurrDateTime()
{
return new Date();
}
public static Date getCurrDate()
{
return DateTimeUtils.getDate(DateTimeUtils.getCurrDateTime());
}
public static Calendar getCalendarDelta(Date value, int calendarType, int delta) {
if (value == null) {
value = DateTimeUtils.getCurrDate();
}
Calendar calendar = new GregorianCalendar();
calendar.setTime(value);
int deltaValue = calendar.get(calendarType);
calendar.set(calendarType, deltaValue + delta);
return calendar;
}
public static Calendar getCalendar(Date value) {
if (value == null) {
value = DateTimeUtils.getCurrDate();
}
Calendar calendar = new GregorianCalendar();
calendar.setTime(value);
return calendar;
}
public static Date getDateDelta(Date value, int calendarType, int delta) {
Calendar calendar = DateTimeUtils.getCalendarDelta(value, calendarType, delta);
return calendar.getTime();
}
}

@ -17,7 +17,6 @@ public class SessionData implements Serializable {
private static final long serialVersionUID = -764426911263559759L;
private List<Workgroup> userCentres;
private List<Workgroup> userOnlyCentres;
private List<Workgroup> userWorkgroups;
private User currentUser;
private Map<Integer, List<Role>> workgroupRoles;
@ -76,12 +75,4 @@ public class SessionData implements Serializable {
public Object getProperty(String key) {
return properties.get(key);
}
public List<Workgroup> getUserOnlyCentres() {
return userOnlyCentres;
}
public void setUserOnlyCentres(List<Workgroup> userOnlyCentres) {
this.userOnlyCentres = userOnlyCentres;
}
}

@ -1,10 +0,0 @@
package info.bukova.isspst.dao;
import info.bukova.isspst.data.Limit;
/**
* @author Pepa Rokos
*/
public interface LimitDao extends BaseDao<Limit> {
}

@ -1,10 +0,0 @@
package info.bukova.isspst.dao;
import info.bukova.isspst.data.Season;
/**
* @author Pepa Rokos
*/
public interface SeasonDao extends BaseDao<Season> {
}

@ -1,11 +0,0 @@
package info.bukova.isspst.dao.jpa;
import info.bukova.isspst.dao.LimitDao;
import info.bukova.isspst.data.Limit;
/**
* @author Pepa Rokos
*/
public class LimitDaoJPA extends BaseDaoJPA<Limit> implements LimitDao {
}

@ -1,11 +0,0 @@
package info.bukova.isspst.dao.jpa;
import info.bukova.isspst.dao.SeasonDao;
import info.bukova.isspst.data.Season;
/**
* @author Pepa Rokos
*/
public class SeasonDaoJPA extends BaseDaoJPA<Season> implements SeasonDao {
}

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

@ -70,18 +70,6 @@ public class Invoicing extends BaseData implements Cloneable
this.completed = completed;
}
public String getInvoiceNumbers() {
String ret = "";
for (InvoicingItem invNum : items) {
if (!ret.isEmpty()) {
ret += ", ";
}
ret += invNum.getInvoiceNumber();
}
return ret;
}
@Override
public Object clone() throws CloneNotSupportedException
{

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

@ -1,50 +0,0 @@
package info.bukova.isspst.data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import java.math.BigDecimal;
/**
* @author Pepa Rokos
*/
@Entity
@Table(name = "LIMITS")
public class Limit extends BaseData implements SeasonsAware {
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "WORKGROUP_ID")
private Workgroup workgroup;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "SEASON_ID")
private Season season;
@Column(name = "REQ_LIMIT", precision = 15, scale = 4)
private BigDecimal limit;
public Workgroup getWorkgroup() {
return workgroup;
}
public void setWorkgroup(Workgroup workgroup) {
this.workgroup = workgroup;
}
public Season getSeason() {
return season;
}
public void setSeason(Season season) {
this.season = season;
}
public BigDecimal getLimit() {
return limit;
}
public void setLimit(BigDecimal limit) {
this.limit = limit;
}
}

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

@ -2,8 +2,6 @@ package info.bukova.isspst.data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.OneToOne;
import javax.persistence.Table;
@Entity
@ -19,10 +17,6 @@ public class NumberSeries extends BaseSimpleData
@Column(name = "NUMBER")
private int number;
@OneToOne
@JoinColumn(name = "SEASON_ID")
private Season season;
public String getCurrentNumber()
{
return String.format("%s%06d", this.getPrefix(), this.getNumber());
@ -57,12 +51,4 @@ public class NumberSeries extends BaseSimpleData
{
this.number = number;
}
public Season getSeason() {
return season;
}
public void setSeason(Season season) {
this.season = season;
}
}

@ -1,13 +1,11 @@
package info.bukova.isspst.data;
import info.bukova.isspst.Constants;
import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption;
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.hibernate.search.annotations.IndexedEmbedded;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.persistence.AttributeOverride;
import javax.persistence.AttributeOverrides;
@ -15,20 +13,21 @@ import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption;
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.hibernate.search.annotations.IndexedEmbedded;
@Entity
@Table(name = "ORDERS")
@Indexed
public class Order extends BaseData implements Cloneable, SeasonsAware
public class Order extends BaseData implements Cloneable
{
@Column(name = "NUMSER")
@ -122,10 +121,6 @@ public class Order extends BaseData implements Cloneable, SeasonsAware
@Column(name = "DELIVERED")
private boolean delivered;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "SEASON_ID")
private Season season;
public Order()
{
this.items = new ArrayList<OrderItem>();
@ -293,12 +288,4 @@ public class Order extends BaseData implements Cloneable, SeasonsAware
cloned.setTotal(new BigDecimal(this.getTotal().toString()));
return cloned;
}
public Season getSeason() {
return season;
}
public void setSeason(Season season) {
this.season = season;
}
}

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

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

@ -1,14 +1,10 @@
package info.bukova.isspst.data;
import info.bukova.isspst.Constants;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption;
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 java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Column;
@ -20,14 +16,17 @@ import javax.persistence.ManyToOne;
import javax.persistence.MappedSuperclass;
import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption;
import org.hibernate.search.annotations.Analyze;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Index;
import org.hibernate.search.annotations.Indexed;
@MappedSuperclass
@Indexed
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public class RequirementBase extends BaseData implements FilterableRequirement, SeasonsAware {
public class RequirementBase extends BaseData implements FilterableRequirement {
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "TYPE_ID")
@ -46,11 +45,9 @@ public class RequirementBase extends BaseData implements FilterableRequirement,
private String description;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "CENTRE_ID")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private Workgroup centre;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "WORKGROUP_ID")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private Workgroup workgroup;
@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
@LazyCollection(LazyCollectionOption.TRUE)
@ -59,12 +56,6 @@ public class RequirementBase extends BaseData implements FilterableRequirement,
@Column(name = "STATE")
@Enumerated(EnumType.ORDINAL)
private RequirementState state;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "SEASON_ID")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private Season season;
@Column(name = "APPROVE_DATE")
private Date approveDate;
public RequirementBase() {
authorization = new ArrayList<AuthItem>();
@ -161,19 +152,4 @@ public class RequirementBase extends BaseData implements FilterableRequirement,
return authorization.get(authorization.size() - 1).getAuthDate();
}
public Season getSeason() {
return season;
}
public void setSeason(Season season) {
this.season = season;
}
public Date getApproveDate() {
return approveDate;
}
public void setApproveDate(Date approveDate) {
this.approveDate = approveDate;
}
}

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

@ -1,83 +0,0 @@
package info.bukova.isspst.data;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
* @author Pepa Rokos
*/
@Entity
@Table(name = "SEASON")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public class Season extends BaseData {
@Column(name = "DESCRIPTION")
private String description;
@Column(name = "VALID_FROM")
private Date validFrom;
@Column(name = "VALID_TO")
private Date validTo;
@Column(name = "ACTIVE")
private boolean active;
public String getDescription() {
return description;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof Season)) return false;
Season season = (Season) o;
if (getId() != season.getId()) return false;
if (active != season.active) return false;
if (description != null ? !description.equals(season.description) : season.description != null) return false;
if (validFrom != null ? !validFrom.equals(season.validFrom) : season.validFrom != null) return false;
if (validTo != null ? !validTo.equals(season.validTo) : season.validTo != null) return false;
return true;
}
@Override
public int hashCode() {
int result = description != null ? description.hashCode() : 0;
result = 31 * result + (validFrom != null ? validFrom.hashCode() : 0);
result = 31 * result + (validTo != null ? validTo.hashCode() : 0);
result = 31 * result + (active ? 1 : 0);
return result;
}
public void setDescription(String description) {
this.description = description;
}
public Date getValidFrom() {
return validFrom;
}
public void setValidFrom(Date validFrom) {
this.validFrom = validFrom;
}
public Date getValidTo() {
return validTo;
}
public void setValidTo(Date validTo) {
this.validTo = validTo;
}
public boolean isActive() {
return active;
}
public void setActive(boolean active) {
this.active = active;
}
}

@ -1,8 +0,0 @@
package info.bukova.isspst.data;
/**
* @author Pepa Rokos
*/
public interface SeasonsAware {
public Season getSeason();
}

@ -7,7 +7,11 @@ import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption;
import org.hibernate.search.annotations.IndexedEmbedded;
import javax.persistence.*;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -16,9 +20,6 @@ import java.util.List;
@Table(name = "SIGNED_DOCUMENTS")
public class SignedDocument extends BaseData {
@Transient
private String agendaName;
@Column(name = "MODULE_NAME", length = Constants.LEN_TEXT)
private String moduleName;
@ -39,10 +40,7 @@ public class SignedDocument extends BaseData {
@IndexedEmbedded
private List<SignedDocumentItem> items;
public SignedDocument() {
}
public String getModuleName() {
public String getModuleName() {
return moduleName;
}
@ -83,9 +81,6 @@ public class SignedDocument extends BaseData {
}
public String getAgendaName() {
if (!StringUtils.isNullOrEmpty(this.agendaName)) {
return this.agendaName;
}
if (StringUtils.isNullOrEmpty(this.moduleName)) {
return "";
@ -100,11 +95,7 @@ public class SignedDocument extends BaseData {
return "";
}
public void setAgendaName(String agendaName) {
this.agendaName = agendaName;
}
public List<SignedDocumentItem> getItems() {
public List<SignedDocumentItem> getItems() {
return items;
}

@ -2,8 +2,6 @@ package info.bukova.isspst.data;
import info.bukova.isspst.Constants;
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.LazyCollectionOption;
import org.hibernate.search.annotations.Analyze;
@ -17,7 +15,6 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
@ -29,12 +26,10 @@ import java.util.List;
@Entity
@Table(name = "TRIP_BILL")
@Indexed
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
public class TripBill extends BaseData implements EntityWithAttachment, SeasonsAware {
public class TripBill extends BaseData implements EntityWithAttachment {
@OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "REQUIREMENT_ID")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private TripRequirement requirement;
@Column(name = "RESULT_MESSAGE_DATE")
private Date resultMessageDate;
@ -74,10 +69,6 @@ public class TripBill extends BaseData implements EntityWithAttachment, SeasonsA
private Boolean paid;
@Column(name = "PAID_DATE")
private Date paidDate;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "SEASON_ID")
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
private Season season;
public TripBill() {
billItems = new ArrayList<TripBillItem>();
@ -215,13 +206,4 @@ public class TripBill extends BaseData implements EntityWithAttachment, SeasonsA
public void setPaidDate(Date paidDate) {
this.paidDate = paidDate;
}
@Override
public Season getSeason() {
return season;
}
public void setSeason(Season season) {
this.season = season;
}
}

@ -5,8 +5,6 @@ import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**
* @author Pepa Rokos
@ -19,26 +17,6 @@ public class TripBillApproval extends RequirementBase {
@OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "TRIPBILL_ID")
private TripBill bill;
@Transient
private boolean billForPassenger;
@Transient
private Date tripDate;
public boolean isBillForPassenger() {
return billForPassenger;
}
public void setBillForPassenger(boolean billForPassenger) {
this.billForPassenger = billForPassenger;
}
public Date getTripDate() {
return tripDate;
}
public void setTripDate(Date tripDate) {
this.tripDate = tripDate;
}
@Override
public String getNumser() {

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

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

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

@ -1,6 +1,5 @@
package info.bukova.isspst.filters;
import info.bukova.isspst.BigDecimalUtils;
import info.bukova.isspst.BooleanUtils;
import info.bukova.isspst.DateTimeUtils;
import info.bukova.isspst.StringUtils;
@ -49,8 +48,7 @@ public class RequirementFilter implements Filter<Requirement>
boolean foundDeliveryDate = DateTimeUtils.isEqualByDateForFilter(item.getDeliveryDate(), condition.getDeliveryDate());
boolean foundUser = User.isEqualByUserForFilter(item.getOwnedBy(), condition.getOwnedBy());
boolean foundProject = BooleanUtils.isEqualByBooleanValue(item.getProject(), condition.getProject());
boolean foundSumTotal = BigDecimalUtils.isEqualByDecimalForFilter(item.getSumTotal(), condition.getSumTotal());
return (foundNumser && foundReqDate && foundCenter && foundDescription && foundDeliveryDate && foundUser && foundProject && foundSumTotal);
return (foundNumser && foundReqDate && foundCenter && foundDescription && foundDeliveryDate && foundUser && foundProject);
}
@Factory

@ -53,11 +53,7 @@ public class TripBillApprovalFilter implements Filter<TripBillApproval>
boolean foundOwner = User.isEqualByUserForFilter(item.getBill().getOwnedBy(), condition.getBill().getOwnedBy());
boolean foundPaid = BooleanUtils.isEqualByBooleanValue(item.getBill().getPaid(), condition.getBill().getPaid());
boolean foundPaidDate = DateTimeUtils.isEqualByDateForFilter(item.getBill().getPaidDate(), condition.getBill().getPaidDate());
boolean foundPassenger = (item.getBill().getOwnedBy() != item.getBill().getRequirement().getOwnedBy()) == condition.isBillForPassenger();
boolean foundApproveDate = DateTimeUtils.isEqualByDateForFilter(item.getApproveDate(), condition.getApproveDate());
boolean foundTripDate = DateTimeUtils.isEqualByDateForFilter(item.getBill().getRequirement().getTripDate(), condition.getTripDate());
return foundNumser && foundReqDate && foundDescription && foundFrom && foundTo && foundWorkgroup && foundCentre && foundOwner && foundPaid
&& foundPaidDate && foundPassenger && foundApproveDate && foundTripDate;
return foundNumser && foundReqDate && foundDescription && foundFrom && foundTo && foundWorkgroup && foundCentre && foundOwner && foundPaid && foundPaidDate;
}
@Factory

@ -12,10 +12,8 @@ import info.bukova.isspst.services.settings.GlobalSettingsService;
import info.bukova.isspst.services.tripbill.TripBillApprovalService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.storage.FileStorage;
import net.sf.jasperreports.engine.JRParameter;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
@ -33,8 +31,6 @@ public class ParamFiller {
private GlobalSettingsService settingService;
@Autowired
private TripBillApprovalService tripBillApprovalService;
@Autowired
private HttpServletRequest req;
public void fill() {
if (definition.getDataSet() == null || definition.getDataSet().isEmpty()) {
@ -99,7 +95,6 @@ public class ParamFiller {
}
definition.setParam("P_LOGO", storage.serverPath(settingService.getSettings().getLogoFile()));
definition.setParam(JRParameter.REPORT_LOCALE, req.getLocale());
Address mainAddress = settingService.getSettings().getMainAddress();

@ -73,9 +73,6 @@ public class ReportController {
} catch (ReportException e) {
logger.error("Report generation error: " + e.getMessage());
writeError(os, e);
} catch (Exception e) {
logger.error("Report generation error: " + e.getMessage());
writeError(os, e);
} finally {
if (os != null) {
try {

@ -1,306 +0,0 @@
package info.bukova.isspst.security;
import org.springframework.ldap.core.DirContextOperations;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.support.LdapUtils;
import org.springframework.security.authentication.AccountExpiredException;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.CredentialsExpiredException;
import org.springframework.security.authentication.DisabledException;
import org.springframework.security.authentication.LockedException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.ldap.SpringSecurityLdapTemplate;
import org.springframework.security.ldap.authentication.AbstractLdapAuthenticationProvider;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import javax.naming.AuthenticationException;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.OperationNotSupportedException;
import javax.naming.directory.DirContext;
import javax.naming.directory.SearchControls;
import javax.naming.ldap.InitialLdapContext;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Hashtable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class AdAuthenticationProvider extends AbstractLdapAuthenticationProvider{
private static final Pattern SUB_ERROR_CODE = Pattern.compile(".*data\\s([0-9a-f]{3,4}).*");
// Error codes
private static final int USERNAME_NOT_FOUND = 0x525;
private static final int INVALID_PASSWORD = 0x52e;
private static final int NOT_PERMITTED = 0x530;
private static final int PASSWORD_EXPIRED = 0x532;
private static final int ACCOUNT_DISABLED = 0x533;
private static final int ACCOUNT_EXPIRED = 0x701;
private static final int PASSWORD_NEEDS_RESET = 0x773;
private static final int ACCOUNT_LOCKED = 0x775;
private final String domain;
private final String rootDn;
private final String url;
private final String upnSuffix;
private boolean convertSubErrorCodesToExceptions;
// Only used to allow tests to substitute a mock LdapContext
ContextFactory contextFactory = new ContextFactory();
/**
* @param domain the domain for which authentication should take place
*/
// public ActiveDirectoryLdapAuthenticationProvider(String domain) {
// this (domain, null);
// }
/**
* @param domain the domain name (may be null or empty)
* @param url an LDAP url (or multiple URLs)
*/
public AdAuthenticationProvider(String domain, String upnSuffix, String url) {
Assert.isTrue(StringUtils.hasText(url), "Url cannot be empty");
this.domain = StringUtils.hasText(domain) ? domain.toLowerCase() : null;
//this.url = StringUtils.hasText(url) ? url : null;
this.url = url;
this.upnSuffix = upnSuffix;
rootDn = this.domain == null ? null : rootDnFromDomain(this.domain);
}
@Override
protected DirContextOperations doAuthentication(UsernamePasswordAuthenticationToken auth) {
String username = auth.getName();
String password = (String)auth.getCredentials();
DirContext ctx = bindAsUser(username, password);
try {
return searchForUser(ctx, username);
} catch (NamingException e) {
logger.error("Failed to locate directory entry for authenticated user: " + username, e);
throw badCredentials();
} finally {
LdapUtils.closeContext(ctx);
}
}
/**
* Creates the user authority list from the values of the {@code memberOf} attribute obtained from the user's
* Active Directory entry.
*/
@Override
protected Collection<? extends GrantedAuthority> loadUserAuthorities(DirContextOperations userData, String username, String password) {
String[] groups = userData.getStringAttributes("memberOf");
if (groups == null) {
logger.debug("No values for 'memberOf' attribute.");
return AuthorityUtils.NO_AUTHORITIES;
}
if (logger.isDebugEnabled()) {
logger.debug("'memberOf' attribute values: " + Arrays.asList(groups));
}
ArrayList<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(groups.length);
for (String group : groups) {
authorities.add(new SimpleGrantedAuthority(new DistinguishedName(group).removeLast().getValue()));
}
return authorities;
}
private DirContext bindAsUser(String username, String password) {
// TODO. add DNS lookup based on domain
final String bindUrl = url;
Hashtable<String,String> env = new Hashtable<String,String>();
env.put(Context.SECURITY_AUTHENTICATION, "simple");
String bindPrincipal = createBindPrincipal(username);
env.put(Context.SECURITY_PRINCIPAL, bindPrincipal);
env.put(Context.PROVIDER_URL, bindUrl);
env.put(Context.SECURITY_CREDENTIALS, password);
env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
try {
return contextFactory.createContext(env);
} catch (NamingException e) {
if ((e instanceof AuthenticationException) || (e instanceof OperationNotSupportedException)) {
handleBindException(bindPrincipal, e);
throw badCredentials();
} else {
throw LdapUtils.convertLdapException(e);
}
}
}
void handleBindException(String bindPrincipal, NamingException exception) {
if (logger.isDebugEnabled()) {
logger.debug("Authentication for " + bindPrincipal + " failed:" + exception);
}
int subErrorCode = parseSubErrorCode(exception.getMessage());
if (subErrorCode > 0) {
logger.info("Active Directory authentication failed: " + subCodeToLogMessage(subErrorCode));
if (convertSubErrorCodesToExceptions) {
raiseExceptionForErrorCode(subErrorCode);
}
} else {
logger.debug("Failed to locate AD-specific sub-error code in message");
}
}
int parseSubErrorCode(String message) {
Matcher m = SUB_ERROR_CODE.matcher(message);
if (m.matches()) {
return Integer.parseInt(m.group(1), 16);
}
return -1;
}
void raiseExceptionForErrorCode(int code) {
switch (code) {
case PASSWORD_EXPIRED:
throw new CredentialsExpiredException(messages.getMessage("LdapAuthenticationProvider.credentialsExpired",
"User credentials have expired"));
case ACCOUNT_DISABLED:
throw new DisabledException(messages.getMessage("LdapAuthenticationProvider.disabled",
"User is disabled"));
case ACCOUNT_EXPIRED:
throw new AccountExpiredException(messages.getMessage("LdapAuthenticationProvider.expired",
"User account has expired"));
case ACCOUNT_LOCKED:
throw new LockedException(messages.getMessage("LdapAuthenticationProvider.locked",
"User account is locked"));
}
}
String subCodeToLogMessage(int code) {
switch (code) {
case USERNAME_NOT_FOUND:
return "User was not found in directory";
case INVALID_PASSWORD:
return "Supplied password was invalid";
case NOT_PERMITTED:
return "User not permitted to logon at this time";
case PASSWORD_EXPIRED:
return "Password has expired";
case ACCOUNT_DISABLED:
return "Account is disabled";
case ACCOUNT_EXPIRED:
return "Account expired";
case PASSWORD_NEEDS_RESET:
return "User must reset password";
case ACCOUNT_LOCKED:
return "Account locked";
}
return "Unknown (error code " + Integer.toHexString(code) +")";
}
private BadCredentialsException badCredentials() {
return new BadCredentialsException(messages.getMessage(
"LdapAuthenticationProvider.badCredentials", "Bad credentials"));
}
private DirContextOperations searchForUser(DirContext ctx, String username) throws NamingException {
SearchControls searchCtls = new SearchControls();
searchCtls.setSearchScope(SearchControls.SUBTREE_SCOPE);
String searchFilter = "(&(objectClass=user)(userPrincipalName={0}))";
final String bindPrincipal = createBindPrincipal(username);
final String searchDn = createSearchDn(username);
String searchRoot = rootDn != null ? rootDn : searchRootFromPrincipal(bindPrincipal);
DirContextOperations ctxOp;
try {
ctxOp = SpringSecurityLdapTemplate.searchForSingleEntryInternal(ctx, searchCtls, searchRoot, searchFilter,
new Object[]{searchDn});
if (ctxOp != null) {
return ctxOp;
}
} catch (Exception e) {
logger.warn("UPN " + searchDn + " not found. Falling back to search with domain UPN suffix.");
}
return SpringSecurityLdapTemplate.searchForSingleEntryInternal(ctx, searchCtls, searchRoot, searchFilter,
new Object[]{bindPrincipal});
}
private String searchRootFromPrincipal(String bindPrincipal) {
int atChar = bindPrincipal.lastIndexOf('@');
if (atChar < 0) {
logger.debug("User principal '" + bindPrincipal + "' does not contain the domain, and no domain has been configured");
throw badCredentials();
}
return rootDnFromDomain(bindPrincipal.substring(atChar+ 1, bindPrincipal.length()));
}
private String rootDnFromDomain(String domain) {
String[] tokens = StringUtils.tokenizeToStringArray(domain, ".");
StringBuilder root = new StringBuilder();
for (String token : tokens) {
if (root.length() > 0) {
root.append(',');
}
root.append("dc=").append(token);
}
return root.toString();
}
String createBindPrincipal(String username) {
if (domain == null || username.toLowerCase().endsWith(domain)) {
return username;
}
return username + "@" + domain;
}
String createSearchDn(String username) {
if (upnSuffix == null) {
return createBindPrincipal(username);
}
return username + "@" + upnSuffix;
}
/**
* By default, a failed authentication (LDAP error 49) will result in a {@code BadCredentialsException}.
* <p>
* If this property is set to {@code true}, the exception message from a failed bind attempt will be parsed
* for the AD-specific error code and a {@link CredentialsExpiredException}, {@link DisabledException},
* {@link AccountExpiredException} or {@link LockedException} will be thrown for the corresponding codes. All
* other codes will result in the default {@code BadCredentialsException}.
*
* @param convertSubErrorCodesToExceptions {@code true} to raise an exception based on the AD error code.
*/
public void setConvertSubErrorCodesToExceptions(boolean convertSubErrorCodesToExceptions) {
this.convertSubErrorCodesToExceptions = convertSubErrorCodesToExceptions;
}
static class ContextFactory {
DirContext createContext(Hashtable<?,?> env) throws NamingException {
return new InitialLdapContext(env, null);
}
}
}

@ -7,6 +7,16 @@ import info.bukova.isspst.data.UserSettingsData;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -14,14 +24,6 @@ import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class LoginSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler implements AuthenticationSuccessHandler {
@Autowired
@ -43,7 +45,6 @@ public class LoginSuccessHandler extends SavedRequestAwareAuthenticationSuccessH
logger.info("User " + u.getUsername() + " logged in");
sessionData.setUserCentres(workgroupService.getUserCentres((User) auth.getPrincipal()));
sessionData.setUserOnlyCentres(workgroupService.getUserCentres((User) auth.getPrincipal(), true));
sessionData.setUserWorkgroups(workgroupService.getUserWorkgroups((User) auth.getPrincipal()));
workgroupService.loadParents(u);
sessionData.setCurrentUser(u);

@ -38,8 +38,6 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
@Autowired
protected SessionData sessionData;
@Autowired
protected HqlDataFilter hqlFilter;
@Autowired
protected QueryDao queryDao;
private DocumentFileStorage documentFileStorage;
@ -90,50 +88,6 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
}
}
protected Query filterQuery(Query q) {
return filterQuery(q, null);
}
protected Query filterQuery(Query q, HqlDataFilter aditFilter) {
HqlDataFilter f = hqlFilter;
try {
if (((f.getWhere() == null || f.getWhere().isEmpty())
&& (f.getOrderBy() == null || f.getOrderBy().isEmpty()))
&& ((aditFilter.getWhere() == null || aditFilter.getWhere().isEmpty())
&& (aditFilter.getOrderBy() == null || aditFilter.getOrderBy().isEmpty()))) {
return q;
}
} catch (Exception e) {
f = new HqlDataFilter(); // pri volani mimo web request filtr z requestu neresime
}
boolean isAplicable = false;
if (f.getDataClass() != null) {
for (Class<?> clazz : getEntityClasses()) {
if (f.getDataClass().isAssignableFrom(clazz)) {
isAplicable = true;
}
}
}
String hql;
if (isAplicable) {
hql = HqlUtils.buildHql(q.getQueryString(), f);
} else {
hql = q.getQueryString();
}
hql = HqlUtils.addOrderBy(HqlUtils.addAndWhere(hql, aditFilter), aditFilter);
Query newQuery = dao.getQuery(hql);
if (isAplicable) {
HqlUtils.addParameters(newQuery, f);
}
HqlUtils.addParameters(newQuery, aditFilter);
return newQuery;
}
@Override
@PreAuthorize("hasPermission(this, 'PERM_ADD')")
public final T create() {
@ -246,9 +200,7 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
throw new ModuleNotActiveException();
}
Query q = dao.getQuery("from " + dao.getEntityName());
return filterQuery(q).list();
return dao.getAll();
}
@Override

@ -1,87 +0,0 @@
package info.bukova.isspst.services;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
/**
* @author Pepa Rokos
*/
public class HqlDataFilter {
private String where;
private String orderBy;
private Map<String, Object> params;
private Class<?> dataClass;
public HqlDataFilter() {
params = new HashMap<String, Object>();
}
public HqlDataFilter(String where) {
this();
this.where = where;
}
public HqlDataFilter(String where, String orderBy) {
this(where);
this.orderBy = orderBy;
}
public String getWhere() {
return where;
}
public void setWhere(String where) {
this.where = where;
}
public String getOrderBy() {
return orderBy;
}
public void setOrderBy(String orderBy) {
this.orderBy = orderBy;
}
public void setParam(String key, Object value) {
params.put(key, value);
}
public Object getParam(String key) {
return params.get(key);
}
public Set<String> getParamKeys() {
return params.keySet();
}
public void andFilter(String filter) {
if (where == null || where.isEmpty()) {
where = filter;
} else {
where += " and (" + filter + ")";
}
}
public void orFilter(String filter) {
if (where == null ||where.isEmpty()) {
where = filter;
} else {
where += " or (" + filter + ")";
}
}
public void reset() {
where = "";
orderBy = "";
params.clear();
}
public Class<?> getDataClass() {
return dataClass;
}
public void setDataClass(Class<?> dataClass) {
this.dataClass = dataClass;
}
}

@ -1,90 +0,0 @@
package info.bukova.isspst.services;
import org.hibernate.Query;
import java.util.Collection;
/**
* @author Pepa Rokos
*/
public class HqlUtils {
public static String buildHql(String select, HqlDataFilter filter) {
if (select.toLowerCase().contains("where")
|| select.toLowerCase().contains("order by")) {
throw new IsspstException("Use add*() methods instead.");
}
String hql = addWhere(select, filter, "");
return addOrderBy(hql, filter);
}
public static String addAndWhere(String hql, HqlDataFilter filter) {
if (!checkWhere(filter)) {
return hql;
}
return addWhere(hql, filter, "and");
}
public static String addOrWhere(String hql, HqlDataFilter filter) {
if (!checkWhere(filter)) {
return hql;
}
return addWhere(hql, filter, "or");
}
public static String addOrderBy(String hql, HqlDataFilter filter) {
if (filter == null || filter.getOrderBy() == null || filter.getOrderBy().isEmpty()) {
return hql;
}
if (!hql.contains("order by")) {
hql += " order by ";
}
hql += filter.getOrderBy();
return hql;
}
public static void addParameters(Query query, HqlDataFilter filter) {
if (filter == null) {
return;
}
for (String key : filter.getParamKeys()) {
if (filter.getParam(key) instanceof Collection<?>) {
query.setParameterList(key, (Collection) filter.getParam(key));
} else {
query.setParameter(key, filter.getParam(key));
}
}
}
private static boolean checkWhere(HqlDataFilter filter) {
return filter != null && filter.getWhere() != null && !filter.getWhere().isEmpty();
}
private static String addWhere(String hql, HqlDataFilter filter, String operator) {
if (hql.toLowerCase().contains("where") && hql.toLowerCase().contains("order by")) {
String[] split = hql.split("order by");
hql = split[0] + " " + operator + " (" + filter.getWhere() + ") order by " + split[1];
return hql;
}
if (hql.toLowerCase().contains("where")) {
hql += " " + operator + " (" + filter.getWhere() + ")";
return hql;
}
if (hql.toLowerCase().contains("order by")) {
String[] split = hql.split("order by");
hql = split[0] + " where (" + filter.getWhere() + ") order by " + split[1];
return hql;
}
hql += " where (" + filter.getWhere() + ")";
return hql;
}
}

@ -1,41 +1,17 @@
package info.bukova.isspst.services.dbinfo;
import info.bukova.isspst.Constants;
import info.bukova.isspst.dao.BaseDao;
import info.bukova.isspst.dao.RequirementDao;
import info.bukova.isspst.dao.TripBillApprovalDao;
import info.bukova.isspst.dao.TripRequirementDao;
import info.bukova.isspst.data.DbInfo;
import info.bukova.isspst.data.RequirementBase;
import info.bukova.isspst.data.RequirementState;
import info.bukova.isspst.services.AbstractService;
import info.bukova.isspst.services.requirement.RequirementBaseService;
import info.bukova.isspst.services.requirement.RequirementService;
import info.bukova.isspst.services.requirement.TripRequirementService;
import info.bukova.isspst.services.tripbill.TripBillApprovalService;
import org.hibernate.SQLQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import org.hibernate.SQLQuery;
import org.springframework.transaction.annotation.Transactional;
public class DbInfoServiceImpl extends AbstractService<DbInfo> implements DbInfoService
{
@Autowired
private TripBillApprovalService tripBillApprovalService;
@Autowired
private TripBillApprovalDao tripBillApprovalDao;
@Autowired
private TripRequirementService tripRequirement;
@Autowired
private TripRequirementDao tripRequirementDao;
@Autowired
private RequirementService requirementService;
@Autowired
private RequirementDao requirementDao;
private DbInfo getDbInfo()
{
DbInfo dbInfo = null;
@ -166,96 +142,10 @@ public class DbInfoServiceImpl extends AbstractService<DbInfo> implements DbInfo
sq.executeUpdate();
}
if (dbVersion > 0 && dbVersion < 6) {
sql = "INSERT INTO SEASON(DESCRIPTION, VALID_FROM, VALID_TO, ACTIVE) " +
"VALUES ('2015', '2015-01-01', '2015-12-31', 0)";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
sql = "INSERT INTO SEASON(DESCRIPTION, VALID_FROM, VALID_TO, ACTIVE) " +
"VALUES ('2016', '2016-01-01', NULL, 1)";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
sql = "UPDATE NUMBERSERIES SET SEASON_ID = 2";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
sql = "INSERT INTO NUMBERSERIES(MODULE, PREFIX, NUMBER, SEASON_ID) " +
"VALUES ('REQUIREMENTS', 'P', 2528, 1)";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
sql = "INSERT INTO NUMBERSERIES(MODULE, PREFIX, NUMBER, SEASON_ID) " +
"VALUES ('ORDER', 'OBJ', 55, 1)";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
// rozdeleni dat do sezon
sql = "UPDATE REQUIREMENT SET SEASON_ID = 2 WHERE NUMSER LIKE 'P16%'";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
sql = "UPDATE REQUIREMENT SET SEASON_ID = 1 WHERE NUMSER LIKE 'P0%'";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
sql = "UPDATE TRIPREQUIREMENT SET SEASON_ID = 2 WHERE NUMSER LIKE 'P16%'";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
sql = "UPDATE TRIPREQUIREMENT SET SEASON_ID = 1 WHERE NUMSER LIKE 'P0%'";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
sql = "UPDATE ORDERS SET SEASON_ID = 2 WHERE NUMSER LIKE 'OBJ16%'";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
sql = "UPDATE ORDERS SET SEASON_ID = 1 WHERE NUMSER LIKE 'OBJ0%'";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
sql = "UPDATE TRIP_BILL_APPROVAL SET SEASON_ID = 2 " +
" WHERE TRIPBILL_ID in " +
" (SELECT tb.ID FROM TRIP_BILL AS tb " +
" JOIN TRIPREQUIREMENT ON TRIPREQUIREMENT.ID = tb.REQUIREMENT_ID WHERE NUMSER LIKE 'P16%')";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
sql = "UPDATE TRIP_BILL_APPROVAL SET SEASON_ID = 1 " +
"WHERE TRIPBILL_ID in " +
"(SELECT tb.ID FROM TRIP_BILL AS tb " +
"JOIN TRIPREQUIREMENT ON TRIPREQUIREMENT.ID = tb.REQUIREMENT_ID WHERE NUMSER LIKE 'P0%')";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
sql = "UPDATE TRIP_BILL tb JOIN TRIPREQUIREMENT ON TRIPREQUIREMENT.ID = tb.REQUIREMENT_ID " +
"SET tb.SEASON_ID = 2 WHERE NUMSER LIKE 'P16%'";
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
sql = "UPDATE TRIP_BILL tb JOIN TRIPREQUIREMENT ON TRIPREQUIREMENT.ID = tb.REQUIREMENT_ID " +
"SET tb.SEASON_ID = 1 WHERE NUMSER LIKE 'P0%'";;
sq = dao.getSession().createSQLQuery(sql);
sq.executeUpdate();
}
if (dbVersion < 7) {
setApproveDate((RequirementBaseService)tripBillApprovalService, (BaseDao)tripBillApprovalDao);
setApproveDate((RequirementBaseService)tripRequirement, (BaseDao)tripRequirementDao);
setApproveDate((RequirementBaseService)requirementService, (BaseDao)requirementDao);
}
this.updateDatabaseVersion();
}
}
private void setApproveDate(RequirementBaseService<RequirementBase> service, BaseDao<RequirementBase> daoReq) {
for (RequirementBase req : service.getAll()) {
if (req.getState() == RequirementState.APPROVED) {
service.loadAuthItems(req);
req.setApproveDate(req.getLastApproveDate());
daoReq.modify(req);
}
}
}
@Override
@Transactional
public void updateDatabaseVersion()

@ -2,7 +2,6 @@ package info.bukova.isspst.services.invoicing;
import info.bukova.isspst.data.Invoicing;
import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.Season;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.services.Service;
@ -13,8 +12,6 @@ public interface InvoicingService extends Service<Invoicing> {
public BigDecimal totalInvoicedForWorkgroup(Workgroup workgroup);
public BigDecimal totalInvoicedForWorkgroupAndSeason(Workgroup workgroup, Season season);
public void loadReqItems(Invoicing invoicing);
public void loadItems(Invoicing invoicing);

@ -4,14 +4,11 @@ import info.bukova.isspst.Constants;
import info.bukova.isspst.data.Invoicing;
import info.bukova.isspst.data.InvoicingItem;
import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.Season;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.services.AbstractOwnedService;
import info.bukova.isspst.services.LazyLoader;
import info.bukova.isspst.services.settings.SeasonService;
import org.hibernate.Hibernate;
import org.hibernate.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
@ -21,23 +18,13 @@ import java.util.List;
public class InvoicingServiceImpl extends AbstractOwnedService<Invoicing> implements
InvoicingService {
@Autowired
private SeasonService seasonService;
@Override
@Transactional
public BigDecimal totalInvoicedForWorkgroup(Workgroup workgroup) {
return totalInvoicedForWorkgroupAndSeason(workgroup, seasonService.getActive());
}
@Override
@Transactional
public BigDecimal totalInvoicedForWorkgroupAndSeason(Workgroup workgroup, Season season) {
Query q = dao.getQuery("select sum(inv.totalInvoiced) "
+ "from Invoicing inv join inv.requirement rq join rq.workgroup w "
+ "where w = :workgroup and rq.season = :season");
+ "where w = :workgroup ");
q.setParameter("workgroup", workgroup);
q.setParameter("season", season);
return (BigDecimal) q.uniqueResult();
}
@ -59,14 +46,6 @@ public class InvoicingServiceImpl extends AbstractOwnedService<Invoicing> implem
invoicing.setItems(inv.getItems());
}
@Transactional
@LazyLoader
public void loadReqAuth(Invoicing invoicing) {
Invoicing inv = getById(invoicing.getId());
Hibernate.initialize(inv.getRequirement().getAuthorization());
invoicing.getRequirement().setAuthorization(inv.getRequirement().getAuthorization());
}
@Override
public void calculate(Invoicing invoicing) {
BigDecimal total = BigDecimal.ZERO;
@ -129,7 +108,7 @@ public class InvoicingServiceImpl extends AbstractOwnedService<Invoicing> implem
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_READ')")
public List<Invoicing> getMaterialPendingList() {
Query q = dao.getQuery("select inv from Invoicing as inv join fetch inv.requirement rq join fetch rq.ownedBy where (inv.completed Is Null or inv.completed = false) and (rq.kind = :kind) order by rq.numser desc");
Query q = dao.getQuery("select inv from Invoicing as inv join fetch inv.requirement rq join fetch rq.ownedBy where (inv.completed Is Null or inv.completed = false) and (rq.kind = :kind) order by rq.numser");
q.setParameter("kind", Constants.REQ_TYPE_MATERIAL);
return q.list();
}
@ -139,7 +118,7 @@ public class InvoicingServiceImpl extends AbstractOwnedService<Invoicing> implem
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_READ')")
public List<Invoicing> getMaterialArchiveList() {
Query q = dao.getQuery("select inv from Invoicing as inv join fetch inv.requirement rq join fetch rq.ownedBy where (inv.completed = true) and (rq.kind = :kind) order by rq.numser desc");
Query q = dao.getQuery("select inv from Invoicing as inv join fetch inv.requirement rq join fetch rq.ownedBy where (inv.completed = true) and (rq.kind = :kind) order by rq.numser");
q.setParameter("kind", Constants.REQ_TYPE_MATERIAL);
return q.list();
}
@ -149,7 +128,7 @@ public class InvoicingServiceImpl extends AbstractOwnedService<Invoicing> implem
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_READ')")
public List<Invoicing> getServicesPendingList() {
Query q = dao.getQuery("select inv from Invoicing as inv join fetch inv.requirement rq join fetch rq.ownedBy where (inv.completed Is Null or inv.completed = false) and (rq.kind = :kind) order by rq.numser desc");
Query q = dao.getQuery("select inv from Invoicing as inv join fetch inv.requirement rq join fetch rq.ownedBy where (inv.completed Is Null or inv.completed = false) and (rq.kind = :kind) order by rq.numser");
q.setParameter("kind", Constants.REQ_TYPE_SERVICES);
return q.list();
}
@ -159,7 +138,7 @@ public class InvoicingServiceImpl extends AbstractOwnedService<Invoicing> implem
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_READ')")
public List<Invoicing> getServicesArchiveList() {
Query q = dao.getQuery("select inv from Invoicing as inv join fetch inv.requirement rq join fetch rq.ownedBy where (inv.completed = true) and (rq.kind = :kind) order by rq.numser desc");
Query q = dao.getQuery("select inv from Invoicing as inv join fetch inv.requirement rq join fetch rq.ownedBy where (inv.completed = true) and (rq.kind = :kind) order by rq.numser");
q.setParameter("kind", Constants.REQ_TYPE_SERVICES);
return q.list();
}

@ -1,14 +0,0 @@
package info.bukova.isspst.services.limits;
import info.bukova.isspst.services.IsspstException;
/**
* @author Pepa Rokos
*/
public class LimitException extends IsspstException {
public LimitException(String reason) {
setReason(reason);
}
}

@ -1,17 +0,0 @@
package info.bukova.isspst.services.limits;
import info.bukova.isspst.data.Limit;
import info.bukova.isspst.data.Season;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.services.Service;
import java.util.List;
/**
* @author Pepa Rokos
*/
public interface LimitService extends Service<Limit> {
List<Limit> getForSeason(Season season);
Limit getForWorkgroupAndSeason(Workgroup wg, Season season);
Limit getForWorkgroup(Workgroup wg);
}

@ -1,62 +0,0 @@
package info.bukova.isspst.services.limits;
import info.bukova.isspst.data.Limit;
import info.bukova.isspst.data.Season;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.services.AbstractOwnedService;
import info.bukova.isspst.services.settings.SeasonService;
import org.hibernate.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* @author Pepa Rokos
*/
public class LimitServiceImpl extends AbstractOwnedService<Limit> implements LimitService {
@Autowired
private SeasonService seasonService;
@Override
@Transactional
public List<Limit> getForSeason(Season season) {
Query q = dao.getQuery("from Limit where season = :season");
q.setParameter("season", season);
return q.list();
}
@Override
@Transactional
public Limit getForWorkgroupAndSeason(Workgroup wg, Season season) {
Query q = dao.getQuery("from Limit where workgroup = :wg and season = :season");
q.setParameter("wg", wg);
q.setParameter("season", season);
return (Limit) q.uniqueResult();
}
@Override
@Transactional
public Limit getForWorkgroup(Workgroup wg) {
return getForWorkgroupAndSeason(wg, seasonService.getActive());
}
@Override
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_ADD')")
public void add(Limit entity) {
if (getForWorkgroupAndSeason(entity.getWorkgroup(),entity.getSeason()) != null) {
throw new LimitException("LimitExists");
}
super.add(entity);
}
@Override
protected Limit createEntity() {
Limit limit = new Limit();
limit.setSeason(seasonService.getActive());
return limit;
}
}

@ -1,18 +1,11 @@
package info.bukova.isspst.services.numberseries;
import info.bukova.isspst.data.NumberSeries;
import info.bukova.isspst.data.Season;
import info.bukova.isspst.services.Service;
import java.util.List;
public interface NumberSeriesService extends Service<NumberSeries>
{
public NumberSeries getNumberSerie(String module);
public NumberSeries getNumberSerieForSeason(String module, Season season);
public void increase(NumberSeries ns);
public List<NumberSeries> getSeriesForSeason(Season season);
}

@ -1,48 +1,24 @@
package info.bukova.isspst.services.numberseries;
import info.bukova.isspst.data.NumberSeries;
import info.bukova.isspst.data.Season;
import info.bukova.isspst.services.AbstractService;
import info.bukova.isspst.services.settings.SeasonService;
import org.hibernate.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
public class NumberSeriesServiceImpl extends AbstractService<NumberSeries> implements NumberSeriesService
{
@Autowired
private SeasonService seasonService;
@Transactional
@Override
public NumberSeries getNumberSerie(String module) {
return getNumberSerieForSeason(module, seasonService.getActive());
}
@Transactional
@Override
public NumberSeries getNumberSerieForSeason(String module, Season season) {
Query q = dao.getQuery("from NumberSeries where module = :m and season = :s");
q.setParameter("m", module);
q.setParameter("s", season);
return (NumberSeries) q.uniqueResult();
public NumberSeries getNumberSerie(String module)
{
return this.selectSingle("from NumberSeries where MODULE = '" + module + "'");
}
@Transactional
@Override
public void increase(NumberSeries ns) {
public void increase(NumberSeries ns)
{
ns.setNumber(ns.getNumber() + 1);
this.update(ns);
}
@Transactional
@Override
public List<NumberSeries> getSeriesForSeason(Season season) {
Query q = dao.getQuery("from NumberSeries where season = :s");
q.setParameter("s", season);
return q.list();
}
}

@ -10,16 +10,16 @@ import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.services.AbstractOwnedService;
import info.bukova.isspst.services.LazyLoader;
import info.bukova.isspst.services.settings.GlobalSettingsService;
import info.bukova.isspst.services.settings.SeasonService;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import org.hibernate.Hibernate;
import org.hibernate.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
public class OrderServiceImpl extends AbstractOwnedService<Order> implements
OrderService {
@ -29,9 +29,6 @@ public class OrderServiceImpl extends AbstractOwnedService<Order> implements
@Autowired
private RequirementItemDao requirementItemDao;
@Autowired
private SeasonService seasonService;
@Override
@PreAuthorize("hasPermission(this, 'PERM_ADD')")
public Order createOrder(List<JoinedItem> items) {
@ -49,7 +46,6 @@ public class OrderServiceImpl extends AbstractOwnedService<Order> implements
}
order.setTotal(total);
order.setSeason(seasonService.getActive());
return order;
}
@ -80,7 +76,7 @@ public class OrderServiceImpl extends AbstractOwnedService<Order> implements
public List<Order> getAll()
{
Query q = dao.getQuery("select o from Order o join fetch o.ownedBy");
return filterQuery(q).list();
return q.list();
}
@LazyLoader("form")

@ -3,14 +3,17 @@ package info.bukova.isspst.services.requirement;
import info.bukova.isspst.Constants;
import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.RequirementState;
import info.bukova.isspst.data.Workgroup;
import java.util.Date;
import java.util.List;
import org.hibernate.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PostFilter;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
public class ReqMaterialServiceImpl extends RequirementServiceImpl implements RequirementService, RequirementBaseService<Requirement>
{
@Autowired
@ -35,10 +38,10 @@ public class ReqMaterialServiceImpl extends RequirementServiceImpl implements Re
@PreAuthorize("hasPermission(this, 'PERM_READ')")
public List<Requirement> getMy()
{
hqlFilter.setDataClass(Requirement.class);
hqlFilter.andFilter("kind = :kind");
hqlFilter.setParam("kind", Constants.REQ_TYPE_MATERIAL);
return super.getMy();
Query q = dao.getQuery("from " + dao.getEntityName() + " where ownedBy = :owner and kind = :kind");
q.setParameter("owner", getLoggedInUser());
q.setParameter("kind", Constants.REQ_TYPE_MATERIAL);
return q.list();
}
@SuppressWarnings("unchecked")
@ -48,10 +51,11 @@ public class ReqMaterialServiceImpl extends RequirementServiceImpl implements Re
@PostFilter("hasPermission(filterObject, 'PERM_SHOW_CENTRE_REQ')")
public List<Requirement> getCentreReq()
{
hqlFilter.setDataClass(Requirement.class);
hqlFilter.andFilter("kind = :kind");
hqlFilter.setParam("kind", Constants.REQ_TYPE_MATERIAL);
return super.getCentreReq();
List<Workgroup> wgList = workgroupService.getUserCentres(getLoggedInUser());
Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.centre c where c in (:wgList) and kind = :kind order by tr.numser");
q.setParameterList("wgList", wgList);
q.setParameter("kind", Constants.REQ_TYPE_MATERIAL);
return q.list();
}
@SuppressWarnings("unchecked")
@ -61,10 +65,13 @@ public class ReqMaterialServiceImpl extends RequirementServiceImpl implements Re
@PostFilter("hasPermission(filterObject, 'PERM_SHOW_WORKGROUP_REQ')")
public List<Requirement> getWorkgroupReq()
{
hqlFilter.setDataClass(Requirement.class);
hqlFilter.andFilter("kind = :kind");
hqlFilter.setParam("kind", Constants.REQ_TYPE_MATERIAL);
return super.getWorkgroupReq();
List<Workgroup> wgList = workgroupService.getUserWorkgroups(getLoggedInUser());
Query q = dao.getQuery("select tr from "
+ dao.getEntityName()
+ " tr join fetch tr.ownedBy join tr.workgroup w where w in (:wgList) and kind = :kind order by tr.numser");
q.setParameterList("wgList", wgList);
q.setParameter("kind", Constants.REQ_TYPE_MATERIAL);
return q.list();
}
@SuppressWarnings("unchecked")
@ -73,9 +80,8 @@ public class ReqMaterialServiceImpl extends RequirementServiceImpl implements Re
@PreAuthorize("hasPermission(this, 'PERM_SHOW_ALL_REQ')")
public List<Requirement> getAll()
{
hqlFilter.setDataClass(Requirement.class);
hqlFilter.andFilter("kind = :kind");
hqlFilter.setParam("kind", Constants.REQ_TYPE_MATERIAL);
return super.getAll();
Query q = dao.getQuery("from " + dao.getEntityName() + " as tr join fetch tr.ownedBy where kind = :kind order by tr.numser");
q.setParameter("kind", Constants.REQ_TYPE_MATERIAL);
return q.list();
}
}

@ -3,14 +3,17 @@ package info.bukova.isspst.services.requirement;
import info.bukova.isspst.Constants;
import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.RequirementState;
import info.bukova.isspst.data.Workgroup;
import java.util.Date;
import java.util.List;
import org.hibernate.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PostFilter;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
public class ReqServicesServiceImpl extends RequirementServiceImpl implements RequirementService, RequirementBaseService<Requirement>
{
@Autowired
@ -35,10 +38,10 @@ public class ReqServicesServiceImpl extends RequirementServiceImpl implements Re
@PreAuthorize("hasPermission(this, 'PERM_READ')")
public List<Requirement> getMy()
{
hqlFilter.setDataClass(Requirement.class);
hqlFilter.andFilter("kind = :kind");
hqlFilter.setParam("kind", Constants.REQ_TYPE_SERVICES);
return super.getMy();
Query q = dao.getQuery("from " + dao.getEntityName() + " where ownedBy = :owner and kind = :kind");
q.setParameter("owner", getLoggedInUser());
q.setParameter("kind", Constants.REQ_TYPE_SERVICES);
return q.list();
}
@SuppressWarnings("unchecked")
@ -48,10 +51,11 @@ public class ReqServicesServiceImpl extends RequirementServiceImpl implements Re
@PostFilter("hasPermission(filterObject, 'PERM_SHOW_CENTRE_REQ')")
public List<Requirement> getCentreReq()
{
hqlFilter.setDataClass(Requirement.class);
hqlFilter.andFilter("kind = :kind");
hqlFilter.setParam("kind", Constants.REQ_TYPE_SERVICES);
return super.getCentreReq();
List<Workgroup> wgList = workgroupService.getUserCentres(getLoggedInUser());
Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.centre c where c in (:wgList) and kind = :kind order by tr.numser");
q.setParameterList("wgList", wgList);
q.setParameter("kind", Constants.REQ_TYPE_SERVICES);
return q.list();
}
@SuppressWarnings("unchecked")
@ -61,10 +65,13 @@ public class ReqServicesServiceImpl extends RequirementServiceImpl implements Re
@PostFilter("hasPermission(filterObject, 'PERM_SHOW_WORKGROUP_REQ')")
public List<Requirement> getWorkgroupReq()
{
hqlFilter.setDataClass(Requirement.class);
hqlFilter.andFilter("kind = :kind");
hqlFilter.setParam("kind", Constants.REQ_TYPE_SERVICES);
return super.getWorkgroupReq();
List<Workgroup> wgList = workgroupService.getUserWorkgroups(getLoggedInUser());
Query q = dao.getQuery("select tr from "
+ dao.getEntityName()
+ " tr join fetch tr.ownedBy join tr.workgroup w where w in (:wgList) and kind = :kind order by tr.numser");
q.setParameterList("wgList", wgList);
q.setParameter("kind", Constants.REQ_TYPE_SERVICES);
return q.list();
}
@SuppressWarnings("unchecked")
@ -73,9 +80,8 @@ public class ReqServicesServiceImpl extends RequirementServiceImpl implements Re
@PreAuthorize("hasPermission(this, 'PERM_SHOW_ALL_REQ')")
public List<Requirement> getAll()
{
hqlFilter.setDataClass(Requirement.class);
hqlFilter.andFilter("kind = :kind");
hqlFilter.setParam("kind", Constants.REQ_TYPE_SERVICES);
return super.getAll();
Query q = dao.getQuery("from " + dao.getEntityName() + " as tr join fetch tr.ownedBy where kind = :kind order by tr.numser");
q.setParameter("kind", Constants.REQ_TYPE_SERVICES);
return q.list();
}
}

@ -24,22 +24,17 @@ import info.bukova.isspst.reporting.ParamFiller;
import info.bukova.isspst.reporting.Report;
import info.bukova.isspst.reporting.ReportDefinition;
import info.bukova.isspst.services.AbstractOwnedService;
import info.bukova.isspst.services.HqlDataFilter;
import info.bukova.isspst.services.LazyLoader;
import info.bukova.isspst.services.Service;
import info.bukova.isspst.services.settings.GlobalSettingsService;
import info.bukova.isspst.services.settings.SeasonService;
import info.bukova.isspst.services.signeddocs.SignedDocumentService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.signapi.SignData;
import info.bukova.isspst.storage.FileStorage;
import info.bukova.isspst.storage.ReportFileStorage;
import info.bukova.isspst.storage.StorageException;
import org.hibernate.LazyInitializationException;
import org.hibernate.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PostFilter;
import org.springframework.security.access.prepost.PreAuthorize;
@ -87,11 +82,6 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
@Autowired
private ReportFileStorage signedDocStorage;
@Autowired
private SeasonService seasonService;
private final static Logger logger = LoggerFactory.getLogger(RequirementBaseServiceImpl.class);
@Override
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_ADD')")
@ -99,11 +89,7 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
Workgroup reqWorkgroup = null;
for (Workgroup w : workgroupService.getUserWorkgroups(getLoggedInUser())) {
if (workgroupService.getMembers(entity.getCentre()).contains(w)) {
for (Role r : workgroupService.getUserWorkgroupRoles(w, getLoggedInUser())) {
if (r.getAuthority().equals(Constants.ROLE_USER)) {
reqWorkgroup = w;
}
}
reqWorkgroup = w;
}
}
@ -115,8 +101,6 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
throw new AddRequirementException();
}
entity.setSeason(seasonService.getActive());
this.addWorkflow(entity);
entity.setNumser(this.getNumberSerie());
@ -289,7 +273,6 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
if (getNextWorkflow(e) == null) {
e.setState(RequirementState.APPROVED);
e.setApproveDate(approveDate);
} else {
e.setState(RequirementState.PARTIALLY);
}
@ -450,10 +433,9 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
@PreAuthorize("hasPermission(this, 'PERM_READ')")
public List<T> getMy()
{
Query q = dao.getQuery("from " + dao.getEntityName());
HqlDataFilter f = new HqlDataFilter("ownedBy = :owner");
f.setParam("owner", getLoggedInUser());
return filterQuery(q, f).list();
Query q = dao.getQuery("from " + dao.getEntityName() + " where ownedBy = :owner");
q.setParameter("owner", getLoggedInUser());
return q.list();
}
@SuppressWarnings("unchecked")
@ -464,10 +446,9 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
public List<T> getCentreReq()
{
List<Workgroup> wgList = workgroupService.getUserCentres(getLoggedInUser());
Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.centre c");
HqlDataFilter f = new HqlDataFilter("c in (:wgList)", "tr.numser desc");
f.setParam("wgList", wgList);
return filterQuery(q, f).list();
Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.centre c where c in (:wgList) order by tr.numser");
q.setParameterList("wgList", wgList);
return q.list();
}
@SuppressWarnings("unchecked")
@ -478,10 +459,9 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
public List<T> getWorkgroupReq()
{
List<Workgroup> wgList = workgroupService.getUserWorkgroups(getLoggedInUser());
Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.workgroup w");
HqlDataFilter f = new HqlDataFilter("w in (:wgList)", "tr.numser desc");
f.setParam("wgList", wgList);
return filterQuery(q, f).list();
Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.workgroup w where w in (:wgList) order by tr.numser");
q.setParameterList("wgList", wgList);
return q.list();
}
@SuppressWarnings("unchecked")
@ -490,9 +470,8 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
@PreAuthorize("hasPermission(this, 'PERM_SHOW_ALL_REQ')")
public List<T> getAll()
{
Query q = dao.getQuery("from " + dao.getEntityName() + " as tr join fetch tr.ownedBy");
HqlDataFilter f = new HqlDataFilter("", "tr.numser desc");
return filterQuery(q, f).list();
Query q = dao.getQuery("from " + dao.getEntityName() + " as tr join fetch tr.ownedBy order by tr.numser");
return q.list();
}
@Override
@ -586,14 +565,9 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
public void update(T entity) {
entity.getAuthorization().clear();
entity.setState(RequirementState.NEW);
super.update(entity);
try {
signedDocumentService.deleteForEntity(entity);
} catch (StorageException e) {
logger.warn(e.getMessage());
}
signedDocumentService.deleteForEntity(entity);
super.update(entity);
sendToApprovers(entity);
}
@ -601,12 +575,7 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_DELETE') or hasPermission(#entity, this.getDeleteEntityPermission())")
public void delete(T entity) {
signedDocumentService.delFromApprove(signedDocumentService.getForEntity(entity));
super.delete(entity);
try {
signedDocumentService.delFromApprove(signedDocumentService.getForEntity(entity));
} catch (StorageException e) {
logger.warn(e.getMessage());
}
}
}

@ -2,7 +2,6 @@ package info.bukova.isspst.services.requirement;
import info.bukova.isspst.Constants;
import info.bukova.isspst.data.Invoicing;
import info.bukova.isspst.data.Limit;
import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.RequirementItem;
import info.bukova.isspst.data.RequirementState;
@ -11,7 +10,6 @@ import info.bukova.isspst.data.User;
import info.bukova.isspst.data.Workflow;
import info.bukova.isspst.services.LazyLoader;
import info.bukova.isspst.services.invoicing.InvoicingService;
import info.bukova.isspst.services.limits.LimitService;
import org.hibernate.Hibernate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@ -35,8 +33,6 @@ public class RequirementServiceImpl extends RequirementBaseServiceImpl<Requireme
private RequirementTypeService reqTypeService;
@Autowired
private InvoicingService invoicingService;
@Autowired
private LimitService limitService;
@Override
protected Requirement createEntity()
@ -84,25 +80,26 @@ public class RequirementServiceImpl extends RequirementBaseServiceImpl<Requireme
@Override
protected boolean canAdd(Requirement entity)
{
if (entity.getWorkgroup() != null) {
Limit limit = limitService.getForWorkgroup(entity.getWorkgroup());
if (limit == null) {
return true;
}
if (entity.getWorkgroup() != null && entity.getWorkgroup().getLimit() != null && entity.getWorkgroup().getLimit().compareTo(BigDecimal.ZERO) != 0)
{
BigDecimal total = invoicingService.totalInvoicedForWorkgroup(entity.getWorkgroup());
if (total == null) {
if (total == null)
{
total = BigDecimal.ZERO;
}
total = total.add(entity.getSumTotal());
if (total.compareTo(limit.getLimit()) <= 0) {
if (total.compareTo(entity.getWorkgroup().getLimit()) <= 0)
{
return true;
}
}
else {
else
{
return true;
}

@ -1,18 +0,0 @@
package info.bukova.isspst.services.settings;
import info.bukova.isspst.services.IsspstException;
/**
* @author Pepa Rokos
*/
public class SeasonException extends IsspstException {
SeasonException() {
super();
}
SeasonException(String msg) {
super(msg);
setReason(msg);
}
}

@ -1,16 +0,0 @@
package info.bukova.isspst.services.settings;
import info.bukova.isspst.data.Season;
import info.bukova.isspst.services.Service;
import java.util.List;
/**
* @author Pepa Rokos
*/
public interface SeasonService extends Service<Season> {
Season addSeason();
Season getActive();
List<Season> getAllSeasons();
void setActive(Season season);
}

@ -1,100 +0,0 @@
package info.bukova.isspst.services.settings;
import info.bukova.isspst.StringUtils;
import info.bukova.isspst.data.NumberSeries;
import info.bukova.isspst.data.Season;
import info.bukova.isspst.services.AbstractOwnedService;
import info.bukova.isspst.services.numberseries.NumberSeriesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
/**
* @author Pepa Rokos
*/
public class SeasonServiceImpl extends AbstractOwnedService<Season> implements SeasonService {
private Season activeSeason;
@Autowired
private NumberSeriesService numberSeriesService;
@Transactional
@Override
public Season addSeason() {
Season season = new Season();
season.setDescription(StringUtils.localize("SeasonsNewSeason"));
season.setValidFrom(new Date());
season.setActive(true);
Season last = selectSingle("from Season where validTo Is Null");
add(season);
last.setValidTo(new Date());
last.setActive(false);
update(last);
activeSeason = null;
List<NumberSeries> numSeries = numberSeriesService.getSeriesForSeason(last);
for (NumberSeries ns: numSeries) {
String txt = ns.getPrefix().replaceAll("[0-9]+", "");
String numTxt = ns.getPrefix().replaceAll("[a-zA-Z]+", "");
int num = 0;
try {
num = Integer.valueOf(numTxt);
} catch (Exception e) {
e.printStackTrace();
}
String newPrefix = txt + String.valueOf(num + 1);
NumberSeries newNumSer = new NumberSeries();
newNumSer.setPrefix(newPrefix);
newNumSer.setModule(ns.getModule());
newNumSer.setNumber(1);
newNumSer.setSeason(season);
numberSeriesService.add(newNumSer);
}
return season;
}
@Transactional
@Override
public Season getActive() {
if (activeSeason == null) {
activeSeason = selectSingle("from Season where active = true");
}
if (activeSeason == null) {
throw new SeasonException("Active_season_not_set");
}
return activeSeason;
}
@Override
@Transactional
public List<Season> getAllSeasons() {
return getAll();
}
@Transactional
@Override
public void setActive(Season season) {
for (Season s: getAll()) {
s.setActive(false);
update(s);
}
Season s = dao.getById(season.getId());
if (s == null) {
throw new SeasonException("Season_not_in_database");
}
s.setActive(true);
activeSeason = s;
}
}

@ -1,13 +1,9 @@
package info.bukova.isspst.services.signeddocs;
import info.bukova.isspst.data.DataModel;
import info.bukova.isspst.data.Member;
import info.bukova.isspst.data.SignedDocument;
import info.bukova.isspst.data.SignedDocumentItem;
import info.bukova.isspst.services.Service;
import info.bukova.isspst.ui.signeddocs.SignedDocsTreeNode;
import org.zkoss.zul.TreeModel;
import org.zkoss.zul.TreeNode;
import java.util.List;
@ -21,5 +17,4 @@ public interface SignedDocumentService extends Service<SignedDocument> {
public List<SignedDocument> getActualList();
public List<SignedDocument> getArchiveList();
public TreeModel<TreeNode<SignedDocumentItem>> getTree();
}

@ -4,239 +4,126 @@ import info.bukova.isspst.DateTimeUtils;
import info.bukova.isspst.Module;
import info.bukova.isspst.ModuleUtils;
import info.bukova.isspst.data.DataModel;
import info.bukova.isspst.data.Member;
import info.bukova.isspst.data.SignedDocument;
import info.bukova.isspst.data.SignedDocumentItem;
import info.bukova.isspst.services.AbstractOwnedService;
import info.bukova.isspst.services.LazyLoader;
import info.bukova.isspst.storage.ReportFileStorage;
import java.util.*;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import javax.servlet.ServletContext;
import info.bukova.isspst.ui.signeddocs.SignedDocsTreeNode;
import org.hibernate.Hibernate;
import org.hibernate.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.zkoss.zul.DefaultTreeModel;
import org.zkoss.zul.DefaultTreeNode;
import org.zkoss.zul.TreeModel;
import org.zkoss.zul.TreeNode;
public class SignedDocumentServiceImpl extends AbstractOwnedService<SignedDocument> implements SignedDocumentService {
@Autowired
private ServletContext servletContext;
@Autowired
private ReportFileStorage signedDocStorage;
@LazyLoader("grid")
@Transactional
public void lazyLoadItems(SignedDocument signedDocument) {
if (signedDocument == null) {
return;
}
SignedDocument sd = dao.getById(signedDocument.getId());
Hibernate.initialize(sd.getItems());
signedDocument.setItems(sd.getItems());
}
@Override
@Transactional
public SignedDocument getForEntity(DataModel entity) {
Module module = ModuleUtils.getModule(entity, servletContext);
if (module == null) {
return null;
}
Query q = dao.getQuery("from SignedDocument where moduleName = :module and recordId = :record");
q.setParameter("module", module.getId());
q.setParameter("record", entity.getId());
return (SignedDocument) q.uniqueResult();
}
@Override
@Transactional
public SignedDocumentItem getItem(DataModel entity, long reportId) {
SignedDocument doc = getForEntity(entity);
if (doc == null) {
return null;
}
for (SignedDocumentItem item : doc.getItems()) {
if (item.getReportId() == reportId) {
return item;
}
}
return null;
}
@Override
public void addFromApprove(SignedDocument document) {
super.add(document);
}
@Override
public void delFromApprove(SignedDocument document) {
if (document == null) {
return;
}
super.delete(document);
for (SignedDocumentItem item : document.getItems()) {
signedDocStorage.removeFile(item);
}
}
@Override
@Transactional
public void deleteForEntity(DataModel entity) {
SignedDocument doc = getForEntity(entity);
if (doc != null) {
delFromApprove(doc);
}
}
private Date getTresholdDate() {
Date date = DateTimeUtils.getDateDelta(DateTimeUtils.getCurrDate(), Calendar.MONTH, -6);
return date;
}
@SuppressWarnings("unchecked")
@Override
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_READ')")
public List<SignedDocument> getActualList() {
Query q = dao.getQuery("from SignedDocument where signDate >= :refDate");
q.setParameter("refDate", this.getTresholdDate());
return q.list();
}
@SuppressWarnings("unchecked")
@Override
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_READ')")
public List<SignedDocument> getArchiveList() {
Query q = dao.getQuery("from SignedDocument where signDate < :refDate");
q.setParameter("refDate", this.getTresholdDate());
return q.list();
}
@SuppressWarnings("unchecked")
@Override
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_READ')")
public TreeModel<TreeNode<SignedDocumentItem>> getTree() {
Query q = queryDao.getQuery("select item "
+ "from SignedDocumentItem as item left join item.signedDocument as rec "
+ "order by rec.moduleName, rec.signDate desc, item.reportName, item.fileName "
);
List<SignedDocumentItem> list = q.list();
SignedDocumentItem lastItem = null;
SignedDocument lastRec = null;
List<SignedDocsTreeNode> agendaNameList = new LinkedList<SignedDocsTreeNode>();
List<SignedDocsTreeNode> signYearList = new LinkedList<SignedDocsTreeNode>();
List<SignedDocsTreeNode> signDateList = new LinkedList<SignedDocsTreeNode>();
List<SignedDocsTreeNode> filesList = null;
int documentsCount = list.size() - 1;
for (int i = 0; i <= documentsCount; i++) {
SignedDocumentItem item = list.get(i);
SignedDocument rec = item.getSignedDocument();
SignedDocsTreeNode itemNode = new SignedDocsTreeNode(item);
boolean isChangedAgendaName = ((i == 0)
|| (i == documentsCount)
|| !lastRec.getAgendaName().equals(rec.getAgendaName())
);
boolean isChangedSignYear = ((i == 0)
|| (i == documentsCount)
|| isChangedAgendaName
|| !DateTimeUtils.isEqualByYear(lastRec.getSignDate(), rec.getSignDate())
);
boolean isChangedSignDate = ((i == 0)
|| (i == documentsCount)
|| isChangedSignYear
|| !DateTimeUtils.isEqualByDate(lastRec.getSignDate(), rec.getSignDate())
);
if (isChangedAgendaName || isChangedSignYear || isChangedSignDate) {
if (isChangedSignDate) {
if (i > 0) {
SignedDocsTreeNode signDateNode = new SignedDocsTreeNode((i == documentsCount ? item : lastItem), filesList);
signDateList.add(signDateNode);
}
filesList = new LinkedList<SignedDocsTreeNode>();
filesList.add(itemNode);
}
if (isChangedSignYear) {
if (i > 0) {
SignedDocsTreeNode signYearNode = new SignedDocsTreeNode((i == documentsCount ? item : lastItem), signDateList);
signYearList.add(signYearNode);
}
signDateList = new LinkedList<SignedDocsTreeNode>();
}
if (isChangedAgendaName) {
if (i > 0) {
SignedDocsTreeNode agendaNode = new SignedDocsTreeNode((i == documentsCount ? item : lastItem), signYearList);
agendaNameList.add(agendaNode);
}
signYearList = new LinkedList<SignedDocsTreeNode>();
}
} else {
filesList.add(itemNode);
}
lastItem = item;
lastRec = lastItem.getSignedDocument();
}
Collections.sort(agendaNameList, new Comparator<SignedDocsTreeNode>() {
@Override
public int compare(SignedDocsTreeNode nodeL, SignedDocsTreeNode nodeR) {
if ((nodeL != null) && (nodeR != null)) {
SignedDocumentItem itemL = nodeL.getData();
SignedDocumentItem itemR = nodeR.getData();
if ((itemL != null) && (itemR != null)) {
SignedDocument recL = itemL.getSignedDocument();
SignedDocument recR = itemR.getSignedDocument();
if ((recL != null) && (recR != null)) {
String nameL = recL.getAgendaName();
String nameR = recR.getAgendaName();
if ((nameL != null) && (nameR != null)) {
return nameL.compareTo(nameR);
}
}
}
}
return 0;
}
}
);
SignedDocsTreeNode root = new SignedDocsTreeNode(null, agendaNameList);
TreeModel<TreeNode<SignedDocumentItem>> tree = new DefaultTreeModel<SignedDocumentItem>(root);
return tree;
}
@Autowired
private ServletContext servletContext;
@Autowired
private ReportFileStorage signedDocStorage;
@LazyLoader("grid")
@Transactional
public void lazyLoadItems(SignedDocument signedDocument) {
if (signedDocument == null) {
return;
}
SignedDocument sd = dao.getById(signedDocument.getId());
Hibernate.initialize(sd.getItems());
signedDocument.setItems(sd.getItems());
}
@Override
@Transactional
public SignedDocument getForEntity(DataModel entity) {
Module module = ModuleUtils.getModule(entity, servletContext);
if (module == null) {
return null;
}
Query q = dao.getQuery("from SignedDocument where moduleName = :module and recordId = :record");
q.setParameter("module", module.getId());
q.setParameter("record", entity.getId());
return (SignedDocument) q.uniqueResult();
}
@Override
@Transactional
public SignedDocumentItem getItem(DataModel entity, long reportId) {
SignedDocument doc = getForEntity(entity);
if (doc == null) {
return null;
}
for (SignedDocumentItem item : doc.getItems()) {
if (item.getReportId() == reportId) {
return item;
}
}
return null;
}
@Override
public void addFromApprove(SignedDocument document) {
super.add(document);
}
@Override
public void delFromApprove(SignedDocument document) {
if (document == null) {
return;
}
super.delete(document);
for (SignedDocumentItem item : document.getItems()) {
signedDocStorage.removeFile(item);
}
}
@Override
@Transactional
public void deleteForEntity(DataModel entity) {
SignedDocument doc = getForEntity(entity);
if (doc != null) {
delFromApprove(doc);
}
}
private Date getTresholdDate() {
Date date = DateTimeUtils.getDateDelta(DateTimeUtils.getCurrDate(), Calendar.YEAR, -1);
return date;
}
@SuppressWarnings("unchecked")
@Override
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_READ')")
public List<SignedDocument> getActualList() {
Query q = dao.getQuery("from SignedDocument where signDate >= :refDate");
q.setParameter("refDate", this.getTresholdDate());
return q.list();
}
@SuppressWarnings("unchecked")
@Override
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_READ')")
public List<SignedDocument> getArchiveList() {
Query q = dao.getQuery("from SignedDocument where signDate < :refDate");
q.setParameter("refDate", this.getTresholdDate());
return q.list();
}
}

@ -8,22 +8,16 @@ import info.bukova.isspst.data.DataModel;
import info.bukova.isspst.data.RequirementState;
import info.bukova.isspst.data.TripBill;
import info.bukova.isspst.data.TripBillApproval;
import info.bukova.isspst.reporting.Report;
import info.bukova.isspst.services.IsspstException;
import info.bukova.isspst.services.requirement.RequirementBaseServiceImpl;
import info.bukova.isspst.services.requirement.RequirementTypeService;
import info.bukova.isspst.services.signeddocs.SignedDocumentService;
import info.bukova.isspst.storage.StorageException;
import org.hibernate.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @author Pepa Rokos
@ -37,8 +31,6 @@ public class TripBillApprovalServiceImpl extends RequirementBaseServiceImpl<Trip
@Autowired
private SignedDocumentService signedDocumentService;
private final static Logger logger = LoggerFactory.getLogger(TripBillApproval.class);
@Override
public TripBillApproval createApproval(TripBill bill) {
if (bill.getApproval() != null) {
@ -48,7 +40,6 @@ public class TripBillApprovalServiceImpl extends RequirementBaseServiceImpl<Trip
TripBillApproval approval = new TripBillApproval();
approval.setCentre(bill.getRequirement().getCentre());
approval.setWorkgroup(bill.getRequirement().getWorkgroup());
approval.setSeason(bill.getSeason());
approval.setReqDate(new Date());
approval.setType(reqTypeService.getTypeById(Constants.REQTYPE_BUSINESSTRIP));
approval.setState(RequirementState.NEW);
@ -80,24 +71,9 @@ public class TripBillApprovalServiceImpl extends RequirementBaseServiceImpl<Trip
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_DELETE') or this.canApprove(#bill.approval)")
public void cancelApproval(TripBill bill) {
TripBillApproval approval = bill.getApproval();
if (approval != null) {
super.delete(approval);
}
removeApproval(bill);
}
private void removeApproval(TripBill bill) {
bill.setApproval(null);
signedDocumentService.deleteForEntity(bill);
tripBillService.update(bill);
try {
signedDocumentService.deleteForEntity(bill);
} catch (StorageException e) {
logger.warn(e.getMessage());
}
}
@Override
@ -119,19 +95,9 @@ public class TripBillApprovalServiceImpl extends RequirementBaseServiceImpl<Trip
if (bill != null) {
dao.delete(entity);
removeApproval(bill);
cancelApproval(bill);
} else {
super.delete(entity);
}
}
@Override
public List<Report> getReports() {
List<Report> reports = new ArrayList<Report>();
reports.add(new Report(Constants.TRIB_BILLS_REP_ID, false, "Přehled vyúčtovaných CP", "tripBills"));
reports.add(new Report(Constants.TRIB_BILLS_NP_REP_ID, false, "Přehled nevyúčtovaných CP", "tripBillsNP"));
return reports;
}
}

@ -6,7 +6,6 @@ import info.bukova.isspst.data.TripBill;
import info.bukova.isspst.data.TripBillItem;
import info.bukova.isspst.data.TripRequirement;
import info.bukova.isspst.services.AbstractOwnedService;
import info.bukova.isspst.services.HqlDataFilter;
import info.bukova.isspst.services.LazyLoader;
import info.bukova.isspst.services.settings.GlobalSettingsService;
import org.hibernate.Hibernate;
@ -47,7 +46,6 @@ public class TripBillServiceImpl extends AbstractOwnedService<TripBill> implemen
TripBill bill = new TripBill();
bill.setRequirement(requirement);
bill.setSeason(requirement.getSeason());
if (!passengers) {
bill.setDownPayment(requirement.getDownPayment());
@ -135,7 +133,7 @@ public class TripBillServiceImpl extends AbstractOwnedService<TripBill> implemen
}
if (item.getBackDeparture() == null) {
timeBack = (new LocalTime()).withHourOfDay(23).withMinuteOfHour(00);
timeBack = (new LocalTime()).withHourOfDay(23).withMinuteOfHour(59);
allDay = true;
} else {
timeBack = new LocalTime(item.getBackDeparture());
@ -181,10 +179,9 @@ public class TripBillServiceImpl extends AbstractOwnedService<TripBill> implemen
@Transactional
@PreAuthorize("hasPermission(this, 'PERM_READ')")
public List<TripBill> getMy() {
Query q = dao.getQuery("from TripBill");
HqlDataFilter f = new HqlDataFilter("ownedBy = :owner");
f.setParam("owner", getLoggedInUser());
return filterQuery(q, f).list();
Query q = dao.getQuery("from TripBill where ownedBy = :owner");
q.setParameter("owner", getLoggedInUser());
return q.list();
}
@Override

@ -1,5 +1,7 @@
package info.bukova.isspst.services.workgroups;
import java.util.List;
import info.bukova.isspst.data.JobMapping;
import info.bukova.isspst.data.Member;
import info.bukova.isspst.data.Role;
@ -7,8 +9,6 @@ import info.bukova.isspst.data.User;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.services.Service;
import java.util.List;
public interface WorkgroupService extends Service<Workgroup> {
public void addMember(Workgroup workgroup, Member member, Role role);
@ -17,7 +17,6 @@ public interface WorkgroupService extends Service<Workgroup> {
public List<Workgroup> getCentres();
public boolean isMember(Workgroup workgroup, Member member);
public List<Workgroup> getUserCentres(User user);
public List<Workgroup> getUserCentres(User user, boolean userOnly);
public List<Workgroup> getUserWorkgroups(User user);
public List<Role> getUserWorkgroupRoles(Workgroup workgroup, User user);
public List<Member> getMembers(Workgroup workgroup);

@ -8,14 +8,15 @@ import info.bukova.isspst.data.User;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.services.AbstractOwnedService;
import info.bukova.isspst.services.LazyLoader;
import java.util.ArrayList;
import java.util.List;
import org.hibernate.LazyInitializationException;
import org.hibernate.Query;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
public class WorkgroupServiceImpl extends AbstractOwnedService<Workgroup> implements WorkgroupService {
@Override
@ -124,7 +125,7 @@ public class WorkgroupServiceImpl extends AbstractOwnedService<Workgroup> implem
@Override
@Transactional
public List<Workgroup> getUserCentres(User user) {
/*if (user.equals(getLoggedInUser()) && sessionData.getUserCentres() != null) {
if (user.equals(getLoggedInUser()) && sessionData.getUserCentres() != null) {
return sessionData.getUserCentres();
}
@ -149,75 +150,6 @@ public class WorkgroupServiceImpl extends AbstractOwnedService<Workgroup> implem
}
}
}
return centres;*/
return getUserCentres(user, false);
}
@Override
@Transactional
public List<Workgroup> getUserCentres(User user, boolean userOnly) {
if (!userOnly && user.equals(getLoggedInUser()) && sessionData.getUserCentres() != null) {
return sessionData.getUserCentres();
}
if (userOnly && user.equals(getLoggedInUser()) && sessionData.getUserOnlyCentres() != null) {
return sessionData.getUserOnlyCentres();
}
List<Workgroup> parents;
if (userOnly) {
parents = filterUserOnly(user, getParents(user));
} else {
parents = getParents(user);
}
if (parents == null) {
return null;
}
List<Workgroup> centres = new ArrayList<Workgroup>();
for (Workgroup w : parents) {
if (w.isCentre()) {
centres.add(w);
}
}
List<Workgroup> workGroups;
if (userOnly) {
workGroups = filterUserOnly(user, getUserWorkgroups(user));
} else {
workGroups = getUserWorkgroups(user);
}
for (Workgroup w : workGroups) {
loadParents(w);
for (Workgroup centre : w.getParents()) {
if (!centres.contains(centre)) {
centres.add(centre);
}
}
}
return centres;
}
private List<Workgroup> filterUserOnly(User user, List<Workgroup> wgList) {
List<Workgroup> centres = new ArrayList<Workgroup>();
for (Workgroup wg : wgList) {
List<Role> roles = getUserWorkgroupRoles(wg, user);
if (roles == null) {
continue;
}
for (Role r : roles) {
if (r.getAuthority().equals(Constants.ROLE_USER)) {
centres.add(wg);
}
}
}
return centres;
}

@ -1,170 +1,13 @@
package info.bukova.isspst.sort;
import info.bukova.isspst.StringUtils;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.Row;
import org.zkoss.zk.au.AuRequest;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.*;
import org.zkoss.zul.*;
import java.io.ByteArrayOutputStream;
import java.util.List;
import org.zkoss.zul.Listheader;
@SuppressWarnings("serial")
public class CzechSortListheader extends Listheader {
static {
addClientEvent(CzechSortListheader.class, Events.ON_RIGHT_CLICK, CE_IMPORTANT | CE_NON_DEFERRABLE);
}
public void onRightClick() {
Menupopup popup = new Menupopup();
popup.setPage(this.getPage());
popup.setWidth("250px");
this.setContext(popup);
Menuitem item = new Menuitem();
item.setLabel(StringUtils.localize("ExportToExcel"));
item.setImage("/img/excel-032.png");
item.setParent(popup);
item.addEventListener(Events.ON_CLICK, new EventListener() {
@Override
public void onEvent(org.zkoss.zk.ui.event.Event event) throws Exception {
Listbox listBox = getListbox();
if (listBox != null) {
HSSFWorkbook workBook = new HSSFWorkbook();
HSSFSheet workSheet = workBook.createSheet("export");
int rowNumber = 0;
Row excelRow = null;
Cell excelCell = null;
HSSFCellStyle cellStyle = workBook.createCellStyle();
HSSFFont defaultFont = cellStyle.getFont(workBook);
HSSFCellStyle cellStyleNumber = workBook.createCellStyle();
cellStyleNumber.setAlignment(CellStyle.ALIGN_RIGHT);
//http://www.roseindia.net/java/poi/setdataformat.shtml
//HSSFDataFormat dataNumberFormat = workBook.createDataFormat();
//cellStyleNumber.setDataFormat(dataNumberFormat.getFormat("# ##0,00"));
cellStyleNumber.setDataFormat((short)4);
HSSFCellStyle cellStyleDate = workBook.createCellStyle();
cellStyleDate.setAlignment(CellStyle.ALIGN_RIGHT);
//http://www.roseindia.net/java/poi/setdataformat.shtml
HSSFDataFormat dataDateFormat = workBook.createDataFormat();
cellStyleDate.setDataFormat(dataDateFormat.getFormat("DD. MM. YYYY"));
//cellStyleDate.setDataFormat((short) 15);
int totalCols = 0;
Listhead listHead = listBox.getListhead();
if (listHead != null) {
HSSFCellStyle cellStyleHeader = workBook.createCellStyle();
cellStyleHeader.setAlignment(CellStyle.ALIGN_CENTER);
HSSFFont font = workBook.createFont();
font.setFontName(defaultFont.getFontName());
font.setFontHeightInPoints(defaultFont.getFontHeightInPoints());
font.setBold(true);
cellStyleHeader.setFont(font);
excelRow = workSheet.createRow(rowNumber++);
List<Listheader> headerList = listHead.getChildren();
totalCols = headerList.size();
for (int i = 0; i < totalCols; i++) {
Listheader listHeader = headerList.get(i);
String label = listHeader.getLabel();
excelCell = excelRow.createCell(i);
excelCell.setCellStyle(cellStyleHeader);
excelCell.setCellValue(label);
}
}
List<Listitem> itemList = listBox.getItems();
for (int i = 0; i < itemList.size(); i++) {
Listitem item = itemList.get(i);
excelRow = workSheet.createRow(rowNumber++);
List<Listcell> cellList = item.getChildren();
for (int k=0; k < cellList.size(); k++) {
Listcell cell = cellList.get(k);
String label = cell.getLabel();
HSSFCellStyle cellStyleActual = cellStyle;
excelCell = excelRow.createCell(k);
if (label != null) {
if (label.isEmpty()) {
//List<Component> componentList = cell.getChildren();
Component component = cell.getFirstChild();
if (component != null) {
if (component instanceof Textbox) {
Textbox textBox = (Textbox) component;
label = textBox.getValue();
}
else if (component instanceof Button) {
Button button = (Button) component;
label = button.getLabel();
}
}
}
if (label.matches("^[+-]?[0-9]{1,3}(,?[0-9]{3})*(\\.[0-9]+)?$")) {
// english number -1,234.56 (change browser language)
label = label.replace(",", " ");
label = label.replace(".", ",");
}
if (label.matches("^[+-]?[0-9]{1,3}([ \\xA0][0-9]{3})*([,][0-9]+)?$")) {
// czech number -1 234,56
cellStyleActual = cellStyleNumber;
}
else if (label.matches("[0-9]{1,2}[.][ \\xA0]?[0-9]{1,2}[.][ \\xA0]?[0-9]{4}")) {
// czech date
cellStyleActual = cellStyleDate;
}
}
excelCell.setCellStyle(cellStyleActual);
excelCell.setCellValue(label);
}
}
for (int i = 0; i < totalCols; i++) {
//int width = workSheet.getColumnWidth(i);
workSheet.autoSizeColumn(i);
int width = workSheet.getColumnWidth(i);
int maxWidth = 8000;
if (width > maxWidth) {
workSheet.setColumnWidth(i, maxWidth);
}
}
ByteArrayOutputStream os = new ByteArrayOutputStream();
workBook.write(os);
Filedownload.save(os.toByteArray(), "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "temp" + Long.toString(System.nanoTime()) + ".xlsx");
// //Filedownload.save(tempFile, "application/vnd.ms-excel");
}
}
});
}
@Override
public void service(AuRequest request, boolean everError) {
super.service(request, everError);
}
@Override
public void setSort(String type) {
if (type.startsWith("czech"))
{
// czech(propertyName)
@ -178,4 +21,5 @@ public class CzechSortListheader extends Listheader {
super.setSort(type);
}
}
}

@ -44,11 +44,6 @@ public class DocumentFileStorageImpl extends AbstractFileStorage<FileMetainfo> i
this.rootPath = rootPath;
}
@Override
public String getRootPath() {
return this.rootPath;
}
@Override
public void saveFile(byte[] data, FileMetainfo fileID) {
String fileName = generateFileName(fileID.getFileName());

@ -9,7 +9,7 @@ import java.io.File;
*/
public interface FileStorage<T> {
public String getRootPath();
// public String getRootPath();
public void saveFile(byte[] data, T fileID);
public void saveFile(File file, T fileId);
public void removeFile(T fileID);

@ -12,11 +12,6 @@ public class LocalFileStorage extends AbstractFileStorage<String> {
this.rootPath = rootPath;
}
@Override
public String getRootPath() {
return this.rootPath;
}
public void setContext(ServletContext ctx) {
this.context = ctx;
}

@ -16,11 +16,6 @@ public class ReportFileStorageImpl extends AbstractFileStorage<SignedDocumentIte
this.rootPath = rootPath;
}
@Override
public String getRootPath() {
return this.rootPath;
}
private String getFilePath(String fileName) {
return rootPath + "/" + fileName;
}

@ -1,69 +0,0 @@
package info.bukova.isspst.ui;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.zkoss.bind.BindContext;
import org.zkoss.bind.Converter;
import org.zkoss.util.Locales;
import org.zkoss.zk.ui.Component;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.util.Locale;
public class BigDecimalFilterConverter implements Converter<String, BigDecimal, Component>
{
private final static Logger log = LoggerFactory.getLogger(BigDecimalFilterConverter.class.getName());
@Override
public BigDecimal coerceToBean(String str, Component component, BindContext cx)
{
// BigDecimal val = BigDecimal.ZERO;
BigDecimal val = null;
if (str != null)
{
try
{
Locale loc = Locales.getCurrent();
DecimalFormat format = (DecimalFormat) DecimalFormat.getInstance(loc);
format.setParseBigDecimal(true);
val = (BigDecimal) format.parse(str);
}
catch (NumberFormatException e)
{
log.warn(str, e);
}
catch (ParseException e)
{
log.warn(str, e);
}
}
return val;
}
@Override
public String coerceToUi(BigDecimal val, Component component, BindContext cx)
{
Locale loc = Locales.getCurrent();
if (val == null)
{
return "";
//val = BigDecimal.ZERO;
}
val = val.setScale(2, BigDecimal.ROUND_DOWN);
DecimalFormat format = (DecimalFormat) DecimalFormat.getInstance(loc);
format.setMaximumFractionDigits(2);
format.setMinimumFractionDigits(0);
format.setGroupingUsed(true);
format.setGroupingSize(3);
String formatted = format.format(val);
return formatted;
}
}

@ -16,18 +16,6 @@ import org.zkoss.zul.Messagebox;
public class DocumentViewModel
{
protected BigDecimalFilterConverter standardBigDecimalFilterConverter;
public BigDecimalFilterConverter getStandardBigDecimalFilterConverter()
{
return standardBigDecimalFilterConverter;
}
public void setStandardBigDecimalFilterConverter(BigDecimalFilterConverter standardBigDecimalFilterConverter)
{
this.standardBigDecimalFilterConverter = standardBigDecimalFilterConverter;
}
protected BigDecimalConverter standardBigDecimalConverter;
protected BoolConverter standardBoolConverter;
@ -65,7 +53,6 @@ public class DocumentViewModel
@Init
public void initDocumentViewModel()
{
this.standardBigDecimalFilterConverter = new BigDecimalFilterConverter();
this.standardBigDecimalConverter = new BigDecimalConverter();
this.standardBoolConverter = new BoolConverter();
}

@ -5,6 +5,10 @@ import info.bukova.isspst.data.DataModel;
import info.bukova.isspst.services.IsspstException;
import info.bukova.isspst.services.Service;
import info.bukova.isspst.services.ValidationException;
import java.sql.SQLException;
import java.util.Map;
import org.hibernate.exception.ConstraintViolationException;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.security.access.AccessDeniedException;
@ -16,15 +20,12 @@ import org.zkoss.bind.annotation.NotifyChange;
import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Window;
import java.sql.SQLException;
import java.util.Map;
public class FormViewModel<T extends DataModel> extends BindingViewModel<T>
{
private T dataBean;
private Map<String, String> errMessages;
private Service<T> service;
protected boolean newRec;
private boolean newRec;
private ServiceConstraint<T> constraint;
@Init

@ -2,13 +2,9 @@ package info.bukova.isspst.ui;
import info.bukova.isspst.StringUtils;
import info.bukova.isspst.data.DataModel;
import info.bukova.isspst.data.Season;
import info.bukova.isspst.data.SeasonsAware;
import info.bukova.isspst.filters.Filter;
import info.bukova.isspst.services.HqlDataFilter;
import info.bukova.isspst.services.IsspstException;
import info.bukova.isspst.services.Service;
import info.bukova.isspst.services.settings.SeasonService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.dao.DataIntegrityViolationException;
@ -22,13 +18,10 @@ import org.zkoss.bind.annotation.NotifyChange;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.select.annotation.WireVariable;
import org.zkoss.zul.Listheader;
import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Window;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -50,14 +43,6 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
private boolean sortDesc = true;
private boolean newRec = false;
private boolean fullFill = false;
private Listheader sortHeader;
@WireVariable
private SeasonService seasonService;
private List<Season> seasons;
private Season selSeason;
@WireVariable
private HqlDataFilter hqlFilter;
protected Service<T> service;
protected Class<T> dataClass;
@ -68,9 +53,6 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
public void initListViewModel()
{
super.initDocumentViewModel();
seasons = seasonService.getAllSeasons();
selSeason = seasonService.getActive();
setHqlFilter();
}
public List<T> getDataList() {
@ -143,7 +125,6 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
dataList = fullList;
dataBean = null;
selIndex = -1;
restoreSort();
} else {
doFilter();
dataBean = null;
@ -283,7 +264,6 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
BindUtils.postGlobalCommand(null, null, "reloadRelated", null);
restoreUserView();
}
@GlobalCommand
@ -291,7 +271,6 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
public void reload() {
dataBean = null;
dataList.clear();
setHqlFilter();
loadFromDbSync();
}
@ -348,13 +327,14 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
}
@Command
@NotifyChange({"dataBean", "canApprove"})
public void onSortHeader(@BindingParam("header") Listheader header) {
sortHeader = header;
@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;
Collections.sort(dataList,
sortHeader.getSortDirection().equals("ascending") ? sortHeader.getSortDescending() : sortHeader.getSortAscending());
}
public int getSelIndex() {
@ -410,27 +390,6 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
this.fullFill = fullFill;
}
protected void restoreUserView() {
int sel = selIndex;
restoreFilter();
restoreSort();
selIndex = sel;
}
private void restoreSort() {
if (sortHeader != null) {
Collections.sort(dataList,
sortHeader.getSortDirection().equals("ascending") ? sortHeader.getSortAscending() : sortHeader.getSortDescending());
}
}
private void restoreFilter() {
if (filter) {
doFilter();
}
}
public boolean isRecordSelected()
{
return (dataBean != null);
@ -438,61 +397,11 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
public boolean isAbleToDelete()
{
if (isSeasonFilter()
&&(!seasonService.getActive().equals(selSeason))) {
return false;
}
return this.isRecordSelected();
}
public boolean isAbleToAdd()
{
if (isSeasonFilter()
&&(!seasonService.getActive().equals(selSeason))) {
return false;
}
return true;
}
public List<Season> getSeasons() {
return seasons;
}
public Season getSelSeason() {
return selSeason;
}
public void setSelSeason(Season selSeason) {
this.selSeason = selSeason;
}
private void setHqlFilter() {
if (selSeason == null) {
hqlFilter.reset();
} else {
hqlFilter.setWhere("SEASON_ID = :season");
hqlFilter.setParam("season", selSeason.getId());
hqlFilter.setDataClass(SeasonsAware.class);
}
}
@Command
@NotifyChange({"dataList", "ableToAdd", "selIndex", "dataBean", "ableToDelete"})
public void filterSeason() {
setHqlFilter();
dataList.clear();
loadFromDbSync();
dataBean = null;
selIndex = -1;
}
public boolean isSeasonFilter() {
for (Class<?> clazz : service.getEntityClasses()) {
if (SeasonsAware.class.isAssignableFrom(clazz)) {
return true;
}
}
return false;
}
}

@ -44,7 +44,7 @@ public class MainMenu
@Command
public void numSeries()
{
Window window = (Window) Executions.createComponents("/settings/seasons.zul", null, null);
Window window = (Window) Executions.createComponents("/settings/numberSeries.zul", null, null);
window.doModal();
}

@ -4,12 +4,9 @@ import info.bukova.isspst.data.Role;
import info.bukova.isspst.data.User;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.services.invoicing.InvoicingService;
import info.bukova.isspst.services.limits.LimitService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.DocumentViewModel;
import org.zkoss.bind.annotation.Init;
import org.zkoss.zk.ui.select.annotation.WireVariable;
import java.math.BigDecimal;
import java.util.ArrayList;
@ -17,6 +14,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.zkoss.bind.annotation.Init;
import org.zkoss.zk.ui.select.annotation.WireVariable;
public class DashBoardVM extends DocumentViewModel {
@WireVariable
@ -25,12 +25,9 @@ public class DashBoardVM extends DocumentViewModel {
private UserService userService;
@WireVariable
private InvoicingService invoicingService;
@WireVariable
private LimitService limitService;
private User user;
private Map<Workgroup, List<Role>> groupRoles;
private Map<Workgroup, BigDecimal> workgroupSpent;
private Map<Workgroup, BigDecimal> workgroupLimit;
@Init(superclass = true)
public void init() {
@ -38,7 +35,6 @@ public class DashBoardVM extends DocumentViewModel {
groupRoles = new HashMap<Workgroup, List<Role>>();
workgroupSpent = new HashMap<Workgroup, BigDecimal>();
workgroupLimit = new HashMap<Workgroup, BigDecimal>();
List<Workgroup> wg = new ArrayList<Workgroup>();
if (workgroupService.getUserCentres(user) != null) {
@ -52,9 +48,6 @@ public class DashBoardVM extends DocumentViewModel {
List<Role> r = workgroupService.getUserWorkgroupRoles(w, user);
groupRoles.put(w, r);
workgroupSpent.put(w, invoicingService.totalInvoicedForWorkgroup(w));
if (limitService.getForWorkgroup(w) != null) {
workgroupLimit.put(w, limitService.getForWorkgroup(w).getLimit());
}
}
}
@ -78,8 +71,4 @@ public class DashBoardVM extends DocumentViewModel {
return workgroupSpent;
}
public Map<Workgroup, BigDecimal> getWorkgroupLimit() {
return workgroupLimit;
}
}

@ -1,43 +0,0 @@
package info.bukova.isspst.ui.limits;
import info.bukova.isspst.data.Limit;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.services.limits.LimitService;
import info.bukova.isspst.services.settings.SeasonService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.FormViewModel;
import org.zkoss.bind.annotation.Init;
import org.zkoss.zk.ui.select.annotation.WireVariable;
import java.util.List;
public class LimitsForm extends FormViewModel<Limit> {
List<Workgroup> workgroups;
@WireVariable
WorkgroupService workgroupService;
@WireVariable
LimitService limitService;
@WireVariable
SeasonService seasonService;
@Init(superclass = true)
public void init() {
workgroups = workgroupService.getWorkgroups();
if (getDataBean().getWorkgroup() == null) {
List<Limit> limits = limitService.getForSeason(seasonService.getActive());
for (Limit l : limits) {
workgroups.remove(l.getWorkgroup());
}
}
}
public List<Workgroup> getWorkgroups() {
return workgroups;
}
public boolean isNewRec() {
return newRec;
}
}

@ -1,132 +0,0 @@
package info.bukova.isspst.ui.limits;
import info.bukova.isspst.StringUtils;
import info.bukova.isspst.data.Limit;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.services.invoicing.InvoicingService;
import info.bukova.isspst.services.limits.LimitService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.ListViewModel;
import org.jfree.chart.ChartFactory;
import org.jfree.chart.ChartUtilities;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.renderer.category.BarRenderer3D;
import org.jfree.chart.title.LegendTitle;
import org.jfree.data.category.DefaultCategoryDataset;
import org.jfree.ui.RectangleEdge;
import org.zkoss.bind.annotation.GlobalCommand;
import org.zkoss.bind.annotation.Init;
import org.zkoss.bind.annotation.NotifyChange;
import org.zkoss.zk.ui.select.annotation.WireVariable;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.RenderedImage;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
public class LimitsList extends ListViewModel<Limit> {
@WireVariable
private LimitService limitService;
@WireVariable
private InvoicingService invoicingService;
@WireVariable
private WorkgroupService workgroupService;
private Map<Limit, BigDecimal> spent;
private RenderedImage chart;
@Init(superclass = true)
public void init() {
service = limitService;
dataClass = Limit.class;
formZul = "limitForm.zul";
//dataFilter = new MUnitFilter(getFilterTemplate());
genSpent();
}
public Map<Limit, BigDecimal> getSpent() {
if (spent != null && !getDataList().isEmpty()) {
for (Limit l : spent.keySet()) {
if (!l.getSeason().equals(getDataList().get(0).getSeason())) {
spent = null;
}
break;
}
}
if (spent != null && spent.keySet().size() < getDataList().size()) {
spent = null;
}
if (spent != null) {
return spent;
}
spent = new HashMap<Limit, BigDecimal>();
for (Limit l : getDataList()) {
spent.put(l, invoicingService.totalInvoicedForWorkgroupAndSeason(l.getWorkgroup(), getSelSeason()));
}
return spent;
}
private void genSpent() {
spent = new HashMap<Limit, BigDecimal>();
for (Limit l : getDataList()) {
spent.put(l, invoicingService.totalInvoicedForWorkgroupAndSeason(l.getWorkgroup(), getSelSeason()));
}
}
private void genCharts() {
DefaultCategoryDataset dataSet = new DefaultCategoryDataset();
for (Workgroup wg : workgroupService.getWorkgroups()) {
Limit limit = null;
for (Limit l : getDataList()) {
if (l.getWorkgroup().equals(wg)) {
limit = l;
break;
}
}
dataSet.addValue(limit == null ? null : limit.getLimit(), StringUtils.localize("LimitsLimit"), wg.getFullName());
dataSet.addValue(invoicingService.totalInvoicedForWorkgroupAndSeason(wg, getSelSeason()), StringUtils.localize("LimitsSpent"), wg.getFullName());
}
JFreeChart jfChart = ChartFactory.createBarChart3D(StringUtils.localize("LimitsChartTitle"), StringUtils.localize("LimitsWorkgroup"),
StringUtils.localize("LimitsAmount"), dataSet, PlotOrientation.HORIZONTAL, true, false, false);
CategoryPlot plot = (CategoryPlot) jfChart.getPlot();
BarRenderer3D renderer = (BarRenderer3D) plot.getRenderer();
renderer.setSeriesPaint(0, Color.GREEN);
renderer.setSeriesPaint(1, Color.RED);
LegendTitle legend = jfChart.getLegend();
legend.setPosition(RectangleEdge.RIGHT);
try {
chart = ImageIO.read(new ByteArrayInputStream(ChartUtilities.encodeAsPNG(jfChart.createBufferedImage(1000, 400))));
} catch (IOException e) {
chart = null;
e.printStackTrace();
}
}
public RenderedImage getChart() {
genCharts();
return chart;
}
@Override
@GlobalCommand
@NotifyChange({ "dataList", "dataBean", "ableToDelete", "chart", "spent" })
public void refresh() {
genSpent();
super.refresh();
}
}

@ -72,7 +72,6 @@ public class ApproveDialogVM {
BindUtils.postNotifyChange(null, null, grid, "dataBean");
BindUtils.postNotifyChange(null, null, grid, "canApprove");
BindUtils.postGlobalCommand(null, null, "reload", null);
grid.refresh();
window.detach();
} catch (ApproveException ex) {
Messagebox.show(StringUtils.localize(ex.getReason()), StringUtils.localize("Error"), Messagebox.OK,

@ -6,6 +6,11 @@ import info.bukova.isspst.filters.RequirementFilter;
import info.bukova.isspst.services.requirement.RequirementService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.requirement.RequirementSubpage;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import org.springframework.security.access.AccessDeniedException;
import org.zkoss.bind.BindUtils;
import org.zkoss.bind.annotation.GlobalCommand;
@ -13,10 +18,6 @@ import org.zkoss.bind.annotation.Init;
import org.zkoss.bind.annotation.NotifyChange;
import org.zkoss.zk.ui.select.annotation.WireVariable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
public class ReqListMyAll extends RequirementSubpage<Requirement>
{
@WireVariable
@ -54,11 +55,10 @@ public class ReqListMyAll extends RequirementSubpage<Requirement>
}
@GlobalCommand
@NotifyChange({ "dataList", "dataBean", "fullFill", "selIndex" })
@NotifyChange({ "dataList", "dataBean", "fullFill" })
public void reloadRelated()
{
this.reload();
restoreUserView();
}
@Override

@ -6,6 +6,11 @@ import info.bukova.isspst.filters.RequirementFilter;
import info.bukova.isspst.services.requirement.RequirementService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.requirement.RequirementSubpage;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import org.springframework.security.access.AccessDeniedException;
import org.zkoss.bind.BindUtils;
import org.zkoss.bind.annotation.GlobalCommand;
@ -13,10 +18,6 @@ import org.zkoss.bind.annotation.Init;
import org.zkoss.bind.annotation.NotifyChange;
import org.zkoss.zk.ui.select.annotation.WireVariable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
public class ReqListMyCenters extends RequirementSubpage<Requirement>
{
@WireVariable
@ -54,11 +55,10 @@ public class ReqListMyCenters extends RequirementSubpage<Requirement>
}
@GlobalCommand
@NotifyChange({ "dataList", "dataBean", "fullFill", "selIndex" })
@NotifyChange({ "dataList", "dataBean", "fullFill" })
public void reloadRelated()
{
this.reload();
restoreUserView();
}
@Override

@ -1,14 +1,16 @@
package info.bukova.isspst.ui.main.orders.requirements;
import info.bukova.isspst.data.Limit;
import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.filters.RequirementFilter;
import info.bukova.isspst.services.invoicing.InvoicingService;
import info.bukova.isspst.services.limits.LimitService;
import info.bukova.isspst.services.requirement.RequirementService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.requirement.RequirementSubpage;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import org.springframework.security.access.AccessDeniedException;
import org.zkoss.bind.BindUtils;
import org.zkoss.bind.annotation.GlobalCommand;
@ -16,10 +18,6 @@ import org.zkoss.bind.annotation.Init;
import org.zkoss.bind.annotation.NotifyChange;
import org.zkoss.zk.ui.select.annotation.WireVariable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
public class ReqListMyWorkgroups extends RequirementSubpage<Requirement>
{
@WireVariable
@ -28,12 +26,6 @@ public class ReqListMyWorkgroups extends RequirementSubpage<Requirement>
@WireVariable
protected WorkgroupService workgroupService;
@WireVariable
protected LimitService limitService;
@WireVariable
protected InvoicingService invoicingService;
public List<Workgroup> getCentres()
{
return workgroupService.getCentres();
@ -63,11 +55,10 @@ public class ReqListMyWorkgroups extends RequirementSubpage<Requirement>
}
@GlobalCommand
@NotifyChange({ "dataList", "dataBean", "fullFill", "selIndex" })
@NotifyChange({ "dataList", "dataBean", "fullFill" })
public void reloadRelated()
{
this.reload();
restoreUserView();
}
@Override
@ -84,36 +75,8 @@ public class ReqListMyWorkgroups extends RequirementSubpage<Requirement>
}
@Override
@NotifyChange({ "dataBean", "ableToDelete", "canApprove", "invoicedAmount", "workgroupLimit", "workgroupInvoiced" })
@NotifyChange({ "dataBean", "ableToDelete", "canApprove", "invoicedAmount" })
public void setDataBean(Requirement data) {
super.setDataBean(data);
}
public BigDecimal getWorkgroupLimit() {
if (getDataBean() != null && getDataBean().getWorkgroup() != null) {
Limit limit = limitService.getForWorkgroup(getDataBean().getWorkgroup());
if (limit == null) {
return null;
}
return limit.getLimit();
}
return null;
}
public BigDecimal getWorkgroupInvoiced() {
if (getDataBean() != null && getDataBean().getWorkgroup() != null) {
BigDecimal invoiced = invoicingService.totalInvoicedForWorkgroup(getDataBean().getWorkgroup());
if (invoiced == null) {
return null;
}
return invoiced;
}
return null;
}
}

@ -12,6 +12,10 @@ import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.FormViewModel;
import info.bukova.isspst.validators.RequirementFormValidator;
import java.math.BigDecimal;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.zkoss.bind.BindUtils;
@ -25,10 +29,6 @@ import org.zkoss.zk.ui.select.annotation.WireVariable;
import org.zkoss.zul.Window;
import org.zkoss.zul.impl.InputElement;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
public class RequirementForm extends FormViewModel<Requirement>
{
private final static Logger log = LoggerFactory.getLogger(RequirementForm.class.getName());
@ -112,14 +112,7 @@ public class RequirementForm extends FormViewModel<Requirement>
this.setRequirementFormValidator(new RequirementFormValidator());
this.setSyncItems(this.getDataBean().getItems());
requirementService.loadType(getDataBean());
if (isEditRec()) {
List<Workgroup> current = new ArrayList<Workgroup>();
current.add(getDataBean().getCentre());
this.centres = current;
} else {
this.centres = reqTypeService.filterCentres(getDataBean().getType(), workgroupService.getUserCentres(userService.getCurrent(), true));
}
this.centres = reqTypeService.filterCentres(getDataBean().getType(), workgroupService.getUserCentres(userService.getCurrent()));
}
public List<RequirementItem> getSyncItems()

@ -24,7 +24,6 @@ import org.zkoss.zk.ui.select.annotation.WireVariable;
import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Window;
import java.util.ArrayList;
import java.util.List;
public class TripRequirementForm extends FormWithUpload<TripRequirement> {
@ -74,14 +73,7 @@ public class TripRequirementForm extends FormWithUpload<TripRequirement> {
@Init(superclass = true)
public void init() {
tripRequirementService.loadType(getDataBean());
if (isEditRec()) {
List<Workgroup> current = new ArrayList<Workgroup>();
current.add(getDataBean().getCentre());
this.centres = current;
} else {
this.centres = reqTypeService.filterCentres(getDataBean().getType(), workgroupService.getUserCentres(userService.getCurrent(), true));
}
centres = reqTypeService.filterCentres(getDataBean().getType(), workgroupService.getUserCentres(userService.getCurrent()));
users = userService.getUsersForCombo();
passengers = getDataBean().getPassengers();
validator = new TripRequirementFormValidator();

@ -30,7 +30,7 @@ public class TripRequirementList extends ListViewModel<TripRequirement> {
private boolean showWorkgroup;
private boolean showAll;
@Init(superclass = true)
@Init
public void init() {
service = tripRequirementService;
dataClass = TripRequirement.class;

@ -33,7 +33,7 @@ public class TripRequirementListAll extends RequirementSubpage<TripRequirement>
private List<Workgroup> allCentres;
private List<Workgroup> allWorkgroups;
@Init(superclass = true)
@Init
public void init() {
service = tripRequirementService;
dataClass = TripRequirement.class;
@ -63,10 +63,9 @@ public class TripRequirementListAll extends RequirementSubpage<TripRequirement>
}
@GlobalCommand
@NotifyChange({ "dataList", "dataBean", "fullFill", "selIndex" })
@NotifyChange({ "dataList", "dataBean", "fullFill" })
public void reloadRelated() {
this.reload();
restoreUserView();
}
@Override

@ -35,7 +35,7 @@ public class TripRequirementListCentre extends RequirementSubpage<TripRequiremen
private List<Workgroup> myCentres;
@Init(superclass = true)
@Init
public void init() {
service = tripRequirementService;
dataClass = TripRequirement.class;
@ -63,7 +63,6 @@ public class TripRequirementListCentre extends RequirementSubpage<TripRequiremen
@NotifyChange({ "dataList", "dataBean", "fullFill" })
public void reloadRelated() {
this.reload();
restoreUserView();
}
@Override

@ -37,7 +37,7 @@ public class TripRequirementListWorkgroup extends RequirementSubpage<TripRequire
private List<Workgroup> myWorkgroups;
@Init(superclass = true)
@Init
public void init() {
service = tripRequirementService;
dataClass = TripRequirement.class;
@ -70,7 +70,6 @@ public class TripRequirementListWorkgroup extends RequirementSubpage<TripRequire
@NotifyChange({ "dataList", "dataBean", "fullFill" })
public void reloadRelated() {
this.reload();
restoreUserView();
}
@Override

@ -1,101 +0,0 @@
package info.bukova.isspst.ui.settings;
import info.bukova.isspst.Module;
import info.bukova.isspst.ModuleUtils;
import info.bukova.isspst.StringUtils;
import info.bukova.isspst.data.NumberSeries;
import info.bukova.isspst.data.Season;
import info.bukova.isspst.services.numberseries.NumberSeriesService;
import info.bukova.isspst.services.settings.SeasonService;
import org.zkoss.bind.BindUtils;
import org.zkoss.bind.annotation.BindingParam;
import org.zkoss.bind.annotation.Command;
import org.zkoss.bind.annotation.Init;
import org.zkoss.bind.annotation.NotifyChange;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.select.annotation.WireVariable;
import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Window;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author Pepa Rokos
*/
public class SeasonsVM {
@WireVariable
private SeasonService seasonService;
@WireVariable
private NumberSeriesService numericSeriesService;
private List<Season> seasons;
private List<NumberSeries> numSeries;
private Map<String, Module> moduleMap;
@Init
public void init() {
seasons = seasonService.getAll();
numSeries = numericSeriesService.getSeriesForSeason(seasonService.getActive());
moduleMap = new HashMap<String, Module>();
for (Module m : ModuleUtils.getActiveModules()) {
moduleMap.put(m.getId(), m);
}
}
public Map<String, Module> getModuleMap() {
return moduleMap;
}
@Command
//@NotifyChange({"seasons", "numSeries"})
public void addSeason() {
Messagebox.show(StringUtils.localize("SeasonsNewSeasonDialog"), StringUtils.localize("SeasonsNewSeason"), Messagebox.YES | Messagebox.NO, Messagebox.QUESTION,
new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
if (((Integer)event.getData()).intValue() == Messagebox.YES) {
Season newSeason = seasonService.addSeason();
seasons = seasonService.getAll();
numSeries = numericSeriesService.getSeriesForSeason(seasonService.getActive());
BindUtils.postNotifyChange(null, null, SeasonsVM.this, "seasons");
BindUtils.postNotifyChange(null, null, SeasonsVM.this, "numSeries");
}
}
});
}
@Command
public void save(@BindingParam("window") Window win) {
for(Season s: seasons) {
seasonService.update(s);
}
for(NumberSeries n: numSeries) {
numericSeriesService.update(n);
}
win.detach();
}
@Command
@NotifyChange({"numSeries", "seasons"})
public void activate(@BindingParam("season") Season season) {
seasonService.setActive(season);
seasons = seasonService.getAll();
numSeries = numericSeriesService.getSeriesForSeason(season);
}
public List<Season> getSeasons() {
return seasons;
}
public List<NumberSeries> getNumSeries() {
return numSeries;
}
public boolean isCanSave() {
return true;
}
}

@ -1,185 +0,0 @@
package info.bukova.isspst.ui.signeddocs;
import info.bukova.isspst.DateTimeUtils;
import info.bukova.isspst.data.SignedDocument;
import info.bukova.isspst.data.SignedDocumentItem;
import info.bukova.isspst.storage.ReportFileStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.AccessDeniedException;
import org.zkoss.bind.annotation.Command;
import org.zkoss.bind.annotation.Init;
import org.zkoss.zk.ui.select.annotation.WireVariable;
import org.zkoss.zul.DefaultTreeModel;
import org.zkoss.zul.Filedownload;
import org.zkoss.zul.TreeModel;
import org.zkoss.zul.TreeNode;
import java.io.*;
import java.text.Normalizer;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
public class SignedDocsTreeList extends SignedDocsList {
@SuppressWarnings("unused")
private final static Logger log = LoggerFactory.getLogger(SignedDocsTreeList.class.getName());
@WireVariable
private ReportFileStorage signedDocStorage;
public SignedDocsTreeNode getSelectedNodeItem() {
return selectedNodeItem;
}
public void setSelectedNodeItem(SignedDocsTreeNode selectedNodeItem) {
this.selectedNodeItem = selectedNodeItem;
}
private SignedDocsTreeNode selectedNodeItem;
public SignedDocsTreeList() {
}
@Init(superclass = true)
public void signedDocsTreeListInit() {
}
public TreeModel<TreeNode<SignedDocumentItem>> getTreeBackup() {
try {
return signedDocumentService.getTree();
} catch (AccessDeniedException e) {
// BindUtils.postGlobalCommand(null, null, "disableCentre", null);
// e.printStackTrace();
return new DefaultTreeModel<SignedDocumentItem>(null);
}
}
public static void addToZipFile(String filePath, String zipPath, ZipOutputStream zos) throws FileNotFoundException, IOException {
//System.out.println("Writing '" + filePath + "' to zip file");
File file = new File(filePath);
FileInputStream fis = new FileInputStream(file);
ZipEntry zipEntry = new ZipEntry(zipPath);
zos.putNextEntry(zipEntry);
byte[] bytes = new byte[1024];
int length;
while ((length = fis.read(bytes)) >= 0) {
zos.write(bytes, 0, length);
}
zos.closeEntry();
fis.close();
}
public static String getNormalizedPath(String path) {
String result = path.replaceAll("[ ]", "_");
result = Normalizer.normalize(result, Normalizer.Form.NFD);
result = result.replaceAll("[^-a-zA-Z0-9_./]", "");
return result;
}
public static String getCheckedString(String str, int maxLength) {
String result = "";
if (str != null) {
int len = str.length();
if (len > 0) {
result = str.substring(0, len > maxLength ? maxLength - 1 : len);
result += "-";
}
}
return result;
}
public static String getCheckedString(String str) {
return SignedDocsTreeList.getCheckedString(str, 50);
}
@Command
public void onCreateZipArchive() {
if (this.selectedNodeItem == null) {
return;
}
List<SignedDocsTreeNode> leafs = this.selectedNodeItem.getLeafs();
if (leafs.size() > 0) {
int deep = this.selectedNodeItem.getDeep();
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ZipOutputStream zos = new ZipOutputStream(bos);
for (SignedDocsTreeNode node : leafs) {
SignedDocumentItem item = node.getData();
String pdfFileName = item.getFileName();
SignedDocument doc = item.getSignedDocument();
String zipDirs = "";
String zipFileName = "";
if (deep == 3 || deep == 4) {
zipFileName += SignedDocsTreeList.getCheckedString(DateTimeUtils.getFormatedDirDate(doc.getSignDate()));
}
zipFileName += SignedDocsTreeList.getCheckedString(item.getReportName());
zipFileName += SignedDocsTreeList.getCheckedString(doc.getNumser());
zipFileName += SignedDocsTreeList.getCheckedString(doc.getDescription());
zipFileName += SignedDocsTreeList.getCheckedString(pdfFileName);
if (deep == 1 || deep == 2 || deep == 3) {
zipDirs += doc.getAgendaName();
zipDirs += "/";
}
if (deep == 1) {
zipDirs += DateTimeUtils.getFormatedYear(doc.getSignDate());
zipDirs += "/";
}
if (deep == 1) {
zipDirs += DateTimeUtils.getFormatedDirDateDDMM(doc.getSignDate());
zipDirs += "/";
}
if (deep == 2) {
zipDirs += DateTimeUtils.getFormatedDirDate(doc.getSignDate());
zipDirs += "/";
}
String rootPath = signedDocStorage.getRootPath();
String diskPath = rootPath + "/" + pdfFileName;
String zipPath = zipDirs + zipFileName;
zipPath = SignedDocsTreeList.getNormalizedPath(zipPath);
if (new File(diskPath).isFile()) {
SignedDocsTreeList.addToZipFile(diskPath, zipPath, zos);
} else {
log.warn("Missing file '" + diskPath + "' !!!");
log.warn(doc.getAgendaName());
log.warn(doc.getDescription());
log.warn(item.getReportName());
}
}
zos.close();
bos.close();
Filedownload.save(bos.toByteArray(), "application/zip", "temp" + Long.toString(System.nanoTime()) + ".zip");
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}

@ -1,79 +0,0 @@
package info.bukova.isspst.ui.signeddocs;
import info.bukova.isspst.data.SignedDocumentItem;
import org.zkoss.zul.DefaultTreeNode;
import org.zkoss.zul.TreeNode;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
public class SignedDocsTreeNode extends DefaultTreeNode<SignedDocumentItem> {
public SignedDocsTreeNode(SignedDocumentItem data) {
super(data);
}
public SignedDocsTreeNode(SignedDocumentItem data, Collection<? extends TreeNode<SignedDocumentItem>> children) {
super(data, children);
}
public SignedDocsTreeNode getParentNode() {
return (SignedDocsTreeNode) this.getParent();
}
public int getDeep() {
int iDeep = 0;
SignedDocsTreeNode node = this.getParentNode();
while (node != null) {
node = node.getParentNode();
iDeep++;
}
return iDeep;
}
public List<SignedDocsTreeNode> getLeafs() {
List<SignedDocsTreeNode> list = new LinkedList<SignedDocsTreeNode>();
if (!this.isLeaf()) {
List<TreeNode<SignedDocumentItem>> children = this.getChildren();
for (TreeNode<SignedDocumentItem> item : children) {
SignedDocsTreeNode node = (SignedDocsTreeNode) item;
if (node != null) {
if (node.isLeaf()) {
list.add(node);
} else {
list.addAll(node.getLeafs());
}
}
}
}
return list;
}
public int getLeafsCount() {
int count = 0;
if (!this.isLeaf()) {
List<TreeNode<SignedDocumentItem>> children = this.getChildren();
for (TreeNode<SignedDocumentItem> item : children) {
SignedDocsTreeNode node = (SignedDocsTreeNode) item;
if (node != null) {
if (node.isLeaf()) {
count += 1;
} else {
count += node.getLeafsCount();
}
}
}
}
return count;
}
}

@ -1,41 +0,0 @@
package info.bukova.isspst.ui.signeddocs;
import info.bukova.isspst.DateTimeUtils;
import info.bukova.isspst.StringUtils;
import info.bukova.isspst.data.SignedDocument;
import info.bukova.isspst.data.SignedDocumentItem;
import org.zkoss.zul.*;
public class SignedDocsTreeRenderer implements TreeitemRenderer<SignedDocsTreeNode> {
public void render(Treeitem item, SignedDocsTreeNode data, int index) throws Exception {
int deep = data.getDeep();
boolean node1 = (deep == 1);//data.getParent().getParent() == null;
boolean node3 = (deep == 3);//data.isLeaf();
boolean node2 = (deep == 2);//!node1 && !node3;
boolean node4 = (deep == 4);//!node1 && !node3;
SignedDocumentItem signedDocumentItem = data.getData();
SignedDocument signedDocument = signedDocumentItem.getSignedDocument();
Treerow tr = new Treerow();
tr.setContext("popupMenu");
item.appendChild(tr);
tr.appendChild(new Treecell(node1 ? signedDocument.getAgendaName() : ""));
tr.appendChild(new Treecell(node2 ? DateTimeUtils.getFormatedYear(signedDocument.getSignDate()) : ""));
tr.appendChild(new Treecell(node3 ? DateTimeUtils.getFormatedDate(signedDocument.getSignDate()) : ""));
tr.appendChild(new Treecell(node4 ? signedDocument.getNumser() : ""));
tr.appendChild(new Treecell(node4 ? signedDocument.getDescription() : ""));
tr.appendChild(new Treecell(node4 ? signedDocumentItem.getReportName() : data.getLeafsCount() + " souborů"));
// tr.appendChild(new Treecell(node3 ? signedDocumentItem.getFileName() : ""));
switch (deep) {
case 1 : tr.setSclass("signed-doc-agenda"); break;
case 2 : tr.setSclass("signed-doc-year"); break;
case 3 : tr.setSclass("signed-doc-date"); break;
case 4 : tr.setSclass(""); break;
}
}
}

@ -78,9 +78,9 @@ public class TripBillListBase extends RequirementSubpage<TripBillApproval> {
}
@GlobalCommand
@NotifyChange({ "dataList", "dataBean", "fullFill", "selIndex" })
public void reloadRelated() {
@NotifyChange({ "dataList", "dataBean", "fullFill" })
public void reloadRelated()
{
this.reload();
restoreUserView();
}
}

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ehcache.org/ehcache.xsd">
<diskStore path="java.io.tmpdir"/>
<defaultCache
eternal="false"
maxElementsInMemory="100000"
timeToLiveSeconds="1800"
overflowToDisk="true" />
<!--<cache name="info.bukova.isspst.data.User"
maxElementsInMemory="1000"
overflowToDisk="false"/>
<cache name="info.bukova.isspst.data.Role"
maxElementsInMemory="1000"
overflowToDisk="false"/>
<cache name="info.bukova.isspst.data.Permission"
maxElementsInMemory="1000"
overflowToDisk="false"/>
<cache name="info.bukova.isspst.data.Requirement"
maxElementsInMemory="10000"
overflowToDisk="true"/>
<cache name="info.bukova.isspst.data.TripRequirement"
maxElementsInMemory="10000"
overflowToDisk="true"/>
<cache name="info.bukova.isspst.data.TripBillApproval"
maxElementsInMemory="10000"
overflowToDisk="true"/>-->
</ehcache>

@ -38,7 +38,5 @@
<mapping class="info.bukova.isspst.data.TripBillApproval"></mapping>
<mapping class="info.bukova.isspst.data.SignedDocument"></mapping>
<mapping class="info.bukova.isspst.data.SignedDocumentItem"></mapping>
<mapping class="info.bukova.isspst.data.Season"></mapping>
<mapping class="info.bukova.isspst.data.Limit"></mapping>
</session-factory>
</hibernate-configuration>

@ -1,4 +1,3 @@
ad.domain=bukova.net
ad.upnSuffix=bukova.info
ad.ldapUrl=ldap://192.168.25.110/
ad.allowedGroup=ucitele

@ -247,7 +247,6 @@ TripBillCancelApprovalTitle=Zrušit schválení
TripBillPaid=Proplaceno
TripBillPaidDate=Datum proplacení
TripBillPay=Proplatit
TribBillApproveDate=Datum schválení
TripBillSummaryDetail=Detail
@ -416,16 +415,13 @@ Search=Hledat
Pending = Nevyřízené
Archive = Archiv
Completed = Vyřízeno
Backup = Zálohování
SigningYear = Rok podepsání
DownloadZipArchive = Stáhnout ZIP archiv...
GenerateBillingForPassengers = Generovat společný požadavek a vyúčtování
Passenger = Pasažér
ChooseThePasseger = Vyberte pasažéra
TransportMode = Způsob dopravy
ForeignPersons = Cizí osoby
TripBillResultMessageText = Stručná zpráva z pracovní cesty, přínosy a podněty k dalšímu využití
TripBillResultMessageText = Zpráva z pracovní cesty
ErrFillTripBillResultMessageText = Vyplňte zprávu z pracovní cesty.
ErrFillTripBillResultTimes = Zadejte časy odjezdu a příjezdu.
@ -433,28 +429,5 @@ ErrApproveMustBeSigned = Schválení musí být digitálně podepsané.
DigitalSignature = Elektronický podpis
ContextMenu = Volby v kontextovém menu
ExportToExcel = Exportovat do excelu
ErrMaterialOrServiceDescription=Zadejte popis požadavku.
SeasonsSeason = Období
SeasonsNewSeason = Nové období
SeasonsDescription = Popis
SeasonsValidFrom = Platí od
SeasonsValidTo = Platí do
SeasonsActive = Aktivní
SeasonsActivate = Aktivovat
SeasonsActiveNumSeries = Číselné řady pro aktivní období:
SeasonsAgenda = Agenda
SeasonsPrefix = Prefix
SeasonsNewSeasonDialog = Opravdu chcete založit nové období?
Active_season_not_set = Není nastaveno žádné aktivní období.
LimitsAgName = Limity komisí
LimitsLimit = Limit
LimitsWorkgroup = Komise
LimitsSpent = Vyčerpáno
LimitsChartTitle = Vyčerpané částky
LimitsAmount = Částka

@ -1,260 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 -->
<!-- 2016-02-29T12:57:46 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="requirementProtocol" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b9143b9d-c262-47c6-9b06-26ae82fb8222">
<property name="ireport.zoom" value="2.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
<parameter name="P_MAIN_ADDRESS" class="java.lang.String"/>
<parameter name="P_LOGO" class="java.lang.String"/>
<queryString>
<![CDATA[]]>
</queryString>
<field name="completed" class="java.lang.Boolean">
<fieldDescription><![CDATA[completed]]></fieldDescription>
</field>
<field name="items" class="java.util.List">
<fieldDescription><![CDATA[items]]></fieldDescription>
</field>
<field name="requirement" class="info.bukova.isspst.data.Requirement">
<fieldDescription><![CDATA[requirement]]></fieldDescription>
</field>
<field name="totalInvoiced" class="java.math.BigDecimal">
<fieldDescription><![CDATA[totalInvoiced]]></fieldDescription>
</field>
<field name="requirement.sumTotal" class="java.math.BigDecimal">
<fieldDescription><![CDATA[requirement.sumTotal]]></fieldDescription>
</field>
<field name="requirement.workgroup" class="info.bukova.isspst.data.Workgroup">
<fieldDescription><![CDATA[requirement.workgroup]]></fieldDescription>
</field>
<field name="requirement.reqDate" class="java.util.Date">
<fieldDescription><![CDATA[requirement.reqDate]]></fieldDescription>
</field>
<field name="requirement.ownedBy" class="info.bukova.isspst.data.User">
<fieldDescription><![CDATA[requirement.ownedBy]]></fieldDescription>
</field>
<field name="requirement.numser" class="java.lang.String">
<fieldDescription><![CDATA[requirement.numser]]></fieldDescription>
</field>
<field name="requirement.authorization" class="java.util.List">
<fieldDescription><![CDATA[requirement.authorization]]></fieldDescription>
</field>
<field name="requirement.centre" class="info.bukova.isspst.data.Workgroup">
<fieldDescription><![CDATA[requirement.centre]]></fieldDescription>
</field>
<field name="requirement.description" class="java.lang.String">
<fieldDescription><![CDATA[requirement.description]]></fieldDescription>
</field>
<field name="invoiceNumbers" class="java.lang.String">
<fieldDescription><![CDATA[invoiceNumbers]]></fieldDescription>
</field>
<variable name="Variable_1" class="java.lang.String"/>
<background>
<band splitType="Stretch"/>
</background>
<title>
<band height="57">
<image onErrorType="Blank">
<reportElement x="0" y="0" width="100" height="54" uuid="42476349-f707-4035-b93e-23e50fc5e82e">
<printWhenExpression><![CDATA[$P{P_LOGO} != null]]></printWhenExpression>
</reportElement>
<imageExpression><![CDATA[$P{P_LOGO}]]></imageExpression>
</image>
<textField>
<reportElement x="113" y="0" width="689" height="46" uuid="408b5871-7dc2-4d87-a432-f3cc8df0f823"/>
<textElement textAlignment="Center">
<font size="16" isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250"/>
</textElement>
<textFieldExpression><![CDATA[$P{P_MAIN_ADDRESS}]]></textFieldExpression>
</textField>
</band>
</title>
<pageHeader>
<band height="23" splitType="Stretch">
<staticText>
<reportElement x="0" y="0" width="802" height="20" uuid="f2f383c9-f1b1-4222-8b22-7c816fff5ad5"/>
<textElement textAlignment="Center">
<font size="12" isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Přehled o protokolech předběžné kontroly - materiál a služby]]></text>
</staticText>
</band>
</pageHeader>
<columnHeader>
<band height="19" splitType="Stretch">
<staticText>
<reportElement x="0" y="2" width="59" height="16" uuid="253a78a3-4a58-4c75-b285-e5174e3884b8"/>
<textElement>
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<text><![CDATA[Poř. číslo]]></text>
</staticText>
<staticText>
<reportElement x="59" y="2" width="121" height="16" uuid="2e7488ea-d0ae-4a5a-9045-559b8eb50e5c"/>
<textElement>
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<text><![CDATA[Vytvořil]]></text>
</staticText>
<staticText>
<reportElement x="180" y="2" width="74" height="16" uuid="b56f7ea9-b643-4a74-885a-75994fa440cc"/>
<textElement>
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<text><![CDATA[Datum]]></text>
</staticText>
<staticText>
<reportElement x="254" y="2" width="182" height="16" uuid="3726c2fd-16b7-4363-bc39-a8ff67cd2cae"/>
<textElement>
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<text><![CDATA[Text]]></text>
</staticText>
<staticText>
<reportElement x="512" y="2" width="104" height="16" uuid="efee783f-86e7-43dc-8b00-7f13d45c7575"/>
<textElement>
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<text><![CDATA[Středisko]]></text>
</staticText>
<staticText>
<reportElement x="616" y="2" width="100" height="16" uuid="1440fa7a-3099-4c7b-ad57-f7b2b30d17f4"/>
<textElement>
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<text><![CDATA[Komise]]></text>
</staticText>
<staticText>
<reportElement x="436" y="2" width="76" height="16" uuid="08d27f94-b848-410e-ba5d-4e4fc7d00c6f"/>
<textElement>
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<text><![CDATA[Částka]]></text>
</staticText>
<staticText>
<reportElement x="716" y="2" width="85" height="16" uuid="866008ad-b265-4ea7-b016-4bbf8278c66e"/>
<textElement>
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<text><![CDATA[Fakturováno]]></text>
</staticText>
<line>
<reportElement x="0" y="18" width="801" height="1" uuid="a121ad98-744c-4865-b724-951ccaae90f1"/>
</line>
<line>
<reportElement x="0" y="0" width="801" height="1" uuid="fb3d8c46-4bb2-4873-ba3e-fa6c7f524e9f"/>
</line>
<line>
<reportElement x="-1" y="0" width="1" height="19" uuid="db8f3dfc-c7fe-4fc1-ab67-f347d708dbb4"/>
</line>
<line>
<reportElement x="801" y="0" width="1" height="19" uuid="339d76ce-0b71-4944-ba2b-4f50b752c0f7"/>
</line>
</band>
</columnHeader>
<detail>
<band height="62" splitType="Stretch">
<textField>
<reportElement x="0" y="0" width="59" height="30" uuid="a15af2dc-b301-4831-b22b-475a608df8da"/>
<textFieldExpression><![CDATA[$F{requirement.numser}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="59" y="0" width="121" height="30" uuid="4d368fd8-8086-4c70-b4a1-f76038a988e4"/>
<textFieldExpression><![CDATA[""+$F{requirement.ownedBy}]]></textFieldExpression>
</textField>
<textField pattern="d.M.yyyy">
<reportElement x="180" y="0" width="74" height="30" uuid="29e3191d-1caf-4561-8d01-37fa20562dfe"/>
<textFieldExpression><![CDATA[$F{requirement.reqDate}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="254" y="0" width="182" height="30" uuid="6c8111ea-c0dd-47de-bfb2-67778119e133"/>
<textFieldExpression><![CDATA[$F{requirement.description}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="512" y="0" width="104" height="30" uuid="1c6551c1-3060-4d1f-844b-3b809a0e1b25"/>
<textElement>
<font pdfEncoding="Cp1250"/>
</textElement>
<textFieldExpression><![CDATA[""+$F{requirement.centre}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="616" y="0" width="106" height="30" uuid="140dc16a-7bdd-4705-9dc1-b2485230884c"/>
<textFieldExpression><![CDATA[$F{requirement.workgroup}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="722" y="0" width="78" height="30" uuid="b3d6b361-5940-48a1-81f1-769c7f5c93ba">
<property name="local_mesure_unitwidth" value="pixel"/>
<property name="com.jaspersoft.studio.unit.width" value="px"/>
</reportElement>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{totalInvoiced}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="72" y="46" width="730" height="14" uuid="b6b32169-0b11-4978-94b0-db4d763ba2e7"/>
<textFieldExpression><![CDATA[$F{invoiceNumbers}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="164" y="32" width="142" height="14" uuid="ab6c4887-b42e-448c-985f-6bec6541b752"/>
<textFieldExpression><![CDATA[""+((info.bukova.isspst.data.AuthItem)$F{requirement.authorization}.get($F{requirement.authorization}.size()-3)).getApprover().toString()]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="6" y="32" width="100" height="14" uuid="aca43869-02d9-4f75-9eba-e801ceedfe00"/>
<text><![CDATA[Příkazce operace:]]></text>
</staticText>
<staticText>
<reportElement x="329" y="32" width="96" height="14" uuid="e9776606-e2db-4e33-99d1-bc689f269ecd"/>
<text><![CDATA[Správce rozpočtu:]]></text>
</staticText>
<textField pattern="d.M.yyyy">
<reportElement x="106" y="32" width="58" height="14" uuid="b26bac22-064f-4016-bd15-a5c43f729bf0"/>
<textFieldExpression><![CDATA[((info.bukova.isspst.data.AuthItem)$F{requirement.authorization}.get($F{requirement.authorization}.size()-3)).getAuthDate()]]></textFieldExpression>
</textField>
<textField pattern="d.M.yyyy">
<reportElement x="425" y="32" width="57" height="14" uuid="47fbad6f-267e-4d00-83d2-e84c3b3c8a1e"/>
<textFieldExpression><![CDATA[((info.bukova.isspst.data.AuthItem)$F{requirement.authorization}.get($F{requirement.authorization}.size()-1)).getAuthDate()]]></textFieldExpression>
</textField>
<textField>
<reportElement x="482" y="32" width="142" height="14" uuid="fa5d5931-5dd2-40ab-bf9b-3cc83b7e3eb6"/>
<textFieldExpression><![CDATA[""+((info.bukova.isspst.data.AuthItem)$F{requirement.authorization}.get($F{requirement.authorization}.size()-1)).getApprover().toString()]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="6" y="46" width="66" height="14" uuid="f08bf6f4-5b87-41df-8d7b-f04f673cb274"/>
<text><![CDATA[Čísla faktur:]]></text>
</staticText>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement x="436" y="0" width="73" height="30" uuid="329bacea-bec5-4ecf-894c-25bef2ad2020">
<property name="local_mesure_unitwidth" value="pixel"/>
<property name="com.jaspersoft.studio.unit.width" value="px"/>
</reportElement>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{requirement.sumTotal}]]></textFieldExpression>
</textField>
<line>
<reportElement x="0" y="61" width="801" height="1" uuid="720248ac-87bb-418f-a9c3-45b0f6f07c10"/>
</line>
<line>
<reportElement x="-1" y="0" width="1" height="62" uuid="d1d8fc07-5bbe-4f11-bc89-90e8b20f1557"/>
</line>
<line>
<reportElement x="801" y="0" width="1" height="62" uuid="f83f5852-bf4f-44d4-8663-d38232a16811"/>
</line>
<line>
<reportElement x="6" y="30" width="787" height="1" uuid="aa982c09-4682-4cb3-aae6-33fd2e1edea6"/>
<graphicElement>
<pen lineStyle="Dashed"/>
</graphicElement>
</line>
</band>
</detail>
<pageFooter>
<band height="15" splitType="Stretch">
<textField>
<reportElement x="0" y="2" width="800" height="12" uuid="9f84e90a-2fbf-4026-9d8b-8accd8bbc933"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
</band>
</pageFooter>
</jasperReport>

@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 5.6.2.final using JasperReports Library version 5.6.1 -->
<!-- 2016-03-06T21:46:27 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="tripBill" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="10" bottomMargin="20" uuid="f59e8277-a431-4cdc-abaa-c82c1cf193af">
<property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="0"/>
@ -59,98 +57,100 @@
<band splitType="Stretch"/>
</background>
<pageHeader>
<band height="243" splitType="Stretch">
<band height="237" splitType="Stretch">
<staticText>
<reportElement x="10" y="61" width="143" height="20" uuid="6e60bd03-48b9-4555-91ab-757532d93e6a"/>
<reportElement uuid="6e60bd03-48b9-4555-91ab-757532d93e6a" x="10" y="61" width="143" height="20"/>
<textElement>
<font isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Příjmení, jméno, titul:]]></text>
</staticText>
<staticText>
<reportElement x="10" y="81" width="100" height="20" uuid="448ba3e9-dc29-45c4-b384-3e597d036134"/>
<reportElement uuid="448ba3e9-dc29-45c4-b384-3e597d036134" x="10" y="81" width="100" height="20"/>
<textElement>
<font isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Bydliště:]]></text>
</staticText>
<textField>
<reportElement x="196" y="61" width="181" height="20" uuid="62d493f1-c058-42e6-b2f5-1a691ac9e5db"/>
<reportElement uuid="62d493f1-c058-42e6-b2f5-1a691ac9e5db" x="196" y="61" width="181" height="20"/>
<textElement>
<font isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{ownedBy}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="143" y="126" width="143" height="27" uuid="86395201-6c9d-4584-a8a3-eb46dd4af411"/>
<reportElement uuid="86395201-6c9d-4584-a8a3-eb46dd4af411" x="143" y="106" width="143" height="27"/>
<textElement textAlignment="Center"/>
<text><![CDATA[Místo jednání]]></text>
</staticText>
<textField>
<reportElement x="0" y="154" width="143" height="20" uuid="f62e3881-5a60-45ed-997b-71f5e1c25b28"/>
<reportElement uuid="f62e3881-5a60-45ed-997b-71f5e1c25b28" x="0" y="134" width="143" height="20"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{requirement.from}]]></textFieldExpression>
</textField>
<line>
<reportElement x="143" y="124" width="1" height="75" uuid="67730ab5-6550-4a51-8daa-ef3c509d44ad"/>
<reportElement uuid="67730ab5-6550-4a51-8daa-ef3c509d44ad" x="143" y="104" width="1" height="75"/>
</line>
<line>
<reportElement x="0" y="199" width="572" height="1" uuid="98195ce4-de92-4643-bd50-f63d553a6235"/>
<reportElement uuid="98195ce4-de92-4643-bd50-f63d553a6235" x="0" y="179" width="572" height="1"/>
</line>
<staticText>
<reportElement x="429" y="126" width="143" height="26" uuid="4827d565-87ea-4648-a5b0-6473e8814bb1"/>
<reportElement uuid="4827d565-87ea-4648-a5b0-6473e8814bb1" x="429" y="106" width="143" height="26"/>
<textElement textAlignment="Center"/>
<text><![CDATA[Konec cesty (místo, datum)]]></text>
</staticText>
<staticText>
<reportElement x="0" y="126" width="143" height="27" uuid="76f85619-891b-44f4-8c7f-d1ceba0bef3c"/>
<reportElement uuid="76f85619-891b-44f4-8c7f-d1ceba0bef3c" x="0" y="106" width="143" height="27"/>
<textElement textAlignment="Center"/>
<text><![CDATA[Počátek cesty (místo, datum, hodina)]]></text>
</staticText>
<line>
<reportElement x="428" y="124" width="1" height="75" uuid="e5c8f5ac-f7b5-4235-ba39-566b94bb6382"/>
<reportElement uuid="e5c8f5ac-f7b5-4235-ba39-566b94bb6382" x="428" y="104" width="1" height="75"/>
</line>
<textField pattern="dd. MM. yyyy">
<reportElement x="429" y="174" width="143" height="20" uuid="f758abfe-1e97-4ac0-a7e8-293438ef1d78"/>
<reportElement uuid="f758abfe-1e97-4ac0-a7e8-293438ef1d78" x="429" y="154" width="143" height="20"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{requirement.endDate}]]></textFieldExpression>
</textField>
<textField pattern="HH:mm">
<reportElement x="90" y="174" width="53" height="20" uuid="0db3d6e2-36e3-4c66-b4a1-2cdc555b2831"/>
<reportElement uuid="0db3d6e2-36e3-4c66-b4a1-2cdc555b2831" x="90" y="154" width="53" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$F{requirement.tripDate}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="286" y="154" width="143" height="40" uuid="76000adf-2d9c-4c56-9471-51bc278ca433"/>
<reportElement uuid="76000adf-2d9c-4c56-9471-51bc278ca433" x="286" y="134" width="143" height="40"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{requirement.description}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="143" y="154" width="143" height="20" uuid="4b1e7687-d605-46bb-aa2b-08637cff229a"/>
<reportElement uuid="4b1e7687-d605-46bb-aa2b-08637cff229a" x="143" y="134" width="143" height="20"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{requirement.to}]]></textFieldExpression>
</textField>
<line>
<reportElement x="285" y="124" width="1" height="75" uuid="70db0a7e-650a-4324-9c62-f75bcbdcbb8d"/>
<reportElement uuid="70db0a7e-650a-4324-9c62-f75bcbdcbb8d" x="285" y="104" width="1" height="75"/>
</line>
<staticText>
<reportElement x="286" y="125" width="143" height="27" uuid="d52c698d-07c8-4740-a791-2df4f5cb1c6e"/>
<reportElement uuid="d52c698d-07c8-4740-a791-2df4f5cb1c6e" x="286" y="105" width="143" height="27"/>
<textElement textAlignment="Center"/>
<text><![CDATA[Účel cesty]]></text>
</staticText>
<textField pattern="dd. MM. yyyy">
<reportElement x="0" y="174" width="90" height="20" uuid="88c08297-c140-410a-8980-02416ec62475"/>
<reportElement uuid="88c08297-c140-410a-8980-02416ec62475" x="0" y="154" width="90" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$F{requirement.tripDate}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="429" y="154" width="143" height="20" uuid="21724842-be95-48ba-a811-0bf7a862ae3f"/>
<reportElement uuid="21724842-be95-48ba-a811-0bf7a862ae3f" x="429" y="134" width="143" height="20"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$F{requirement.end}]]></textFieldExpression>
</textField>
<line>
<reportElement x="0" y="123" width="572" height="1" uuid="dd38c006-cfb4-4b8f-abf8-986222d3bd27"/>
<reportElement uuid="dd38c006-cfb4-4b8f-abf8-986222d3bd27" x="0" y="103" width="572" height="1"/>
</line>
<staticText>
<reportElement x="101" y="16" width="472" height="39" uuid="831faf0e-2b31-47df-9ccf-4bf1c5bcdcbd"/>
<reportElement uuid="831faf0e-2b31-47df-9ccf-4bf1c5bcdcbd" x="101" y="16" width="472" height="39"/>
<textElement textAlignment="Center" verticalAlignment="Bottom">
<font size="14" isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
</textElement>
@ -158,41 +158,41 @@
tuzemské pracovní cesty]]></text>
</staticText>
<staticText>
<reportElement x="1" y="201" width="571" height="20" uuid="6990eca1-ad98-4545-b211-1892d039bc74"/>
<reportElement uuid="6990eca1-ad98-4545-b211-1892d039bc74" x="1" y="186" width="571" height="20"/>
<textElement textAlignment="Center">
<font size="14" isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[VYÚČTOVÁNÍ PRACOVNÍ CESTY]]></text>
</staticText>
<staticText>
<reportElement x="0" y="222" width="296" height="20" uuid="9b5868e4-5034-4141-b470-8c199e81ee4e"/>
<reportElement uuid="9b5868e4-5034-4141-b470-8c199e81ee4e" x="0" y="209" width="296" height="20"/>
<textElement>
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<text><![CDATA[Zpráva o výsledku pracovní cesty byla podána dne:]]></text>
</staticText>
<textField pattern="dd. MM. yyyy" isBlankWhenNull="true">
<reportElement x="296" y="221" width="144" height="20" uuid="d7b2da96-3040-4a89-9380-0dbb55068601"/>
<reportElement uuid="d7b2da96-3040-4a89-9380-0dbb55068601" x="296" y="206" width="144" height="20"/>
<textElement textAlignment="Left"/>
<textFieldExpression><![CDATA[$F{resultMessageDate}]]></textFieldExpression>
</textField>
<line>
<reportElement x="0" y="242" width="572" height="1" uuid="c67f7840-5e38-4eed-ab3f-e4907ac33b5c"/>
<reportElement uuid="c67f7840-5e38-4eed-ab3f-e4907ac33b5c" x="0" y="236" width="572" height="1"/>
</line>
<line>
<reportElement x="0" y="55" width="571" height="1" uuid="e3530085-daa8-4675-bf3a-d98c775be07e"/>
<reportElement uuid="e3530085-daa8-4675-bf3a-d98c775be07e" x="0" y="55" width="571" height="1"/>
</line>
<line>
<reportElement x="-1" y="0" width="572" height="1" uuid="47e4e70d-fb5f-4266-889a-4149c71efa42"/>
<reportElement uuid="47e4e70d-fb5f-4266-889a-4149c71efa42" x="-1" y="0" width="572" height="1"/>
</line>
<line>
<reportElement x="-1" y="1" width="1" height="242" uuid="d4738137-17c1-4721-b222-7187988c1b06"/>
<reportElement uuid="d4738137-17c1-4721-b222-7187988c1b06" x="-1" y="1" width="1" height="236"/>
</line>
<line>
<reportElement x="571" y="1" width="1" height="242" uuid="bf83547c-60d9-4f95-a5f1-db0763ba17cb"/>
<reportElement uuid="bf83547c-60d9-4f95-a5f1-db0763ba17cb" x="571" y="1" width="1" height="236"/>
</line>
<textField isBlankWhenNull="true">
<reportElement x="196" y="82" width="375" height="20" uuid="8af60406-55bf-46f0-82e9-865dc9edbdb4">
<reportElement uuid="8af60406-55bf-46f0-82e9-865dc9edbdb4" x="196" y="82" width="375" height="20">
<printWhenExpression><![CDATA[$F{ownedBy.address} != null]]></printWhenExpression>
</reportElement>
<textElement>
@ -201,39 +201,31 @@ tuzemské pracovní cesty]]></text>
<textFieldExpression><![CDATA[$F{ownedBy.address}]]></textFieldExpression>
</textField>
<image onErrorType="Blank">
<reportElement x="1" y="1" width="100" height="54" uuid="031517a3-12c1-4094-9da4-59d82aec9243">
<reportElement uuid="031517a3-12c1-4094-9da4-59d82aec9243" x="1" y="1" width="100" height="54">
<printWhenExpression><![CDATA[$P{P_LOGO} != null]]></printWhenExpression>
</reportElement>
<imageExpression><![CDATA[$P{P_LOGO}]]></imageExpression>
</image>
<textField>
<reportElement x="101" y="1" width="470" height="20" uuid="2541cdb2-9c7e-4d10-aa30-af0d1f5e0e2f"/>
<reportElement uuid="2541cdb2-9c7e-4d10-aa30-af0d1f5e0e2f" x="101" y="1" width="470" height="20"/>
<textElement textAlignment="Center">
<font isBold="true" pdfEncoding="Cp1250"/>
</textElement>
<textFieldExpression><![CDATA[$P{P_MAIN_ADDRESS}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="11" y="106" width="264" height="16" uuid="ee0d1e0f-ff31-4cce-9afd-dd03f326ff2d"/>
<text><![CDATA[Souhlasím s pracovní cestou a s jejími podmínkami]]></text>
</staticText>
<textField pattern="dd. MM. yyyy">
<reportElement x="276" y="106" width="124" height="16" uuid="0705af53-b7a9-4a9e-80df-55f9af4e5b17"/>
<textFieldExpression><![CDATA[$F{requirement.reqDate}]]></textFieldExpression>
</textField>
</band>
</pageHeader>
<detail>
<band height="64" splitType="Stretch">
<subreport>
<reportElement x="-1" y="0" width="575" height="63" uuid="762b2a39-b6f6-49cf-a9d2-8e152a791daf"/>
<reportElement uuid="762b2a39-b6f6-49cf-a9d2-8e152a791daf" x="-1" y="0" width="575" height="63"/>
<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{billItems})]]></dataSourceExpression>
<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "tripBillItems.jasper"]]></subreportExpression>
</subreport>
</band>
<band height="168">
<staticText>
<reportElement x="242" y="61" width="22" height="15" uuid="791d16f6-690b-4aae-8ac1-d3c3ade837e9">
<reportElement uuid="791d16f6-690b-4aae-8ac1-d3c3ade837e9" x="242" y="61" width="22" height="15">
<printWhenExpression><![CDATA[!$F{freeHousing}]]></printWhenExpression>
</reportElement>
<textElement>
@ -242,7 +234,7 @@ tuzemské pracovní cesty]]></text>
<text><![CDATA[NE]]></text>
</staticText>
<staticText>
<reportElement x="241" y="2" width="23" height="20" uuid="4b4103f4-082a-4cfb-bbaa-ad41f187e53a">
<reportElement uuid="4b4103f4-082a-4cfb-bbaa-ad41f187e53a" x="241" y="2" width="23" height="20">
<printWhenExpression><![CDATA[$F{freeMeals}]]></printWhenExpression>
</reportElement>
<textElement>
@ -251,26 +243,26 @@ tuzemské pracovní cesty]]></text>
<text><![CDATA[ANO]]></text>
</staticText>
<textField pattern="dd. MM. yyyy" isBlankWhenNull="true">
<reportElement x="345" y="131" width="100" height="13" uuid="bf1013d3-8037-4f6f-9c23-6e1d801afbeb"/>
<reportElement uuid="bf1013d3-8037-4f6f-9c23-6e1d801afbeb" x="345" y="131" width="100" height="13"/>
<textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{modified}]]></textFieldExpression>
</textField>
<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
<reportElement x="477" y="2" width="56" height="43" uuid="d5aa48e6-f801-4633-b18b-ccc7358da1e3"/>
<reportElement uuid="d5aa48e6-f801-4633-b18b-ccc7358da1e3" x="477" y="2" width="56" height="43"/>
<textElement textAlignment="Right" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{requirement.downPayment}]]></textFieldExpression>
</textField>
<textField pattern="###0.00;-###0.00">
<reportElement x="477" y="46" width="56" height="44" uuid="93cba14d-18d2-4279-9a8d-86f795291879"/>
<reportElement uuid="93cba14d-18d2-4279-9a8d-86f795291879" x="477" y="46" width="56" height="44"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="242" y="2" width="22" height="20" uuid="dae29735-a372-4c9b-86e4-43507632c08a">
<reportElement uuid="dae29735-a372-4c9b-86e4-43507632c08a" x="242" y="2" width="22" height="20">
<printWhenExpression><![CDATA[!$F{freeMeals}]]></printWhenExpression>
</reportElement>
<textElement>
@ -279,14 +271,14 @@ tuzemské pracovní cesty]]></text>
<text><![CDATA[NE]]></text>
</staticText>
<subreport>
<reportElement x="0" y="22" width="241" height="40" uuid="b2e1d029-267f-4363-9411-716a0db9b048">
<reportElement uuid="b2e1d029-267f-4363-9411-716a0db9b048" x="0" y="22" width="241" height="40">
<printWhenExpression><![CDATA[$F{freeMeals}]]></printWhenExpression>
</reportElement>
<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{billItems})]]></dataSourceExpression>
<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "tripBillFreeMeals.jasper"]]></subreportExpression>
</subreport>
<staticText>
<reportElement x="0" y="-1" width="241" height="23" uuid="0be16cf4-2ad5-453b-9933-a696979331a1"/>
<reportElement uuid="0be16cf4-2ad5-453b-9933-a696979331a1" x="0" y="-1" width="241" height="23"/>
<textElement>
<font size="8"/>
</textElement>
@ -294,61 +286,61 @@ tuzemské pracovní cesty]]></text>
(vyberte pro každý den zvlášť počet hlavních jídel (S-O-V)]]></text>
</staticText>
<line>
<reportElement x="-1" y="90" width="572" height="1" uuid="4e40e52b-207e-404e-b4f3-f0984af588c1"/>
<reportElement uuid="4e40e52b-207e-404e-b4f3-f0984af588c1" x="-1" y="90" width="572" height="1"/>
</line>
<line>
<reportElement x="-1" y="-1" width="1" height="168" uuid="620dbf9c-0990-4895-963e-bd3759e64202"/>
<reportElement uuid="620dbf9c-0990-4895-963e-bd3759e64202" x="-1" y="-1" width="1" height="168"/>
</line>
<line>
<reportElement x="334" y="144" width="237" height="1" uuid="db423f1f-b9c6-49ec-8336-fa06680c9dad"/>
<reportElement uuid="db423f1f-b9c6-49ec-8336-fa06680c9dad" x="334" y="144" width="237" height="1"/>
</line>
<staticText>
<reportElement x="1" y="106" width="570" height="15" uuid="c83e0050-7bac-43fa-8182-728243f702c2"/>
<reportElement uuid="c83e0050-7bac-43fa-8182-728243f702c2" x="1" y="106" width="570" height="15"/>
<textElement textAlignment="Center">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<text><![CDATA[Prohlašuji, že jsem všechny údaje uvedl úplně a správně.]]></text>
</staticText>
<line>
<reportElement x="291" y="45" width="281" height="1" uuid="08b18c85-1c4f-4b8d-bc0b-ac3df196a182"/>
<reportElement uuid="08b18c85-1c4f-4b8d-bc0b-ac3df196a182" x="291" y="45" width="281" height="1"/>
</line>
<staticText>
<reportElement x="1" y="91" width="570" height="15" uuid="55cde79e-3253-4ff8-8387-f2f5f959bc06"/>
<reportElement uuid="55cde79e-3253-4ff8-8387-f2f5f959bc06" x="1" y="91" width="570" height="15"/>
<textElement textAlignment="Center"/>
<text><![CDATA[K vyúčtování pracovní cesty připojuji počet příloh]]></text>
</staticText>
<line>
<reportElement x="-1" y="167" width="572" height="1" uuid="452bba4b-d293-4253-92c3-5fa58f58ea53"/>
<reportElement uuid="452bba4b-d293-4253-92c3-5fa58f58ea53" x="-1" y="167" width="572" height="1"/>
</line>
<staticText>
<reportElement x="0" y="61" width="242" height="15" uuid="5457410d-912f-47f9-a15f-2c15dadd6c57"/>
<reportElement uuid="5457410d-912f-47f9-a15f-2c15dadd6c57" x="0" y="61" width="242" height="15"/>
<textElement>
<font size="8"/>
</textElement>
<text><![CDATA[Ubytování poskytnuto bezplatně]]></text>
</staticText>
<staticText>
<reportElement x="291" y="2" width="186" height="43" uuid="20f38e87-a1bd-4d02-8742-4ce3a6b357bf"/>
<reportElement uuid="20f38e87-a1bd-4d02-8742-4ce3a6b357bf" x="291" y="2" width="186" height="43"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<text><![CDATA[Záloha]]></text>
</staticText>
<line>
<reportElement x="290" y="-4" width="1" height="95" uuid="6f7577a1-edc7-491a-a803-a76f8b84b13d"/>
<reportElement uuid="6f7577a1-edc7-491a-a803-a76f8b84b13d" x="290" y="-4" width="1" height="95"/>
</line>
<staticText>
<reportElement x="291" y="46" width="186" height="44" uuid="eae56af6-8fd9-45e1-8463-282939b67f05"/>
<reportElement uuid="eae56af6-8fd9-45e1-8463-282939b67f05" x="291" y="46" width="186" height="44"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<text><![CDATA[Doplatek - přeplatek]]></text>
</staticText>
<staticText>
<reportElement x="1" y="76" width="240" height="15" uuid="c200a476-63ba-4c3d-8e17-298b5928b0dd"/>
<reportElement uuid="c200a476-63ba-4c3d-8e17-298b5928b0dd" x="1" y="76" width="240" height="15"/>
<textElement>
<font size="8"/>
</textElement>
<text><![CDATA[Volná - zlevněná jízdenka]]></text>
</staticText>
<staticText>
<reportElement x="1" y="131" width="305" height="30" uuid="aea69aee-5394-4c6e-82da-9fef6a1fe2b9"/>
<reportElement uuid="aea69aee-5394-4c6e-82da-9fef6a1fe2b9" x="1" y="131" width="305" height="30"/>
<textElement>
<font size="8"/>
</textElement>
@ -357,7 +349,7 @@ tuzemské pracovní cesty]]></text>
3) Počet km uvádějte jen při použití vlastního dopravního prostředku.]]></text>
</staticText>
<staticText>
<reportElement x="243" y="76" width="21" height="15" uuid="d4de606e-fad8-4216-b467-2d8446cc3747">
<reportElement uuid="d4de606e-fad8-4216-b467-2d8446cc3747" x="243" y="76" width="21" height="15">
<printWhenExpression><![CDATA[$F{freeCarfare}]]></printWhenExpression>
</reportElement>
<textElement>
@ -366,15 +358,15 @@ tuzemské pracovní cesty]]></text>
<text><![CDATA[ANO]]></text>
</staticText>
<staticText>
<reportElement x="334" y="146" width="237" height="15" uuid="ff356c6e-d796-4148-b20f-114dde6e9340"/>
<reportElement uuid="ff356c6e-d796-4148-b20f-114dde6e9340" x="334" y="146" width="237" height="15"/>
<textElement textAlignment="Center"/>
<text><![CDATA[Datum a podpis účtovatele ]]></text>
</staticText>
<line>
<reportElement x="571" y="-1" width="1" height="169" uuid="afefe2a2-4c7b-4e62-892f-5c8fb68f8a0f"/>
<reportElement uuid="afefe2a2-4c7b-4e62-892f-5c8fb68f8a0f" x="571" y="-1" width="1" height="169"/>
</line>
<staticText>
<reportElement x="243" y="61" width="21" height="15" uuid="4c309095-9cbb-49e7-8fe5-7a8f231c130f">
<reportElement uuid="4c309095-9cbb-49e7-8fe5-7a8f231c130f" x="243" y="61" width="21" height="15">
<printWhenExpression><![CDATA[$F{freeHousing}]]></printWhenExpression>
</reportElement>
<textElement>
@ -383,7 +375,7 @@ tuzemské pracovní cesty]]></text>
<text><![CDATA[ANO]]></text>
</staticText>
<staticText>
<reportElement x="242" y="76" width="22" height="15" uuid="18b2ff27-e584-4352-98c8-0c642609b5e1">
<reportElement uuid="18b2ff27-e584-4352-98c8-0c642609b5e1" x="242" y="76" width="22" height="15">
<printWhenExpression><![CDATA[!$F{freeCarfare}]]></printWhenExpression>
</reportElement>
<textElement>
@ -396,149 +388,152 @@ tuzemské pracovní cesty]]></text>
<summary>
<band height="194" splitType="Prevent">
<staticText>
<reportElement x="281" y="5" width="30" height="15" uuid="58e4cf15-a8e1-4b4d-b491-ad4a1825f0a3"/>
<reportElement uuid="58e4cf15-a8e1-4b4d-b491-ad4a1825f0a3" x="281" y="5" width="30" height="15"/>
<textElement/>
<text><![CDATA[číslo:]]></text>
</staticText>
<staticText>
<reportElement x="1" y="150" width="130" height="20" uuid="6609a389-adc3-4fa1-8aaa-532805d293a4"/>
<reportElement uuid="6609a389-adc3-4fa1-8aaa-532805d293a4" x="1" y="150" width="130" height="20"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Datum a podpis příjemce]]></text>
</staticText>
<staticText>
<reportElement x="292" y="170" width="129" height="20" uuid="45ed3989-a9f1-4323-bba2-0cd2e5dc2365"/>
<reportElement uuid="45ed3989-a9f1-4323-bba2-0cd2e5dc2365" x="292" y="170" width="129" height="20"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[(datum, podpis)]]></text>
</staticText>
<line>
<reportElement x="311" y="19" width="252" height="1" uuid="7a26d915-835c-48f7-ab2d-ec53b330c9fe"/>
<reportElement uuid="7a26d915-835c-48f7-ab2d-ec53b330c9fe" x="311" y="19" width="252" height="1"/>
</line>
<staticText>
<reportElement x="438" y="150" width="130" height="20" uuid="b3c1a046-6cca-4cb7-a8e1-3c71dd3dc815"/>
<reportElement uuid="b3c1a046-6cca-4cb7-a8e1-3c71dd3dc815" x="438" y="150" width="130" height="20"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Příkazce operací]]></text>
</staticText>
<line>
<reportElement x="438" y="149" width="130" height="1" uuid="65725040-d1fd-489f-86ee-b0a0082d5576"/>
<reportElement uuid="65725040-d1fd-489f-86ee-b0a0082d5576" x="438" y="149" width="130" height="1"/>
</line>
<staticText>
<reportElement x="1" y="20" width="280" height="15" uuid="8f4864f7-b60a-4b4c-a724-451a89da1f2f"/>
<reportElement uuid="8f4864f7-b60a-4b4c-a724-451a89da1f2f" x="1" y="20" width="280" height="15"/>
<textElement>
<font pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Účtovaná náhrada byla přezkoušena a upravena na Kč:]]></text>
</staticText>
<line>
<reportElement x="291" y="149" width="130" height="1" uuid="2665a0ca-420d-46dc-9085-522ed3950c44"/>
<reportElement uuid="2665a0ca-420d-46dc-9085-522ed3950c44" x="291" y="149" width="130" height="1"/>
</line>
<line>
<reportElement x="106" y="49" width="457" height="1" uuid="b239b59d-42f0-44d1-b753-cbe1fd0f577b"/>
<reportElement uuid="b239b59d-42f0-44d1-b753-cbe1fd0f577b" x="106" y="49" width="457" height="1"/>
</line>
<line>
<reportElement x="106" y="66" width="457" height="1" uuid="4cd4e501-5b15-48ba-ac27-766e2292d270"/>
<reportElement uuid="4cd4e501-5b15-48ba-ac27-766e2292d270" x="106" y="66" width="457" height="1"/>
</line>
<staticText>
<reportElement x="1" y="51" width="105" height="15" uuid="970cbe95-7b9f-4769-9ab1-59a4018c84ac"/>
<reportElement uuid="970cbe95-7b9f-4769-9ab1-59a4018c84ac" x="1" y="51" width="105" height="15"/>
<textElement>
<font pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Doplatekpřeplatek:]]></text>
</staticText>
<staticText>
<reportElement x="1" y="35" width="105" height="15" uuid="e95b083f-374c-4f73-b903-b0f6bd5891b7"/>
<reportElement uuid="e95b083f-374c-4f73-b903-b0f6bd5891b7" x="1" y="35" width="105" height="15"/>
<textElement>
<font pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Vyplacená záloha:]]></text>
</staticText>
<staticText>
<reportElement x="146" y="170" width="130" height="20" uuid="8df04d2f-8a01-4986-9bb9-6c9cb849e6b6"/>
<reportElement uuid="8df04d2f-8a01-4986-9bb9-6c9cb849e6b6" x="146" y="170" width="130" height="20"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[(hlavní účetní)]]></text>
</staticText>
<line>
<reportElement x="281" y="35" width="282" height="1" uuid="37c5882d-8568-42d8-bbc2-68ef3ceb01c3"/>
<reportElement uuid="37c5882d-8568-42d8-bbc2-68ef3ceb01c3" x="281" y="35" width="282" height="1"/>
</line>
<staticText>
<reportElement x="1" y="170" width="130" height="20" uuid="1a55dac0-377d-4653-85ba-dbc376f14ff1"/>
<reportElement uuid="1a55dac0-377d-4653-85ba-dbc376f14ff1" x="1" y="170" width="130" height="20"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[(průkaz totožnosti)]]></text>
</staticText>
<staticText>
<reportElement x="1" y="5" width="237" height="15" uuid="2ad403e0-6c9a-4eb6-a8fb-abca20fca185"/>
<reportElement uuid="2ad403e0-6c9a-4eb6-a8fb-abca20fca185" x="1" y="5" width="237" height="15"/>
<textElement>
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[VÝDAJOVÝPŘÍJMOVÝ POKLADNÍ DOKLAD]]></text>
</staticText>
<line>
<reportElement x="146" y="149" width="130" height="1" uuid="c2618aa5-76df-461b-b168-aa587ce4a7ec"/>
<reportElement uuid="c2618aa5-76df-461b-b168-aa587ce4a7ec" x="146" y="149" width="130" height="1"/>
</line>
<line>
<reportElement x="1" y="149" width="130" height="1" uuid="e583f82d-b26d-4b13-a668-5505b8783a2a"/>
<reportElement uuid="e583f82d-b26d-4b13-a668-5505b8783a2a" x="1" y="149" width="130" height="1"/>
</line>
<staticText>
<reportElement x="438" y="170" width="130" height="20" uuid="0d64c6ec-3c2a-464e-8068-171df105af12"/>
<reportElement uuid="0d64c6ec-3c2a-464e-8068-171df105af12" x="438" y="170" width="130" height="20"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[(datum, podpis)]]></text>
</staticText>
<line>
<reportElement x="0" y="192" width="572" height="1" uuid="978b5c74-4f0e-4107-b654-7eb1621cea60"/>
<reportElement uuid="978b5c74-4f0e-4107-b654-7eb1621cea60" x="0" y="192" width="572" height="1"/>
</line>
<line>
<reportElement x="243" y="102" width="320" height="1" uuid="7b4b0991-c3d9-4fa3-a080-cc3ae98c0eb1"/>
<reportElement uuid="7b4b0991-c3d9-4fa3-a080-cc3ae98c0eb1" x="243" y="102" width="320" height="1"/>
</line>
<line>
<reportElement x="38" y="81" width="525" height="1" uuid="63479d2a-ecc1-40de-a36a-89218d1f648b"/>
<reportElement uuid="63479d2a-ecc1-40de-a36a-89218d1f648b" x="38" y="81" width="525" height="1"/>
</line>
<staticText>
<reportElement x="146" y="150" width="130" height="20" uuid="51ec3ef1-6a8c-441c-80c9-598f59077b81"/>
<reportElement uuid="51ec3ef1-6a8c-441c-80c9-598f59077b81" x="146" y="150" width="130" height="20"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Datum a podpis pokladníka]]></text>
</staticText>
<staticText>
<reportElement x="291" y="150" width="130" height="20" uuid="83737011-db81-4f02-9012-a9aca5561e76"/>
<reportElement uuid="83737011-db81-4f02-9012-a9aca5561e76" x="291" y="150" width="130" height="20"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font size="8" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Správce rozpočtu]]></text>
</staticText>
<staticText>
<reportElement x="1" y="66" width="37" height="15" uuid="49fcf5bc-5910-4525-aa6d-ae1bc6ca90e0"/>
<reportElement uuid="49fcf5bc-5910-4525-aa6d-ae1bc6ca90e0" x="1" y="66" width="37" height="15"/>
<textElement/>
<text><![CDATA[Slovy:]]></text>
</staticText>
<line>
<reportElement x="571" y="-1" width="1" height="194" uuid="8b83472f-9960-429e-8fab-84d1c3d1d678"/>
<reportElement uuid="8b83472f-9960-429e-8fab-84d1c3d1d678" x="571" y="-1" width="1" height="194"/>
</line>
<line>
<reportElement x="-1" y="-2" width="1" height="195" uuid="5e5a7c99-962e-4c99-b3ba-dbed5315f5aa"/>
<reportElement uuid="5e5a7c99-962e-4c99-b3ba-dbed5315f5aa" x="-1" y="-2" width="1" height="195"/>
</line>
<staticText>
<reportElement x="260" y="103" width="290" height="20" uuid="4aca1ec1-c2dc-47b9-a973-40ded5f52d29"/>
<reportElement uuid="4aca1ec1-c2dc-47b9-a973-40ded5f52d29" x="260" y="103" width="290" height="20"/>
<textElement/>
<text><![CDATA[Datum a podpis zaměstnance, který upravil vyúčtování]]></text>
</staticText>
<genericElement>
<reportElement x="291" y="103" width="130" height="46" uuid="3753147d-3c79-4377-b296-3281ab3d54b3"/>
<reportElement uuid="3753147d-3c79-4377-b296-3281ab3d54b3" x="291" y="103" width="130" height="46"/>
<genericElementType namespace="urn:sig:sig" name="signature"/>
<genericElementParameter name="index">
<valueExpression><![CDATA[2]]></valueExpression>
</genericElementParameter>
</genericElement>
<genericElement>
<reportElement x="438" y="107" width="130" height="42" uuid="14ae63ff-6be2-4419-9f39-8c9c8d2daf42"/>
<reportElement uuid="14ae63ff-6be2-4419-9f39-8c9c8d2daf42" x="438" y="107" width="130" height="42"/>
<genericElementType namespace="urn:sig:sig" name="signature"/>
<genericElementParameter name="index">
<valueExpression><![CDATA[1]]></valueExpression>

@ -1,192 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="TripBills" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b63eddc4-7326-45c4-99b4-fc35d6e98179">
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
<property name="ireport.zoom" value="1.9487171000000014"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<queryString>
<![CDATA[]]>
</queryString>
<field name="bill.requirement.numser" class="java.lang.String"/>
<field name="bill.requirement.reqDate" class="java.util.Date"/>
<field name="bill.requirement.tripDate" class="java.util.Date"/>
<field name="bill.requirement.to" class="java.lang.String"/>
<field name="bill.requirement.from" class="java.lang.String"/>
<field name="bill.total" class="java.math.BigDecimal"/>
<field name="bill.ownedBy" class="info.bukova.isspst.data.User"/>
<field name="bill.paidDate" class="java.util.Date"/>
<background>
<band splitType="Stretch"/>
</background>
<title>
<band height="23" splitType="Stretch">
<staticText>
<reportElement x="0" y="0" width="550" height="20" uuid="bc6cd7eb-bb1a-4114-b37d-ac64e951ca84"/>
<textElement textAlignment="Center">
<font size="14" isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Přehled vyúčtovaných CP]]></text>
</staticText>
</band>
</title>
<columnHeader>
<band height="26" splitType="Stretch">
<staticText>
<reportElement x="-3" y="0" width="49" height="24" uuid="4ac41092-a9db-4a53-adcf-403484a88f0c">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5bae174d-9ec1-47bf-b996-c693f3deb590"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Číslo]]></text>
</staticText>
<staticText>
<reportElement x="52" y="0" width="55" height="25" uuid="4ad11f47-bf12-4f6a-9459-31f6a1bf740a">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ec379d5f-c508-4339-997b-960e31840623"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Datum požad.]]></text>
</staticText>
<staticText>
<reportElement x="109" y="0" width="55" height="24" uuid="82e13fca-38df-497d-879a-a83b5811e7fc">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="1a0527d9-8676-4271-b662-dbed84c8de59"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Datum cesty]]></text>
</staticText>
<staticText>
<reportElement x="166" y="0" width="95" height="24" uuid="b37db24a-5134-42fb-92f6-1be4891f19ae">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="f01bf96d-78de-440b-9322-27510f96e117"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Počátek cesty]]></text>
</staticText>
<staticText>
<reportElement x="262" y="0" width="95" height="24" uuid="dc940c96-6170-4ff0-bf1c-c3b228635812">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="f296e149-4f38-4ed6-b0a6-1e4544728890"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Cíl]]></text>
</staticText>
<staticText>
<reportElement x="358" y="0" width="97" height="24" uuid="9eddb29b-3024-4f0d-90f5-e8e896add7c0">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="df75863b-fbfb-4332-a9fa-dbacf818e85c"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Žadatel]]></text>
</staticText>
<staticText>
<reportElement x="451" y="0" width="45" height="24" uuid="783dc31a-7f32-44d1-b455-6e8d25d5a943">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ef5d98d4-a0b8-4098-be82-3ea9a1bc2213"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Částka]]></text>
</staticText>
<staticText>
<reportElement x="501" y="0" width="52" height="24" uuid="2e899e0b-4c95-4088-8342-b6c701267c1f">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="781e4236-2351-4b02-99d0-cc2f76e00e3b"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Datum vyúčt.]]></text>
</staticText>
<line>
<reportElement x="0" y="25" width="550" height="1" uuid="813c3d6a-167c-4710-ab3a-e0795d31b3eb"/>
</line>
</band>
</columnHeader>
<detail>
<band height="18" splitType="Stretch">
<printWhenExpression><![CDATA[$F{bill.paidDate} != null]]></printWhenExpression>
<textField>
<reportElement x="-3" y="1" width="57" height="12" uuid="52ea43dc-f565-4502-9d17-4a41dab6db08">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5bae174d-9ec1-47bf-b996-c693f3deb590"/>
</reportElement>
<textElement>
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.requirement.numser}]]></textFieldExpression>
</textField>
<textField pattern="dd.MM.yyyy">
<reportElement x="52" y="1" width="60" height="12" uuid="88d723d7-ab14-4c78-8b26-26d804e52b42">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ec379d5f-c508-4339-997b-960e31840623"/>
</reportElement>
<textElement>
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.requirement.reqDate}]]></textFieldExpression>
</textField>
<textField pattern="dd.MM.yyyy">
<reportElement x="109" y="1" width="60" height="12" uuid="02f1eb70-9fa5-4249-93a3-aaa27ce5db96">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="1a0527d9-8676-4271-b662-dbed84c8de59"/>
</reportElement>
<textElement>
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.requirement.tripDate}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="166" y="1" width="95" height="12" uuid="10790d11-b692-4a37-849f-8b3054f65b52">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="f01bf96d-78de-440b-9322-27510f96e117"/>
</reportElement>
<textElement>
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.requirement.from}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="262" y="1" width="95" height="12" uuid="bc0a5da9-d998-4734-a0dd-8993e24d96d2">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="f296e149-4f38-4ed6-b0a6-1e4544728890"/>
</reportElement>
<textElement>
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.requirement.to}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="358" y="1" width="97" height="12" uuid="3a197226-28d7-4384-b74a-12e748bd0967">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="df75863b-fbfb-4332-a9fa-dbacf818e85c"/>
</reportElement>
<textElement>
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.ownedBy}]]></textFieldExpression>
</textField>
<textField pattern="###0.00;-###0.00">
<reportElement x="451" y="1" width="45" height="12" uuid="02a5e327-b7ab-4841-a895-0d285770e3c8">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ef5d98d4-a0b8-4098-be82-3ea9a1bc2213"/>
</reportElement>
<textElement textAlignment="Right">
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.total}]]></textFieldExpression>
</textField>
<textField pattern="dd.MM.yyyy">
<reportElement x="501" y="1" width="60" height="12" uuid="9750faaa-4e86-4b96-ae11-e394af572b82">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="781e4236-2351-4b02-99d0-cc2f76e00e3b"/>
</reportElement>
<textElement>
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.paidDate}]]></textFieldExpression>
</textField>
</band>
</detail>
<summary>
<band height="23" splitType="Stretch"/>
</summary>
</jasperReport>

@ -1,174 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="TripBills" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b63eddc4-7326-45c4-99b4-fc35d6e98179">
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
<property name="ireport.zoom" value="1.4641000000000006"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<queryString>
<![CDATA[]]>
</queryString>
<field name="bill.requirement.numser" class="java.lang.String"/>
<field name="bill.requirement.reqDate" class="java.util.Date"/>
<field name="bill.requirement.tripDate" class="java.util.Date"/>
<field name="bill.requirement.to" class="java.lang.String"/>
<field name="bill.requirement.from" class="java.lang.String"/>
<field name="bill.total" class="java.math.BigDecimal"/>
<field name="bill.ownedBy" class="info.bukova.isspst.data.User"/>
<field name="bill.paidDate" class="java.util.Date"/>
<background>
<band splitType="Stretch"/>
</background>
<title>
<band height="23" splitType="Stretch">
<staticText>
<reportElement x="0" y="0" width="552" height="20" uuid="bc6cd7eb-bb1a-4114-b37d-ac64e951ca84"/>
<textElement textAlignment="Center">
<font size="14" isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Přehled nevyúčtovaných CP]]></text>
</staticText>
</band>
</title>
<columnHeader>
<band height="26" splitType="Stretch">
<staticText>
<reportElement x="-3" y="0" width="49" height="24" uuid="4ac41092-a9db-4a53-adcf-403484a88f0c">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5bae174d-9ec1-47bf-b996-c693f3deb590"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Číslo]]></text>
</staticText>
<staticText>
<reportElement x="57" y="0" width="55" height="25" uuid="4ad11f47-bf12-4f6a-9459-31f6a1bf740a">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ec379d5f-c508-4339-997b-960e31840623"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Datum požad.]]></text>
</staticText>
<staticText>
<reportElement x="120" y="0" width="55" height="24" uuid="82e13fca-38df-497d-879a-a83b5811e7fc">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="1a0527d9-8676-4271-b662-dbed84c8de59"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Datum cesty]]></text>
</staticText>
<staticText>
<reportElement x="183" y="0" width="105" height="24" uuid="b37db24a-5134-42fb-92f6-1be4891f19ae">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="f01bf96d-78de-440b-9322-27510f96e117"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Počátek cesty]]></text>
</staticText>
<staticText>
<reportElement x="290" y="0" width="105" height="24" uuid="dc940c96-6170-4ff0-bf1c-c3b228635812">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="f296e149-4f38-4ed6-b0a6-1e4544728890"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Cíl]]></text>
</staticText>
<staticText>
<reportElement x="398" y="0" width="112" height="24" uuid="9eddb29b-3024-4f0d-90f5-e8e896add7c0">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="df75863b-fbfb-4332-a9fa-dbacf818e85c"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Žadatel]]></text>
</staticText>
<staticText>
<reportElement x="512" y="0" width="40" height="24" uuid="783dc31a-7f32-44d1-b455-6e8d25d5a943">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ef5d98d4-a0b8-4098-be82-3ea9a1bc2213"/>
</reportElement>
<textElement verticalAlignment="Middle">
<font isBold="true" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Částka]]></text>
</staticText>
<line>
<reportElement x="0" y="25" width="550" height="1" uuid="813c3d6a-167c-4710-ab3a-e0795d31b3eb"/>
</line>
</band>
</columnHeader>
<detail>
<band height="18" splitType="Stretch">
<printWhenExpression><![CDATA[$F{bill.paidDate} == null]]></printWhenExpression>
<textField>
<reportElement x="-3" y="1" width="57" height="12" uuid="52ea43dc-f565-4502-9d17-4a41dab6db08">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5bae174d-9ec1-47bf-b996-c693f3deb590"/>
</reportElement>
<textElement>
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.requirement.numser}]]></textFieldExpression>
</textField>
<textField pattern="dd.MM.yyyy">
<reportElement x="57" y="1" width="60" height="12" uuid="88d723d7-ab14-4c78-8b26-26d804e52b42">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ec379d5f-c508-4339-997b-960e31840623"/>
</reportElement>
<textElement>
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.requirement.reqDate}]]></textFieldExpression>
</textField>
<textField pattern="dd.MM.yyyy">
<reportElement x="120" y="1" width="60" height="12" uuid="02f1eb70-9fa5-4249-93a3-aaa27ce5db96">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="1a0527d9-8676-4271-b662-dbed84c8de59"/>
</reportElement>
<textElement>
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.requirement.tripDate}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="183" y="1" width="105" height="12" uuid="10790d11-b692-4a37-849f-8b3054f65b52">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="f01bf96d-78de-440b-9322-27510f96e117"/>
</reportElement>
<textElement>
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.requirement.from}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="290" y="1" width="105" height="12" uuid="bc0a5da9-d998-4734-a0dd-8993e24d96d2">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="f296e149-4f38-4ed6-b0a6-1e4544728890"/>
</reportElement>
<textElement>
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.requirement.to}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="398" y="1" width="112" height="12" uuid="3a197226-28d7-4384-b74a-12e748bd0967">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="df75863b-fbfb-4332-a9fa-dbacf818e85c"/>
</reportElement>
<textElement>
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.ownedBy}]]></textFieldExpression>
</textField>
<textField pattern="###0.00;-###0.00">
<reportElement x="512" y="1" width="40" height="12" uuid="02a5e327-b7ab-4841-a895-0d285770e3c8">
<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="ef5d98d4-a0b8-4098-be82-3ea9a1bc2213"/>
</reportElement>
<textElement textAlignment="Right">
<font pdfFontName="Helvetica" pdfEncoding="Cp1250" isPdfEmbedded="true"/>
<paragraph lineSpacing="Single"/>
</textElement>
<textFieldExpression><![CDATA[$F{bill.total}]]></textFieldExpression>
</textField>
</band>
</detail>
<summary>
<band height="23" splitType="Stretch"/>
</summary>
</jasperReport>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save