romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

WIP: Resolve "Реализация проверки выполнения показателей" #220

Draft
tatyana_belousova wants to merge 11 commits from 44-check-complete-deadlines into dev
pull from: 44-check-complete-deadlines
merge into: romanov73:dev
Conversation 14 Commits 11 Files Changed 6 +26 -8
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 395cf57cc1 - Show all commits

30
src/main/resources/templates/grants/fragments/grantLineFragment.html
View File

@ -11,14 +11,32 @@
<span class="h6" th:text="${grant.title}"/> <span class="h6" th:text="${grant.title}"/>
<span class="text-muted" th:text="${grant.authorsString}"/> <span class="text-muted" th:text="${grant.authorsString}"/>
</a> </a>
<a th:each="paper, rowStat : *{grant.papers}"> <span th:each="paper, rowStat : *{grant.papers}">
<span th:if="${paper.status.name() == 'COMPLETED'}"> <th:block th:switch="${paper.status.name()}">
<i class="fa fa-circle" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i> <span th:case="'ATTENTION'">
<i class="fa fa-circle text-warning" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
</span> </span>
<span th:unless="${paper.status.name() == 'COMPLETED'}"> <span th:case="'DRAFT'">
<i class="fa fa-circle-o" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i> <i class="fa fa-circle text-draft" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
</span>
<span th:case="'ON_PREPARATION'">
<i class="fa fa-circle text-primary" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
</span>
<span th:case="'ON_REVIEW'">
<i class="fa fa-circle text-review" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
</span>
<span th:case="'ACCEPTED'">
<i class="fa fa-circle text-success" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
</span>
<span th:case="'NOT_ACCEPTED'">
<i class="fa fa-circle text-not-accepted" aria-hidden="true"
th:title="'Статья: ' + ${paper.title}"></i>
</span>
<span th:case="'FAILED'">
<i class="fa fa-circle text-failed" aria-hidden="true" th:title="'Статья: ' + ${paper.title}"></i>
</span>
</th:block>
</span> </span>
</a>
<input class="id-class" type="hidden" th:value="${grant.id}"/> <input class="id-class" type="hidden" th:value="${grant.id}"/>
<a class="remove-paper pull-right d-none" th:href="@{'/grants/delete/'+${grant.id}}" <a class="remove-paper pull-right d-none" th:href="@{'/grants/delete/'+${grant.id}}"
data-confirm="Удалить грант?"> data-confirm="Удалить грант?">