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

Draft
tatyana_belousova wants to merge 11 commits from 44-check-complete-deadlines into dev
6 changed files with 20 additions and 17 deletions

View File

@ -156,14 +156,14 @@
<a class="paper-name" <a class="paper-name"
th:href="@{'/papers/paper?id=' + *{papers[__${rowStat.index}__].id} + ''}" th:href="@{'/papers/paper?id=' + *{papers[__${rowStat.index}__].id} + ''}"
th:if="*{papers[__${rowStat.index}__].id !=null}"> th:if="*{papers[__${rowStat.index}__].id !=null}">
<span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status})"/> <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status}, title=*{papers[__${rowStat.index}__].title})"/>
<span th:text="*{papers[__${rowStat.index}__].title}"> <span th:text="*{papers[__${rowStat.index}__].title}">
Имя статьи Имя статьи
</span> </span>
</a> </a>
<a class="paper-name" <a class="paper-name"
th:unless="*{papers[__${rowStat.index}__].id !=null}"> th:unless="*{papers[__${rowStat.index}__].id !=null}">
<span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status})"/> <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=*{papers[__${rowStat.index}__].status, title=*{papers[__${rowStat.index}__].title}})"/>
<span th:text="*{papers[__${rowStat.index}__].title}"> <span th:text="*{papers[__${rowStat.index}__].title}">
Имя статьи Имя статьи
</span> </span>

View File

@ -14,6 +14,9 @@
th:title="${grant.title}"/> th:title="${grant.title}"/>
<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:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title}, small=true)"/>
</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}}"
data-confirm="Удалить грант?"> data-confirm="Удалить грант?">

View File

@ -25,7 +25,7 @@
<i class="fa fa-circle fa-stack-2x text-failed"></i> <i class="fa fa-circle fa-stack-2x text-failed"></i>
</div> </div>
</th:block> </th:block>
<i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i> <i class="fa fa-clipboard fa-stack-1x fa-inverse"></i>
</span> </span>
</body> </body>
</html> </html>

View File

@ -7,7 +7,7 @@
<div th:fragment="paperDashboard (paper)" class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card"> <div th:fragment="paperDashboard (paper)" class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
<div class="row"> <div class="row">
<div class="col-2"> <div class="col-2">
<span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status})"/> <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title})"/>
</div> </div>
<div class="col col-10 text-right"> <div class="col col-10 text-right">
<p th:if="${paper.url!=null and paper.url!=''}"><a target="_blank" class="externalLink" <p th:if="${paper.url!=null and paper.url!=''}"><a target="_blank" class="externalLink"

View File

@ -6,8 +6,8 @@
<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})"/> <span th:replace="papers/fragments/paperStatusFragment :: paperStatus(paperStatus=${paper.status}, title=${paper.title})"/>
<a th:href="@{'paper?id='+${paper.id}}"> <a th:href="@{'../papers/paper?id='+${paper.id}}">
<span class="h6" th:if="${#strings.length(paper.title)} > 50" <span class="h6" th:if="${#strings.length(paper.title)} > 50"
th:text="${#strings.substring(paper.title, 0, 50) + '...'}" th:title="${paper.title}"/> th:text="${#strings.substring(paper.title, 0, 50) + '...'}" th:title="${paper.title}"/>
<span class="h6" th:if="${#strings.length(paper.title) le 50}" th:text="${paper.title}" <span class="h6" th:if="${#strings.length(paper.title) le 50}" th:text="${paper.title}"

View File

@ -4,34 +4,34 @@
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
</head> </head>
<body> <body>
<span th:fragment="paperStatus (paperStatus)" 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"></i> <i class="fa fa-file-text-o fa-stack-1x fa-inverse" th:title="${title}"></i>
</span> </span>
</body> </body>
</html> </html>