Author: JirkaM Date: 2010-02-28 23:11:04 +0100 (Sun, 28 Feb 2010) New Revision: 1956 Modified: trunk/server/webServer2/SpringSource/cz/elvys/webServer/toSpring/stats/StatsCTRLImpl.java Log: select only not deleted items modified SpringSource/cz/elvys/webServer/toSpring/stats/StatsCTRLImpl.java Modified: trunk/server/webServer2/SpringSource/cz/elvys/webServer/toSpring/stats/StatsCTRLImpl.java =================================================================== --- trunk/server/webServer2/SpringSource/cz/elvys/webServer/toSpring/stats/StatsCTRLImpl.java 2010-02-28 22:01:05 UTC (rev 1955) +++ trunk/server/webServer2/SpringSource/cz/elvys/webServer/toSpring/stats/StatsCTRLImpl.java 2010-02-28 22:11:04 UTC (rev 1956) @@ -91,11 +91,11 @@ * Queries for get information about line. */ // get all elvys for specified company - public String QUERY_IDENTIFIERS_COMPANY = "SELECT id,city,address, name FROM Elvys WHERE company = :ides"; + public String QUERY_IDENTIFIERS_COMPANY = "SELECT id,city,address, name FROM Elvys WHERE company = :ides AND disabled=0"; // get all document for specified elvys - public String QUERY_IDENTIFIERS_ELVYS = "SELECT distinct(statistics.file.id),statistics.file.origName,statistics.file.uploaded FROM Statistics statistics WHERE statistics.file.fileType.type='document' and statistics.elvys.id = :ides"; + public String QUERY_IDENTIFIERS_ELVYS = "SELECT distinct(statistics.file.id),statistics.file.origName,statistics.file.uploaded FROM Statistics statistics WHERE statistics.file.fileType.type='document' and statistics.elvys.id = :ides AND statistics.elvys.disabled=0"; // get all elvyses for specified document - public String QUERY_IDENTIFIERS_DOCUMENT = "SELECT distinct(statistics.elvys.id),statistics.elvys.city,statistics.elvys.address,statistics.elvys.name FROM Statistics statistics WHERE statistics.file.id = :ides"; + public String QUERY_IDENTIFIERS_DOCUMENT = "SELECT distinct(statistics.elvys.id),statistics.elvys.city,statistics.elvys.address,statistics.elvys.name FROM Statistics statistics WHERE statistics.file.id = :ides and statistics.file.disabled = 0"; /** * Queries for getting data for each line on graph for line type. @@ -115,11 +115,11 @@ * Queries for get information about selected object. */ // get information about company by getting identifier - public String QUERY_INFORMATION_COMPANY = "SELECT id,city,address FROM Elvys WHERE company = :ides"; + public String QUERY_INFORMATION_COMPANY = "SELECT id,city,address FROM Elvys WHERE company = :ides AND disabled=0"; // get all document for specified elvys - public String QUERY_INFORMATION_ELVYS = "SELECT distinct(statistics.file.id),statistics.file.origName,statistics.file.uploaded FROM Statistics statistics WHERE statistics.elvys.id = :ides"; + public String QUERY_INFORMATION_ELVYS = "SELECT distinct(statistics.file.id),statistics.file.origName,statistics.file.uploaded FROM Statistics statistics WHERE statistics.elvys.id = :ides AND statistics.elvys.disabled=0"; // get all elvyses for specified document - public String QUERY_INFORMATION_DOCUMENT = "SELECT distinct(statistics.elvys.id),statistics.elvys.city,statistics.elvys.address FROM Statistics statistics WHERE statistics.file.id = :ides"; + public String QUERY_INFORMATION_DOCUMENT = "SELECT distinct(statistics.elvys.id),statistics.elvys.city,statistics.elvys.address FROM Statistics statistics WHERE statistics.file.id = :ides AND statistics.file.disabled = 0"; /** * Selected object for showing screens.