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 +11 -11
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1d19472f82 - Show all commits

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

@ -12,7 +12,7 @@
<span class="text-muted" th:text="${grant.authorsString}"/> <span class="text-muted" th:text="${grant.authorsString}"/>
</a> </a>
<span th:each="paper, rowStat : *{grant.papers}"> <span th:each="paper, rowStat : *{grant.papers}">
<span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title})"/> <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title}, small=true)"/>
</span> </span>
<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}}"

2
src/main/resources/templates/papers/fragments/paperLineFragment.html
View File

@ -6,7 +6,7 @@
<body> <body>
<div th:fragment="paperLine (paper)" class="row text-left paper-row" style="background-color: white;"> <div th:fragment="paperLine (paper)" class="row text-left paper-row" style="background-color: white;">
<div class="col"> <div class="col">
<span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title})"/> <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title}, small=false)"/>
<a th:href="@{'paper?id='+${paper.id}}"> <a th:href="@{'paper?id='+${paper.id}}">
<span class="h6" th:text="${paper.title}"/> <span class="h6" th:text="${paper.title}"/>
<span class="text-muted" th:text="${paper.authorsString}"/> <span class="text-muted" th:text="${paper.authorsString}"/>

18
src/main/resources/templates/papers/fragments/paperStatusFragment.html
View File

@ -4,31 +4,31 @@
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
</head> </head>
<body> <body>
<span th:fragment="paperStatus (paperStatus, title)" class="fa-stack fa-1x"> <span th:fragment="paperStatus (paperStatus, title, small)" class="fa-stack fa-1x">
<th:block th:switch="${paperStatus.name()}"> <th:block th:switch="${paperStatus.name()}">
<div th:case="'ATTENTION'"> <div th:case="'ATTENTION'">
<i class="fa fa-circle fa-stack-2x text-warning"></i> <i class="fa fa-circle text-warning" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
</div> </div>
<div th:case="'DRAFT'"> <div th:case="'DRAFT'">
<i class="fa fa-circle fa-stack-2x text-draft"></i> <i class="fa fa-circle text-draft" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
</div> </div>
<div th:case="'ON_PREPARATION'"> <div th:case="'ON_PREPARATION'">
<i class="fa fa-circle fa-stack-2x text-primary"></i> <i class="fa fa-circle text-primary" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
</div> </div>
<div th:case="'ON_REVIEW'"> <div th:case="'ON_REVIEW'">
<i class="fa fa-circle fa-stack-2x text-review"></i> <i class="fa fa-circle text-review" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
</div> </div>
<div th:case="'COMPLETED'"> <div th:case="'COMPLETED'">
<i class="fa fa-circle fa-stack-2x text-success"></i> <i class="fa fa-circle text-success" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
</div> </div>
<div th:case="'FAILED'"> <div th:case="'FAILED'">
<i class="fa fa-circle fa-stack-2x text-failed"></i> <i class="fa fa-circle text-failed" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
</div> </div>
<div th:case="'ACCEPTED'"> <div th:case="'ACCEPTED'">
<i class="fa fa-circle fa-stack-2x text-accepted"></i> <i class="fa fa-circle text-accepted" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
</div> </div>
<div th:case="'NOT_ACCEPTED'"> <div th:case="'NOT_ACCEPTED'">
<i class="fa fa-circle fa-stack-2x text-not-accepted"></i> <i class="fa fa-circle text-not-accepted" th:classappend="${small} ? fa-stack-1x : fa-stack-2x"></i>
</div> </div>
</th:block> </th:block>
<i class="fa fa-file-text-o fa-stack-1x fa-inverse" th:title="${title}"></i> <i class="fa fa-file-text-o fa-stack-1x fa-inverse" th:title="${title}"></i>