public/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2025-12-15 02:36:24 +00:00
Code Issues Releases Wiki Activity

Workflow assigned to me on home + Closes #170 + glyphicon -> fa

Browse Source
This commit is contained in:
Benjamin Gamard
2018-03-07 16:31:37 +01:00
parent a0880c4a16
commit a7c954c6bc
71 changed files with 5847 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/DocumentDao.java
View File

@@ -203,7 +203,7 @@ public class DocumentDao {
StringBuilder sb = new StringBuilder("select distinct d.DOC_ID_C c0, d.DOC_TITLE_C c1, d.DOC_DESCRIPTION_C c2, d.DOC_CREATEDATE_D c3, d.DOC_LANGUAGE_C c4, ");
sb.append(" (select count(s.SHA_ID_C) from T_SHARE s, T_ACL ac where ac.ACL_SOURCEID_C = d.DOC_ID_C and ac.ACL_TARGETID_C = s.SHA_ID_C and ac.ACL_DELETEDATE_D is null and s.SHA_DELETEDATE_D is null) c5, ");
sb.append(" (select count(f.FIL_ID_C) from T_FILE f where f.FIL_DELETEDATE_D is null and f.FIL_IDDOC_C = d.DOC_ID_C) c6, ");
sb.append(" rs2.RTP_ID_C c7 ");
sb.append(" rs2.RTP_ID_C c7, rs2.RTP_NAME_C ");
sb.append(" from T_DOCUMENT d ");
sb.append(" left join (select rs.*, rs3.idDocument\n" +
"from T_ROUTE_STEP rs \n" +
@@ -283,7 +283,8 @@ public class DocumentDao {
documentDto.setLanguage((String) o[i++]);
documentDto.setShared(((Number) o[i++]).intValue() > 0);
documentDto.setFileCount(((Number) o[i++]).intValue());
documentDto.setActiveRoute(o[i] != null);
documentDto.setActiveRoute(o[i++] != null);
documentDto.setCurrentStepName((String) o[i]);
documentDtoList.add(documentDto);
}

15
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/dto/DocumentDto.java
View File

@@ -91,6 +91,11 @@ public class DocumentDto {
*/
private boolean activeRoute;
/**
* Current route step name.
*/
private String currentStepName;
public String getId() {
return id;
}
@@ -223,8 +228,16 @@ public class DocumentDto {
return activeRoute;
}
public DocumentDto setActiveRoute(boolean activeRoute) {
public void setActiveRoute(boolean activeRoute) {
this.activeRoute = activeRoute;
}
public String getCurrentStepName() {
return currentStepName;
}
public DocumentDto setCurrentStepName(String currentStepName) {
this.currentStepName = currentStepName;
return this;
}
}