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

Fix header

Browse Source
This commit is contained in:
Anton Romanov 2024-05-04 12:35:22 +04:00
parent e6b4ed9f2c
commit 7713078596
5 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/ru/ulstu/grant/service/GrantScheduler.java
View File

@ -5,9 +5,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.IOException;
import java.text.ParseException;
@Service @Service
public class GrantScheduler { public class GrantScheduler {
private final static boolean IS_DEADLINE_NOTIFICATION_BEFORE_WEEK = true; private final static boolean IS_DEADLINE_NOTIFICATION_BEFORE_WEEK = true;
@ -34,11 +31,11 @@ public class GrantScheduler {
@Scheduled(cron = "0 0 8 * * ?", zone = "Europe/Samara") @Scheduled(cron = "0 0 8 * * ?", zone = "Europe/Samara")
public void loadGrantsFromKias() { public void loadGrantsFromKias() {
log.debug("GrantScheduler.loadGrantsFromKias started"); log.debug("GrantScheduler.loadGrantsFromKias started");
try { // try {
grantService.createFromKias(); // grantService.createFromKias();
} catch (ParseException | IOException e) { // } catch (ParseException | IOException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
log.debug("GrantScheduler.loadGrantsFromKias finished"); log.debug("GrantScheduler.loadGrantsFromKias finished");
} }
} }

2
src/main/resources/templates/papers/paper.html
View File

@ -77,7 +77,7 @@
<div class="form-group"> <div class="form-group">
<label>Дедлайны:</label> <label>Дедлайны:</label>
<div class="row deadline" th:each="deadline, rowStat : *{deadlines}"> <div class="row deadline form-group" th:each="deadline, rowStat : *{deadlines}">
<input type="hidden" th:field="*{deadlines[__${rowStat.index}__].id}"/> <input type="hidden" th:field="*{deadlines[__${rowStat.index}__].id}"/>
<div class="col-6"> <div class="col-6">
<input type="date" class="form-control deadline-date" <input type="date" class="form-control deadline-date"

4
src/main/resources/templates/projects/dashboard.html
View File

@ -1,7 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" <html lang="en"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml"> xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{default}"
xmlns="http://www.w3.org/1999/html">
<head> <head>
</head> </head>
<body> <body>

4
src/main/resources/templates/projects/project.html
View File

@ -1,7 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" <html lang="en"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html"> xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{default}"
xmlns="http://www.w3.org/1999/html">
<head> <head>
<link rel="stylesheet" href="../css/project.css"/> <link rel="stylesheet" href="../css/project.css"/>
</head> </head>

10
src/main/resources/templates/projects/projects.html
View File

@ -1,7 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" <html lang="en"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="default" xmlns:th=""> xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{default}"
xmlns="http://www.w3.org/1999/html">
<head> <head>
</head> </head>
<body> <body>
@ -13,18 +15,18 @@
<div class="row" id="project-list"> <div class="row" id="project-list">
<div class="col-lg-12 text-center"> <div class="col-lg-12 text-center">
<h2 class="section-heading text-uppercase">Проекты</h2> <h2 class="section-heading text-uppercase">Проекты</h2>
<div th:replace="projects/fragments/projectNavigationFragment"/> <div th:replace="~{projects/fragments/projectNavigationFragment}"/>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-9 col-sm-12"> <div class="col-md-9 col-sm-12">
<th:block th:each="project : ${projects}"> <th:block th:each="project : ${projects}">
<div th:replace="projects/fragments/projectLineFragment :: projectLine(project=${project})"/> <div th:replace="~{projects/fragments/projectLineFragment :: projectLine(project=${project})}"/>
</th:block> </th:block>
</div> </div>
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
</div> </div>
<div th:replace="fragments/noRecordsFragment :: noRecords(entities=${projects}, noRecordsMessage=' одного проекта', url='project')"/> <div th:replace="~{fragments/noRecordsFragment :: noRecords(entities=${projects}, noRecordsMessage=' одного проекта', url='project')}"/>
</div> </div>
</div> </div>
</section> </section>