1
0
mirror of https://github.com/sismics/docs.git synced 2025-12-24 23:22:56 +00:00

Document count in GET /app, TODO

This commit is contained in:
jendib
2013-08-01 13:36:15 +02:00
parent 4d50b220a2
commit 9e5459cafe
4 changed files with 56 additions and 17 deletions

View File

@@ -17,9 +17,13 @@ import org.apache.log4j.Logger;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
import com.sismics.docs.core.dao.jpa.DocumentDao;
import com.sismics.docs.core.dao.jpa.criteria.DocumentCriteria;
import com.sismics.docs.core.dao.jpa.dto.DocumentDto;
import com.sismics.docs.core.util.ConfigUtil;
import com.sismics.docs.core.util.jpa.PaginatedList;
import com.sismics.docs.core.util.jpa.PaginatedLists;
import com.sismics.docs.core.util.jpa.SortCriteria;
import com.sismics.docs.rest.constant.BaseFunction;
import com.sismics.rest.exception.ForbiddenClientException;
import com.sismics.rest.exception.ServerException;
@@ -42,16 +46,32 @@ public class AppResource extends BaseResource {
*/
@GET
@Produces(MediaType.APPLICATION_JSON)
public Response version() throws JSONException {
public Response info() throws JSONException {
if (!authenticate()) {
throw new ForbiddenClientException();
}
ResourceBundle configBundle = ConfigUtil.getConfigBundle();
String currentVersion = configBundle.getString("api.current_version");
String minVersion = configBundle.getString("api.min_version");
JSONObject response = new JSONObject();
// Specific data
DocumentDao documentDao = new DocumentDao();
PaginatedList<DocumentDto> paginatedList = PaginatedLists.create(1, 0);
SortCriteria sortCriteria = new SortCriteria(0, true);
DocumentCriteria documentCriteria = new DocumentCriteria();
documentCriteria.setUserId(principal.getId());
documentDao.findByCriteria(paginatedList, documentCriteria, sortCriteria);
response.put("document_count", paginatedList.getResultCount());
// General data
response.put("current_version", currentVersion.replace("-SNAPSHOT", ""));
response.put("min_version", minVersion);
response.put("total_memory", Runtime.getRuntime().totalMemory());
response.put("free_memory", Runtime.getRuntime().freeMemory());
return Response.ok().entity(response).build();
}

View File

@@ -1,3 +1,4 @@
// Documents list
.table-documents {
thead th {
cursor: pointer;
@@ -9,6 +10,7 @@
}
}
// File thumbnails
.thumbnail-file {
cursor: pointer;
}
@@ -21,6 +23,7 @@
overflow: visible;
}
// Fields bound to datepicker
input[readonly][datepicker-popup] {
cursor: pointer;
}
@@ -29,21 +32,30 @@ input[readonly][datepicker-popup] {
.inline-edit {
cursor: pointer;
display: block;
span {
display: block;
}
input {
display: none;
margin-bottom: 0;
}
&.active {
span {
display: none;
}
input {
display: inline-block;
}
}
}
.inline-edit span {
display: block;
}
.inline-edit input {
display: none;
margin-bottom: 0;
}
.inline-edit.active span {
display: none;
}
.inline-edit.active input {
display: inline-block;
// Pagination
.pagination {
ul > li {
cursor: pointer;
}
}