#107 merge with dev

checkstyle.xml

@@ -100,7 +100,7 @@
 
         <!-- Checks for imports                              -->
         <!-- See http://checkstyle.sf.net/config_import.html -->
-        <!--<module name="AvoidStarImport"/>-->
+        <module name="AvoidStarImport"/>
         <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
         <module name="RedundantImport"/>
         <!--module name="UnusedImports">
@@ -136,7 +136,7 @@
         <module name="AvoidNestedBlocks"/>
         <module name="EmptyBlock"/>
         <module name="LeftCurly"/>
-        <!--<module name="NeedBraces"/>-->
+        <module name="NeedBraces"/>
         <module name="RightCurly"/>
 
         <!-- Checks for common coding problems               -->

src/main/java/ru/ulstu/conference/controller/ConferenceController.java

@@ -5,20 +5,23 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import ru.ulstu.conference.model.ConferenceDto;
 import ru.ulstu.conference.model.ConferenceFilterDto;
+import ru.ulstu.conference.model.ConferenceUser;
 import ru.ulstu.conference.service.ConferenceService;
 import ru.ulstu.deadline.model.Deadline;
-import ru.ulstu.paper.model.Paper;
+import ru.ulstu.user.model.User;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -44,16 +47,24 @@ public class ConferenceController {
         modelMap.put("filteredConferences", new ConferenceFilterDto(conferenceService.findAllDto()));
     }
 
+    @PostMapping("/conferences")
+    public void filterConferences(@Valid ConferenceFilterDto conferenceFilterDto, ModelMap modelMap) {
+        modelMap.put("filteredConferences", new ConferenceFilterDto(conferenceService.filter(conferenceFilterDto),
+                conferenceFilterDto.getFilterUserId(),
+                conferenceFilterDto.getYear()));
+    }
+
+    @GetMapping("/dashboard")
+    public void getDashboard(ModelMap modelMap) {
+        modelMap.put("conferences", conferenceService.findAllActiveDto());
+    }
+
     @GetMapping("/conference")
     public void getConference(ModelMap modelMap, @RequestParam(value = "id") Integer id) {
         if (id != null && id > 0) {
-            ConferenceDto conferenceDto = conferenceService.findOneDto(id);
+            modelMap.put("conferenceDto", conferenceService.getExistConferenceById(id));
-            conferenceDto.setNotSelectedPapers(getNotSelectPapers(conferenceDto.getPaperIds()));
-            modelMap.put("conferenceDto", conferenceDto);
         } else {
-            ConferenceDto conferenceDto = new ConferenceDto();
+            modelMap.put("conferenceDto", conferenceService.getNewConference());
-            conferenceDto.setNotSelectedPapers(getNotSelectPapers(new ArrayList<Integer>()));
-            modelMap.put("conferenceDto", conferenceDto);
         }
     }
 
@@ -104,8 +115,37 @@ public class ConferenceController {
         return CONFERENCE_PAGE;
     }
 
-    public List<Paper> getNotSelectPapers(List<Integer> paperIds) {
+    @PostMapping(value = "/conference", params = "takePart")
-        return conferenceService.getConferencePapers(paperIds);
+    public String takePart(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
+        if (errors.hasErrors()) {
+            return CONFERENCE_PAGE;
+        }
+        conferenceService.takePart(conferenceDto);
+        return CONFERENCE_PAGE;
+    }
+
+    @ModelAttribute("allParticipation")
+    public List<ConferenceUser.Participation> getAllParticipation() {
+        return conferenceService.getAllParticipations();
+    }
+
+    @ModelAttribute("allDeposit")
+    public List<ConferenceUser.Deposit> getAllDeposit() {
+        return conferenceService.getAllDeposit();
+    }
+
+    @ModelAttribute("allUsers")
+    public List<User> getAllUsers() {
+        return conferenceService.getAllUsers();
+    }
+
+    @ModelAttribute("allYears")
+    public List<Integer> getAllYears() {
+        List<Integer> years = new ArrayList<>();
+        for (int i = Calendar.getInstance().get(Calendar.YEAR); i > 2010; i--) {
+            years.add(i);
+        }
+        return years;
     }
 
     private void filterEmptyDeadlines(ConferenceDto conferenceDto) {

src/main/java/ru/ulstu/conference/model/Conference.java

@@ -7,7 +7,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.paper.model.Paper;
-import ru.ulstu.user.model.User;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -23,9 +22,7 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 @Entity
 @Table(name = "conference")
@@ -62,11 +59,10 @@ public class Conference extends BaseEntity {
             inverseJoinColumns = {@JoinColumn(name = "paper_id")})
     private List<Paper> papers = new ArrayList<>();
 
-    @ManyToMany(fetch = FetchType.EAGER)
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-    @JoinTable(name = "users_conference",
+    @JoinColumn(name = "conference_id", unique = true)
-            joinColumns = {@JoinColumn(name = "conference_id")},
+    @Fetch(FetchMode.SUBSELECT)
-            inverseJoinColumns = {@JoinColumn(name = "users_id")})
+    private List<ConferenceUser> users = new ArrayList<>();
-    private Set<User> users = new HashSet<>();
 
     public String getTitle() {
         return title;
@@ -132,11 +128,11 @@ public class Conference extends BaseEntity {
         this.papers = papers;
     }
 
-    public Set<User> getUsers() {
+    public List<ConferenceUser> getUsers() {
         return users;
     }
 
-    public void setUsers(Set<User> users) {
+    public void setUsers(List<ConferenceUser> users) {
         this.users = users;
     }
 }

src/main/java/ru/ulstu/conference/model/ConferenceDto.java

@@ -6,21 +6,21 @@ import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.paper.model.Paper;
-import ru.ulstu.user.model.UserDto;
 
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 
 public class ConferenceDto {
 
+    private final static String BEGIN_DATE = "Начало: ";
+    private final static String END_DATE = "Конец: ";
+
     private Integer id;
     @NotEmpty
     @Size(min = 2, max = 400)
@@ -38,14 +38,12 @@ public class ConferenceDto {
     private Date endDate = new Date();
     private List<Deadline> deadlines = new ArrayList<>();
     private List<Integer> removedDeadlineIds = new ArrayList<>();
-    private Set<Integer> userIds = new HashSet<>();
+    private List<Integer> userIds = new ArrayList<>();
     private List<Integer> paperIds = new ArrayList<>();
     private List<Paper> papers = new ArrayList<>();
-
-
     private List<Paper> notSelectedPapers = new ArrayList<>();
-    private Set<UserDto> users = new HashSet<>();
+    private List<ConferenceUser> users = new ArrayList<>();
-    private Integer filterUserId;
+    private boolean disabledTakePart = false;
 
     public ConferenceDto() {
     }
@@ -59,11 +57,12 @@ public class ConferenceDto {
                          @JsonProperty("beginDate") Date beginDate,
                          @JsonProperty("endDate") Date endDate,
                          @JsonProperty("deadlines") List<Deadline> deadlines,
-                         @JsonProperty("userIds") Set<Integer> userIds,
+                         @JsonProperty("userIds") List<Integer> userIds,
                          @JsonProperty("paperIds") List<Integer> paperIds,
-                         @JsonProperty("users") Set<UserDto> users,
+                         @JsonProperty("users") List<ConferenceUser> users,
                          @JsonProperty("papers") List<Paper> papers,
-                         @JsonProperty("notSelectedPapers") List<Paper> notSelectedPapers) {
+                         @JsonProperty("notSelectedPapers") List<Paper> notSelectedPapers,
+                         @JsonProperty("notSelectedPapers") Boolean disabledTakePart) {
         this.id = id;
         this.title = title;
         this.description = description;
@@ -77,6 +76,7 @@ public class ConferenceDto {
         this.users = users;
         this.papers = papers;
         this.notSelectedPapers = notSelectedPapers;
+        this.disabledTakePart = disabledTakePart;
     }
 
     public ConferenceDto(Conference conference) {
@@ -90,9 +90,8 @@ public class ConferenceDto {
         this.deadlines = conference.getDeadlines();
         this.userIds = convert(conference.getUsers(), user -> user.getId());
         this.paperIds = convert(conference.getPapers(), paper -> paper.getId());
-        this.users = convert(conference.getUsers(), UserDto::new);
+        this.users = conference.getUsers();
         this.papers = conference.getPapers();
-
     }
 
     public Integer getId() {
@@ -159,11 +158,11 @@ public class ConferenceDto {
         this.deadlines = deadlines;
     }
 
-    public Set<Integer> getUserIds() {
+    public List<Integer> getUserIds() {
         return userIds;
     }
 
-    public void setUserIds(Set<Integer> userIds) {
+    public void setUserIds(List<Integer> userIds) {
         this.userIds = userIds;
     }
 
@@ -183,20 +182,20 @@ public class ConferenceDto {
         this.papers = papers;
     }
 
-    public Set<UserDto> getUsers() {
+    public List<ConferenceUser> getUsers() {
         return users;
     }
 
-    public void setUsers(Set<UserDto> users) {
+    public void setUsers(List<ConferenceUser> users) {
         this.users = users;
     }
 
-    public Integer getFilterUserId() {
+    public boolean isDisabledTakePart() {
-        return filterUserId;
+        return disabledTakePart;
     }
 
-    public void setFilterUserId(Integer filterUserId) {
+    public void setDisabledTakePart(boolean disabledTakePart) {
-        this.filterUserId = filterUserId;
+        this.disabledTakePart = disabledTakePart;
     }
 
     public List<Integer> getRemovedDeadlineIds() {
@@ -215,4 +214,8 @@ public class ConferenceDto {
         this.notSelectedPapers = notSelectedPapers;
     }
 
+    public String getDatesString() {
+        return BEGIN_DATE + beginDate.toString().split(" ")[0] + " " + END_DATE + endDate.toString().split(" ")[0];
+    }
+
 }

src/main/java/ru/ulstu/conference/model/ConferenceFilterDto.java

@@ -5,15 +5,15 @@ import java.util.List;
 public class ConferenceFilterDto {
 
     private List<ConferenceDto> conferences;
-    private Integer filterAuthorId;
+    private Integer filterUserId;
     private Integer year;
 
     public ConferenceFilterDto() {
     }
 
-    public ConferenceFilterDto(List<ConferenceDto> conferenceDtos, Integer filterAuthorId, Integer year) {
+    public ConferenceFilterDto(List<ConferenceDto> conferenceDtos, Integer filterUserId, Integer year) {
         this.conferences = conferenceDtos;
-        this.filterAuthorId = filterAuthorId;
+        this.filterUserId = filterUserId;
         this.year = year;
     }
 
@@ -29,12 +29,12 @@ public class ConferenceFilterDto {
         this.conferences = conferences;
     }
 
-    public Integer getFilterAuthorId() {
+    public Integer getFilterUserId() {
-        return filterAuthorId;
+        return filterUserId;
     }
 
-    public void setFilterAuthorId(Integer filterAuthorId) {
+    public void setFilterUserId(Integer filterUserId) {
-        this.filterAuthorId = filterAuthorId;
+        this.filterUserId = filterUserId;
     }
 
     public Integer getYear() {

src/main/java/ru/ulstu/conference/model/ConferenceUser.java

@@ -0,0 +1,110 @@
+package ru.ulstu.conference.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.user.model.User;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+@Entity
+@Table(name = "users_conference")
+public class ConferenceUser extends BaseEntity {
+
+    public enum Participation {
+        INTRAMURAL("Очная"),
+        EXTRAMURAL("Заочная");
+
+        private String participationName;
+
+        Participation(String name) {
+            this.participationName = name;
+        }
+
+        public String getParticipation() {
+            return participationName;
+        }
+    }
+
+    public enum Deposit {
+        ARTICLE("Статья"),
+        REPORT("Доклад"),
+        PRESENTATION("Презентация");
+
+        private String depositName;
+
+        Deposit(String name) {
+            this.depositName = name;
+        }
+
+        public String getDeposit() {
+            return depositName;
+        }
+    }
+
+
+    @NotNull
+    @Column(name = "participation", nullable = false)
+    @Enumerated(value = EnumType.STRING)
+    private Participation participation = Participation.INTRAMURAL;
+
+    @NotNull
+    @Column(name = "deposit", nullable = false)
+    @Enumerated(value = EnumType.STRING)
+    private Deposit deposit = Deposit.ARTICLE;
+
+    @ManyToOne(optional = false)
+    @JoinColumn(name = "users_id")
+    private User user;
+
+    public ConferenceUser() {
+    }
+
+    public ConferenceUser(User user) {
+        this.user = user;
+    }
+
+    @JsonCreator
+    public ConferenceUser(@JsonProperty("id") Integer id,
+                          @JsonProperty("deposit") Participation participation,
+                          @JsonProperty("deposit") Deposit deposit,
+                          @JsonProperty("user") User user) {
+        this.setId(id);
+        this.participation = participation;
+        this.deposit = deposit;
+        this.user = user;
+    }
+
+
+    public Participation getParticipation() {
+        return participation;
+    }
+
+    public void setParticipation(Participation participation) {
+        this.participation = participation;
+    }
+
+    public Deposit getDeposit() {
+        return deposit;
+    }
+
+    public void setDeposit(Deposit deposit) {
+        this.deposit = deposit;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+}

src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java

@@ -1,7 +1,19 @@
 package ru.ulstu.conference.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import ru.ulstu.conference.model.Conference;
+import ru.ulstu.user.model.User;
+
+import java.util.Date;
+import java.util.List;
 
 public interface ConferenceRepository extends JpaRepository<Conference, Integer> {
+    @Query("SELECT c FROM Conference c LEFT JOIN c.users u WHERE (:user IS NULL OR u.user = :user) " +
+            "AND (YEAR(c.beginDate) = :year OR :year IS NULL) ORDER BY begin_date DESC")
+    List<Conference> findByUserAndYear(@Param("user") User user, @Param("year") Integer year);
+
+    @Query("SELECT c FROM Conference c WHERE c.beginDate > :date")
+    List<Conference> findAllActive(@Param("date") Date date);
 }

src/main/java/ru/ulstu/conference/repository/ConferenceUserRepository.java

@@ -0,0 +1,7 @@
+package ru.ulstu.conference.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import ru.ulstu.conference.model.ConferenceUser;
+
+public interface ConferenceUserRepository extends JpaRepository<ConferenceUser, Integer> {
+}

src/main/java/ru/ulstu/conference/service/ConferenceService.java

@@ -1,16 +1,24 @@
 package ru.ulstu.conference.service;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.ulstu.conference.model.Conference;
 import ru.ulstu.conference.model.ConferenceDto;
+import ru.ulstu.conference.model.ConferenceFilterDto;
+import ru.ulstu.conference.model.ConferenceUser;
 import ru.ulstu.conference.repository.ConferenceRepository;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.service.PaperService;
+import ru.ulstu.user.model.User;
+import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 import static org.springframework.util.ObjectUtils.isEmpty;
@@ -21,19 +29,39 @@ public class ConferenceService {
     private final static int MAX_DISPLAY_SIZE = 40;
 
     private final ConferenceRepository conferenceRepository;
+    private final ConferenceUserService conferenceUserService;
     private final DeadlineService deadlineService;
     private final PaperService paperService;
+    private final UserService userService;
 
     public ConferenceService(ConferenceRepository conferenceRepository,
+                             ConferenceUserService conferenceUserService,
                              DeadlineService deadlineService,
-                             PaperService paperService) {
+                             PaperService paperService,
+                             UserService userService) {
         this.conferenceRepository = conferenceRepository;
+        this.conferenceUserService = conferenceUserService;
         this.deadlineService = deadlineService;
         this.paperService = paperService;
+        this.userService = userService;
     }
 
+    public ConferenceDto getExistConferenceById(Integer id) {
+        ConferenceDto conferenceDto = findOneDto(id);
+        conferenceDto.setNotSelectedPapers(getNotSelectPapers(conferenceDto.getPaperIds()));
+        conferenceDto.setDisabledTakePart(isCurrentUserParticipant(conferenceDto.getUsers()));
+        return conferenceDto;
+    }
+
+    public ConferenceDto getNewConference() {
+        ConferenceDto conferenceDto = new ConferenceDto();
+        conferenceDto.setNotSelectedPapers(getNotSelectPapers(new ArrayList<Integer>()));
+        return conferenceDto;
+    }
+
+
     public List<Conference> findAll() {
-        return conferenceRepository.findAll();
+        return conferenceRepository.findAll(new Sort(Sort.Direction.DESC, "beginDate"));
     }
 
     public List<ConferenceDto> findAllDto() {
@@ -88,10 +116,27 @@ public class ConferenceService {
         conferenceDto.getNotSelectedPapers().add(removedPaper);
     }
 
-    public List<Paper> getConferencePapers(List<Integer> paperIds) {
+    public void takePart(ConferenceDto conferenceDto) throws IOException {
+        conferenceDto.getUsers().add(new ConferenceUser(userService.getCurrentUser()));
+        conferenceDto.setDisabledTakePart(true);
+    }
+
+    public List<Paper> getNotSelectPapers(List<Integer> paperIds) {
         return paperService.findAllNotSelect(paperIds);
     }
 
+    public List<User> getAllUsers() {
+        return userService.findAll();
+    }
+
+    public List<ConferenceUser.Participation> getAllParticipations() {
+        return Arrays.asList(ConferenceUser.Participation.values());
+    }
+
+    public List<ConferenceUser.Deposit> getAllDeposit() {
+        return Arrays.asList(ConferenceUser.Deposit.values());
+    }
+
     private Conference copyFromDto(Conference conference, ConferenceDto conferenceDto) throws IOException {
         conference.setTitle(conferenceDto.getTitle());
         conference.setDescription(conferenceDto.getDescription());
@@ -101,6 +146,7 @@ public class ConferenceService {
         conference.setEndDate(conferenceDto.getEndDate());
         conference.setPapers(conferenceDto.getPapers());
         conference.setDeadlines(deadlineService.saveOrCreate(conferenceDto.getDeadlines()));
+        conference.setUsers(conferenceUserService.saveOrCreate(conferenceDto.getUsers()));
         if (conferenceDto.getPaperIds() != null && !conferenceDto.getPaperIds().isEmpty()) {
             conferenceDto.getPaperIds().forEach(paperId ->
                     conference.getPapers().add(paperService.findEntityById(paperId)));
@@ -109,4 +155,22 @@ public class ConferenceService {
     }
 
 
+    public boolean isCurrentUserParticipant(List<ConferenceUser> conferenceUsers) {
+        return conferenceUsers.stream().anyMatch(participant -> participant.getUser().equals(userService.getCurrentUser()));
+    }
+
+    public List<ConferenceDto> filter(ConferenceFilterDto conferenceFilterDto) {
+        return convert(conferenceRepository.findByUserAndYear(
+                conferenceFilterDto.getFilterUserId() == null ? null : userService.findById(conferenceFilterDto.getFilterUserId()),
+                conferenceFilterDto.getYear()), ConferenceDto::new);
+
+    }
+
+    public List<ConferenceDto> findAllActiveDto() {
+        return convert(findAllActive(), ConferenceDto::new);
+    }
+
+    public List<Conference> findAllActive() {
+        return conferenceRepository.findAllActive(new Date());
+    }
 }

src/main/java/ru/ulstu/conference/service/ConferenceUserService.java

@@ -0,0 +1,48 @@
+package ru.ulstu.conference.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import ru.ulstu.conference.model.ConferenceUser;
+import ru.ulstu.conference.repository.ConferenceUserRepository;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class ConferenceUserService {
+
+    private final ConferenceUserRepository conferenceUserRepository;
+
+    public ConferenceUserService(ConferenceUserRepository conferenceUserRepository) {
+        this.conferenceUserRepository = conferenceUserRepository;
+    }
+
+    public List<ConferenceUser> saveOrCreate(List<ConferenceUser> users) {
+        return users
+                .stream()
+                .map(user -> {
+                    return user.getId() != null ? update(user) : create(user);
+                }).collect(Collectors.toList());
+    }
+
+    @Transactional
+    public ConferenceUser update(ConferenceUser user) {
+        ConferenceUser updateUser = conferenceUserRepository.findOne(user.getId());
+        updateUser.setDeposit(user.getDeposit());
+        updateUser.setParticipation(user.getParticipation());
+        conferenceUserRepository.save(updateUser);
+        return updateUser;
+    }
+
+    @Transactional
+    public ConferenceUser create(ConferenceUser user) {
+        ConferenceUser newUser = new ConferenceUser();
+        newUser.setDeposit(user.getDeposit());
+        newUser.setParticipation(user.getParticipation());
+        newUser.setUser(user.getUser());
+        newUser = conferenceUserRepository.save(newUser);
+        return newUser;
+    }
+
+
+}

src/main/java/ru/ulstu/core/model/BaseEntity.java

@@ -1,6 +1,10 @@
 package ru.ulstu.core.model;
 
-import javax.persistence.*;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
 import java.io.Serializable;
 
 @MappedSuperclass

src/main/java/ru/ulstu/core/util/DateUtils.java

@@ -1,6 +1,11 @@
 package ru.ulstu.core.util;
 
-import java.time.*;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Month;
+import java.time.ZoneId;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
@@ -24,7 +29,7 @@ public class DateUtils {
         return cal;
     }
 
-    public static List<Month> getMonths () {
+    public static List<Month> getMonths() {
         return Arrays.asList(Month.values());
     }
 

src/main/java/ru/ulstu/file/model/FileData.java

@@ -20,7 +20,7 @@ public class FileData extends BaseEntity {
     private byte[] data;
 
     @Column(name = "is_latex_attach")
-    private boolean isLatexAttach;
+    private Boolean isLatexAttach;
 
     public String getName() {
         return name;
@@ -54,11 +54,11 @@ public class FileData extends BaseEntity {
         this.data = data;
     }
 
-    public boolean isLatexAttach() {
+    public Boolean isLatexAttach() {
         return isLatexAttach;
     }
 
-    public void setLatexAttach(boolean latexAttach) {
+    public void setLatexAttach(Boolean latexAttach) {
         isLatexAttach = latexAttach;
     }
 }

src/main/java/ru/ulstu/file/model/FileDataDto.java

@@ -9,7 +9,7 @@ public class FileDataDto {
     private String fileName;
     private String tmpFileName;
     private boolean deleted;
-    private boolean isLatexAttach;
+    private Boolean isLatexAttach;
 
     public FileDataDto() {
     }
@@ -17,7 +17,7 @@ public class FileDataDto {
     @JsonCreator
     public FileDataDto(@JsonProperty("id") Integer id,
                        @JsonProperty("name") String name,
-                       @JsonProperty("isLatexAttach") boolean isLatexAttach,
+                       @JsonProperty("isLatexAttach") Boolean isLatexAttach,
                        @JsonProperty("fileName") String fileName,
                        @JsonProperty("tmpFileName") String tmpFileName) {
         this.id = id;
@@ -77,19 +77,19 @@ public class FileDataDto {
         this.deleted = deleted;
     }
 
-    public boolean isLatexAttach() {
+    public Boolean isLatexAttach() {
         return isLatexAttach;
     }
 
-    public boolean getIsLatexAttach() {
+    public Boolean getIsLatexAttach() {
         return isLatexAttach;
     }
 
-    public void setLatexAttach(boolean latexAttach) {
+    public void setLatexAttach(Boolean latexAttach) {
         isLatexAttach = latexAttach;
     }
 
-    public void setIsLatexAttach(boolean latexAttach) {
+    public void setIsLatexAttach(Boolean latexAttach) {
         isLatexAttach = latexAttach;
     }
 }

src/main/java/ru/ulstu/file/service/FileService.java

@@ -127,7 +127,7 @@ public class FileService {
     public void createLatexAttachs(PaperDto paper) throws IOException {
         for (FileDataDto fileDataDto : paper.getFiles()
                 .stream()
-                .filter(f -> f.isLatexAttach() && !f.isDeleted())
+                .filter(f -> (f.isLatexAttach() != null && f.isLatexAttach()) && !f.isDeleted())
                 .collect(Collectors.toList())) {
             if (fileDataDto.getId() == null) {
                 File oldFile = getTmpFilePath(fileDataDto.getTmpFileName()).toFile();

src/main/java/ru/ulstu/grant/controller/GrantController.java

@@ -103,7 +103,7 @@ public class GrantController {
     }
 
     @PostMapping(value = "/grant", params = "createProject")
-    public String createProject(@Valid GrantDto grantDto, Errors errors) {
+    public String createProject(@Valid GrantDto grantDto, Errors errors) throws IOException {
         if (errors.hasErrors()) {
             return GRANT_PAGE;
         }

src/main/java/ru/ulstu/grant/service/GrantService.java

@@ -98,7 +98,7 @@ public class GrantService {
         return grant;
     }
 
-    public void createProject(GrantDto grantDto) {
+    public void createProject(GrantDto grantDto) throws IOException {
         grantDto.setProject(
                 new ProjectDto(projectService.save(new ProjectDto(grantDto.getTitle()))));
     }

src/main/java/ru/ulstu/odin/model/OdinField.java

@@ -31,14 +31,13 @@ public abstract class OdinField implements Comparable {
             return this.name().toLowerCase();
         }
     }
-
-    private Field field;
     protected final OdinFieldType fieldType;
     protected final String fieldName;
     protected final String caption;
     protected final OdinVisible.OdinVisibleType visible;
     protected final boolean readOnly;
     protected final boolean notEmpty;
+    private Field field;
 
     public OdinField(Field field, OdinFieldType fieldType) {
         this.field = field;
@@ -126,8 +125,12 @@ public abstract class OdinField implements Comparable {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
+        if (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         OdinField odinField = (OdinField) o;
         return Objects.equals(fieldName, odinField.fieldName);
     }

src/main/java/ru/ulstu/paper/controller/PaperController.java

@@ -105,6 +105,11 @@ public class PaperController {
         return paperService.getPaperStatuses();
     }
 
+    @ModelAttribute("allTypes")
+    public List<Paper.PaperType> getPaperTypes() {
+        return paperService.getPaperTypes();
+    }
+
     @ModelAttribute("allAuthors")
     public List<User> getAllAuthors() {
         return paperService.getPaperAuthors();

src/main/java/ru/ulstu/paper/model/Paper.java

@@ -53,12 +53,32 @@ public class Paper extends BaseEntity implements UserContainer {
         }
     }
 
+    public enum PaperType {
+        OTHER("Прочая публикация"),
+        VAK("ВАК"),
+        SCOPUS("Scopus"),
+        WEB_OF_SCIENCE("Web Of Science");
+
+        private String typeName;
+
+        PaperType(String name) {
+            this.typeName = name;
+        }
+
+        public String getTypeName() {
+            return typeName;
+        }
+    }
+
     @NotBlank
     private String title;
 
     @Enumerated(value = EnumType.STRING)
     private PaperStatus status = PaperStatus.DRAFT;
 
+    @Enumerated(value = EnumType.STRING)
+    private PaperType type = PaperType.OTHER;
+
     @Column(name = "create_date")
     @Temporal(TemporalType.TIMESTAMP)
     private Date createDate = new Date();
@@ -102,6 +122,14 @@ public class Paper extends BaseEntity implements UserContainer {
         this.status = status;
     }
 
+    public PaperType getType() {
+        return type;
+    }
+
+    public void setType(PaperType type) {
+        this.type = type;
+    }
+
     public Date getCreateDate() {
         return createDate;
     }

src/main/java/ru/ulstu/paper/model/PaperDto.java

@@ -25,6 +25,7 @@ public class PaperDto {
     @Size(min = 3, max = 254)
     private String title;
     private Paper.PaperStatus status;
+    private Paper.PaperType type;
     private Date createDate;
     private Date updateDate;
     @NotEmpty
@@ -46,6 +47,7 @@ public class PaperDto {
     public PaperDto(@JsonProperty("id") Integer id,
                     @JsonProperty("title") String title,
                     @JsonProperty("status") Paper.PaperStatus status,
+                    @JsonProperty("type") Paper.PaperType type,
                     @JsonProperty("createDate") Date createDate,
                     @JsonProperty("updateDate") Date updateDate,
                     @JsonProperty("deadlines") List<Deadline> deadlines,
@@ -59,6 +61,7 @@ public class PaperDto {
         this.id = id;
         this.title = title;
         this.status = status;
+        this.type = type;
         this.createDate = createDate;
         this.updateDate = updateDate;
         this.deadlines = deadlines;
@@ -74,6 +77,7 @@ public class PaperDto {
         this.id = paper.getId();
         this.title = paper.getTitle();
         this.status = paper.getStatus();
+        this.type = paper.getType();
         this.createDate = paper.getCreateDate();
         this.updateDate = paper.getUpdateDate();
         this.deadlines = paper.getDeadlines();
@@ -110,6 +114,14 @@ public class PaperDto {
         this.status = status;
     }
 
+    public Paper.PaperType getType() {
+        return type;
+    }
+
+    public void setType(Paper.PaperType type) {
+        this.type = type;
+    }
+
     public Date getCreateDate() {
         return createDate;
     }

src/main/java/ru/ulstu/paper/service/LatexService.java

@@ -12,11 +12,11 @@ import java.nio.file.Files;
 
 @Service
 public class LatexService {
+    private final String pdfLatexError = "Errors occurred while executing pdfLaTeX.";
+    private final String bibtexError = "Errors occurred while executing bibtex.";
     private String errorMessage;
     private File pdfFile;
     private FileService fileService;
-    private final String pdfLatexError = "Errors occurred while executing pdfLaTeX.";
-    private final String bibtexError = "Errors occurred while executing bibtex.";
 
     public LatexService(FileService fileService) {
         this.fileService = fileService;
@@ -42,7 +42,9 @@ public class LatexService {
         InputStreamReader inputStreamReader = new InputStreamReader(process.getInputStream());
 
         try (BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) {
-            while ((bufferedReader.readLine()) != null) ;
+            while ((bufferedReader.readLine()) != null) {
+                //
+            }
         }
 
         int exitCode = process.waitFor();
@@ -55,16 +57,18 @@ public class LatexService {
     private boolean generate(String filename, File dir) throws IOException, InterruptedException {
         startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, pdfLatexError);
         startProcess(new String[]{"bibtex", filename}, dir, bibtexError);
-        if (startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, pdfLatexError) != 0)
+        if (startProcess(new String[]{"pdflatex", filename, "--interaction=nonstopmode"}, dir, pdfLatexError) != 0) {
             return false;
+        }
         return checkPdf(filename, dir);
     }
 
     private boolean checkPdf(String filename, File dir) {
         pdfFile = new File(dir.getAbsolutePath() + File.separator + filename + ".pdf");
 
-        if (pdfFile.isFile()) return true;
+        if (pdfFile.isFile()) {
-        else {
+            return true;
+        } else {
             errorMessage = "The pdf file could not be created.";
             return false;
         }

src/main/java/ru/ulstu/paper/service/PaperService.java

@@ -31,6 +31,7 @@ import static ru.ulstu.paper.model.Paper.PaperStatus.COMPLETED;
 import static ru.ulstu.paper.model.Paper.PaperStatus.DRAFT;
 import static ru.ulstu.paper.model.Paper.PaperStatus.FAILED;
 import static ru.ulstu.paper.model.Paper.PaperStatus.ON_PREPARATION;
+import static ru.ulstu.paper.model.Paper.PaperType.OTHER;
 
 @Service
 public class PaperService {
@@ -99,6 +100,7 @@ public class PaperService {
         paper.setCreateDate(paper.getCreateDate() == null ? new Date() : paper.getCreateDate());
         paper.setLocked(paperDto.getLocked());
         paper.setStatus(paperDto.getStatus() == null ? DRAFT : paperDto.getStatus());
+        paper.setType(paperDto.getType() == null ? OTHER : paperDto.getType());
         paper.setTitle(paperDto.getTitle());
         paper.setUpdateDate(new Date());
         paper.setDeadlines(deadlineService.saveOrCreate(paperDto.getDeadlines()));
@@ -149,6 +151,10 @@ public class PaperService {
         return Arrays.asList(Paper.PaperStatus.values());
     }
 
+    public List<Paper.PaperType> getPaperTypes() {
+        return Arrays.asList(Paper.PaperType.values());
+    }
+
     @Transactional
     public Paper create(String title, User user, Date deadlineDate) {
         Paper paper = new Paper();
@@ -158,6 +164,7 @@ public class PaperService {
         paper.setCreateDate(new Date());
         paper.setUpdateDate(new Date());
         paper.setStatus(DRAFT);
+        paper.setType(OTHER);
         paper = paperRepository.save(paper);
 
         paperNotificationService.sendCreateNotification(paper);

src/main/java/ru/ulstu/project/controller/ProjectController.java

@@ -2,16 +2,26 @@ package ru.ulstu.project.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.project.service.ProjectService;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.validation.Valid;
+import java.io.IOException;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.springframework.util.StringUtils.isEmpty;
+import static ru.ulstu.core.controller.Navigation.hasErrors;
 
 @Controller()
 @RequestMapping(value = "/projects")
@@ -46,4 +56,33 @@ public class ProjectController {
     public List<Project.ProjectStatus> getProjectStatuses() {
         return projectService.getProjectStatuses();
     }
+
+    @PostMapping(value = "/project", params = "save")
+    public String save(@Valid ProjectDto projectDto, Errors errors) throws IOException {
+        filterEmptyDeadlines(projectDto);
+        if (projectDto.getDeadlines().isEmpty()) {
+            errors.rejectValue("deadlines", "errorCode", "Не может быть пустым");
+        }
+        if (errors.hasErrors()) {
+            return "/projects/project";
+        }
+        projectService.save(projectDto);
+        return String.format("redirect:%s", "/projects/projects");
+    }
+
+    @PostMapping(value = "/project", params = "addDeadline")
+    public String addDeadline(@Valid ProjectDto projectDto, Errors errors) {
+        filterEmptyDeadlines(projectDto);
+        if (errors.hasErrors()) {
+            return "/projects/project";
+        }
+        projectDto.getDeadlines().add(new Deadline());
+        return "/projects/project";
+    }
+
+    private void filterEmptyDeadlines(ProjectDto projectDto) {
+        projectDto.setDeadlines(projectDto.getDeadlines().stream()
+                .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
+                .collect(Collectors.toList()));
+    }
 }

src/main/java/ru/ulstu/project/model/Project.java

@@ -3,6 +3,7 @@ package ru.ulstu.project.model;
 import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.deadline.model.Deadline;
+import ru.ulstu.file.model.FileData;
 import ru.ulstu.grant.model.Grant;
 
 import javax.persistence.CascadeType;
@@ -57,6 +58,10 @@ public class Project extends BaseEntity {
     @NotNull
     private String repository;
 
+    @ManyToOne
+    @JoinColumn(name = "file_id")
+    private FileData application;
+
     public String getTitle() {
         return title;
     }
@@ -104,4 +109,12 @@ public class Project extends BaseEntity {
     public void setDeadlines(List<Deadline> deadlines) {
         this.deadlines = deadlines;
     }
+
+    public FileData getApplication() {
+        return application;
+    }
+
+    public void setApplication(FileData application) {
+        this.application = application;
+    }
 }

src/main/java/ru/ulstu/project/model/ProjectDto.java

@@ -19,6 +19,7 @@ public class ProjectDto {
     private List<Deadline> deadlines = new ArrayList<>();
     private GrantDto grant;
     private String repository;
+    private String applicationFileName;
 
     public ProjectDto() {
     }
@@ -42,6 +43,7 @@ public class ProjectDto {
         this.grant = grant;
         this.repository = repository;
         this.deadlines = deadlines;
+        this.applicationFileName = null;
     }
 
 
@@ -50,6 +52,7 @@ public class ProjectDto {
         this.title = project.getTitle();
         this.status = project.getStatus();
         this.description = project.getDescription();
+        this.applicationFileName = project.getApplication() == null ? null : project.getApplication().getName();
         this.grant = project.getGrant() == null ? null : new GrantDto(project.getGrant());
         this.repository = project.getRepository();
         this.deadlines = project.getDeadlines();
@@ -110,4 +113,12 @@ public class ProjectDto {
     public void setDeadlines(List<Deadline> deadlines) {
         this.deadlines = deadlines;
     }
+
+    public String getApplicationFileName() {
+        return applicationFileName;
+    }
+
+    public void setApplicationFileName(String applicationFileName) {
+        this.applicationFileName = applicationFileName;
+    }
 }

src/main/java/ru/ulstu/project/service/ProjectService.java

@@ -4,15 +4,19 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.service.DeadlineService;
+import ru.ulstu.file.service.FileService;
+import ru.ulstu.grant.repository.GrantRepository;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.project.repository.ProjectRepository;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
 import static org.springframework.util.ObjectUtils.isEmpty;
 import static ru.ulstu.core.util.StreamApiUtils.convert;
+import static ru.ulstu.project.model.Project.ProjectStatus.APPLICATION;
 
 @Service
 public class ProjectService {
@@ -20,11 +24,17 @@ public class ProjectService {
 
     private final ProjectRepository projectRepository;
     private final DeadlineService deadlineService;
+    private final GrantRepository grantRepository;
+    private final FileService fileService;
 
     public ProjectService(ProjectRepository projectRepository,
-                          DeadlineService deadlineService) {
+                          DeadlineService deadlineService,
+                          GrantRepository grantRepository,
+                          FileService fileService) {
         this.projectRepository = projectRepository;
         this.deadlineService = deadlineService;
+        this.grantRepository = grantRepository;
+        this.fileService = fileService;
     }
 
     public List<Project> findAll() {
@@ -46,19 +56,28 @@ public class ProjectService {
     }
 
     @Transactional
-    public Project create(ProjectDto projectDto) {
+    public Project create(ProjectDto projectDto) throws IOException {
         Project newProject = copyFromDto(new Project(), projectDto);
         newProject = projectRepository.save(newProject);
         return newProject;
     }
 
-    private Project copyFromDto(Project project, ProjectDto projectDto) {
+    private Project copyFromDto(Project project, ProjectDto projectDto) throws IOException {
+        project.setDescription(projectDto.getDescription());
+        project.setStatus(projectDto.getStatus() == null ? APPLICATION : projectDto.getStatus());
         project.setTitle(projectDto.getTitle());
+        if (projectDto.getGrant() != null && projectDto.getGrant().getId() != null) {
+            project.setGrant(grantRepository.findOne(projectDto.getGrant().getId()));
+        }
+        project.setRepository(projectDto.getRepository());
         project.setDeadlines(deadlineService.saveOrCreate(projectDto.getDeadlines()));
+        if (projectDto.getApplicationFileName() != null) {
+            project.setApplication(fileService.createFileFromTmp(projectDto.getApplicationFileName()));
+        }
         return project;
     }
 
-    public Project save(ProjectDto projectDto) {
+    public Project save(ProjectDto projectDto) throws IOException {
         if (isEmpty(projectDto.getId())) {
             return create(projectDto);
         } else {

src/main/java/ru/ulstu/students/controller/TaskController.java

@@ -3,7 +3,11 @@ package ru.ulstu.students.controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.Errors;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.students.model.Task;
 import ru.ulstu.students.model.TaskDto;
@@ -16,7 +20,9 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static org.springframework.util.StringUtils.isEmpty;
-import static ru.ulstu.students.controller.Navigation.*;
+import static ru.ulstu.students.controller.Navigation.REDIRECT_TO;
+import static ru.ulstu.students.controller.Navigation.TASKS_PAGE;
+import static ru.ulstu.students.controller.Navigation.TASK_PAGE;
 
 @Controller()
 @RequestMapping(value = "/students")

src/main/java/ru/ulstu/students/model/Task.java

@@ -7,7 +7,19 @@ import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.tags.model.Tag;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

src/main/java/ru/ulstu/user/model/UserSession.java

@@ -2,7 +2,13 @@ package ru.ulstu.user.model;
 
 import ru.ulstu.core.model.BaseEntity;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 

src/main/resources/db/changelog-20190417_000000-schema.xml

@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="vova" id="20190417_000000-1">
+        <addColumn tableName="users_conference">
+            <column name="id" type="integer"></column>
+            <column name="version" type="integer"></column>
+        </addColumn>
+        <addPrimaryKey columnNames="id" constraintName="pk_users_conference" tableName="users_conference"/>
+        <modifyDataType tableName="users_conference" columnName="participation" newDataType="varchar(255)"/>
+    </changeSet>
+
+</databaseChangeLog>

src/main/resources/db/changelog-20190421_000000-schema.xml

@@ -0,0 +1,15 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="masha" id="20190421_000000-1">
+        <addColumn tableName="paper">
+            <column name="type" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="masha" id="20190421_000000-2">
+        <update tableName="paper">
+            <column name="type" value="OTHER"/>
+        </update>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog-20190422_000000-schema.xml

@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="anton" id="20190418_000000-1">
+        <addColumn tableName="project">
+            <column name="file_id" type="integer"/>
+        </addColumn>
+        <addForeignKeyConstraint baseTableName="project" baseColumnNames="file_id"
+                                 constraintName="fk_project_file_id" referencedTableName="file"
+                                 referencedColumnNames="id"/>
+        <addColumn tableName="project">
+            <column name="applicationFileName" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog-master.xml

@@ -24,10 +24,13 @@
     <include file="db/changelog-20190331_000000-schema.xml"/>
     <include file="db/changelog-20190331_000010-schema.xml"/>
     <include file="db/changelog-20190410_000000-schema.xml"/>
+    <include file="db/changelog-20190417_000000-schema.xml"/>
     <include file="db/changelog-20190418_000000-schema.xml"/>
     <include file="db/changelog-20190323_000001-schema.xml"/>
     <include file="db/common/changelog-20190312_130000-schema.xml"/>
     <include file="db/changelog-20190402_000000-schema.xml"/>
     <include file="db/changelog-20190404_000000-schema.xml"/>
     <include file="db/changelog-20190419_000000-schema.xml"/>
+    <include file="db/changelog-20190421_000000-schema.xml"/>
+    <include file="db/changelog-20190422_000000-schema.xml"/>
 </databaseChangeLog>

src/main/resources/public/css/conference.css

@@ -3,7 +3,7 @@ body {
 }
 
 .conference-row .col:hover {
-    background-color: #eaeaea;
+    background-color: #f3f3f3;
     border-radius: .25rem;
 }
 
@@ -11,7 +11,13 @@ body {
     color: white;
 }
 
+.filter .dropdown {
+    margin-bottom: 10px;
+}
 
+.conference-row .col .text-decoration {
+    text-decoration: none;
+}
 
 
 .form-group textarea {
@@ -43,7 +49,44 @@ body {
 
 .member {
     margin: 0;
+    height: 40px;
+    max-height: 40px;
 }
+.member select {
+    appearance: none;
+    -moz-appearance: none;
+    -webkit-appearance: none;
+    border: none;
+    outline: none;
+    padding: 0.5rem 1.75em 0.5rem 0.5em;
+    display: inline-block;
+    background: transparent url("https://cdn3.iconfinder.com/data/icons/faticons/32/arrow-down-01-16.png") no-repeat right 7px center;
+
+}
+
+.member select:nth-child(4) {
+    border-right: 1px solid #ced4da;
+}
+
+
+.member-name {
+    padding: .75rem 1.25rem;
+    cursor: default;
+    outline: none;
+    border: none;
+    border-right: 1px solid #ced4da;
+}
+
+#take-part[disabled=disabled] {
+    background-color: #ced4da;
+    border-color: #c2c5c7;
+}
+
+#take-part[disabled=disabled]:hover {
+    background-color: #737475 !important;
+    border-color: #5d5e5f !important;
+}
+
 
 .paper-list {
     height: 200px;

src/main/resources/public/js/conference.js

@@ -1,17 +1,5 @@
 $(document).ready(function () {
 
-    $(".conference-row").mouseenter(function (event) {
-            var conferenceRow = $(event.target).closest(".conference-row");
-            $(conferenceRow).css("background-color", "#f8f9fa");
-            $(conferenceRow).find(".remove-conference").removeClass("d-none");
-
-    });
-    $(".conference-row").mouseleave(function (event) {
-        var conferenceRow = $(event.target).closest(".conference-row");
-        $(conferenceRow).css("background-color", "white");
-        $(conferenceRow).closest(".conference-row").find(".remove-conference").addClass("d-none");
-    });
-
     $('a[data-confirm]').click(function(ev) {
         var href = $(this).attr('href');
         if (!$('#dataConfirmModal').length) {

src/main/resources/templates/conferences/conference.html

@@ -38,7 +38,7 @@
                                 <div class="form-group">
                                     <label for="url">URL:</label>
                                     <input class="form-control" th:field="*{url}" id="url" type="text"
-                                           placeholder="URL адрес"/>
+                                           placeholder="http://"/>
                                 </div>
 
                                 <div class="form-group">
@@ -97,38 +97,35 @@
                                 <div class="form-group">
                                     <label for="members">Участники:</label>
                                     <div class="member-list form-control list-group" id="members">
-                                        <div class="member d-flex list-group-item justify-content-between  p-1">
+                                        <div class="member d-flex list-group-item p-0"
-                                            <div class="member-name">
+                                             th:each="user, rowStat : *{users}">
-                                                Пользователь 1
+                                            <input type="hidden" th:field="*{users[__${rowStat.index}__].id}"/>
-                                            </div>
+                                            <input type="hidden" th:field="*{users[__${rowStat.index}__].user}"/>
-                                            <div class="member-participation">
+                                            <input class="member-name w-100" readonly="true"
-                                                очная
+                                                   th:field="*{users[__${rowStat.index}__].user.lastName}"/>
-                                            </div>
+                                            <select class="member-participation w-auto"
-                                            <div class="member-deposit">
+                                                    th:field="*{users[__${rowStat.index}__].participation}">
-                                                статья
+                                                <option th:each="participation : ${allParticipation}"
-                                            </div>
+                                                        th:value="${participation}"
-                                        </div>
+                                                        th:text="${participation.participation}">Participation
+                                                </option>
 
-                                        <div class="member d-flex list-group-item justify-content-between  p-1">
+                                            </select>
-                                            <div class="member-name">
+                                            <select class="member-deposit w-auto"
-                                                Пользователь 1
+                                                    th:field="*{users[__${rowStat.index}__].deposit}">
+                                                <option th:each="deposit : ${allDeposit}" th:value="${deposit}"
+                                                        th:text="${deposit.deposit}">Deposit
+                                                </option>
+                                            </select>
                                         </div>
-                                            <div class="member-participation">
-                                                очная
-                                            </div>
-                                            <div class="member-deposit">
-                                                доклад
-                                            </div>
-                                        </div>
-
                                     </div>
                                 </div>
 
                                 <div class="form-group d-flex justify-content-end">
-                                    <button id="take-part" class="btn btn-primary"
+                                    <input type="hidden" th:value="*{disabledTakePart}" th:name="disabledTakePart"/>
-                                            type="button">
+                                    <input id="take-part" class="btn btn-primary"
-                                        Принять участие
+                                           type="submit" name="takePart" value="Принять участие"
-                                    </button>
+                                           th:disabled="*{disabledTakePart}"/>
                                 </div>
 
                                 <div class="form-group">

src/main/resources/templates/conferences/conferences.html

@@ -27,16 +27,19 @@
                     <div class="col-md-3 col-sm-12">
                         <div class="filter">
                             <h5>Фильтр:</h5>
-                            <select class="form-control" id="author"
+                            <select class="selectpicker form-control" id="user"
-                                    onchange="this.form.submit();">
+                                    th:field="${filteredConferences.filterUserId}"
-                                <option value="">Все авторы</option>
+                                    onchange="this.form.submit();" data-style="btn-primary" data-size="5">
-                                <option>lastName
+                                <option value="">Все участники</option>
+                                <option th:each="user: ${allUsers}" th:value="${user.id}"
+                                        th:text="${user.lastName}">lastName
                                 </option>
                             </select>
-                            <select class="form-control" id="year"
+                            <select class="selectpicker form-control" id="year" th:field="${filteredConferences.year}"
-                                    onchange="this.form.submit();">
+                                    onchange="this.form.submit();" data-style="btn-primary" data-size="5">
                                 <option value="">Все годы</option>
-                                <option>year
+                                <option th:each="year: ${allYears}" th:value="${year}"
+                                        th:text="${year}">year
                                 </option>
                             </select>
                         </div>

src/main/resources/templates/conferences/dashboard.html

@@ -16,11 +16,10 @@
                 </div>
             </div>
             <hr/>
-            <div class="row">
+            <div class="row justify-content-center" id="dashboard">
-                <div class="col-lg-12">
+                <th:block th:each="conference : ${conferences}">
-
+                    <div th:replace="conferences/fragments/confDashboardFragment :: confDashboard(conference=${conference})"/>
-
+                </th:block>
-                </div>
             </div>
         </div>
     </section>

src/main/resources/templates/conferences/fragments/confDashboardFragment.html

@@ -10,8 +10,14 @@
 
         </div>
         <div class="col col-10 text-right">
-            <h7 class="service-heading"> title</h7>
+            <p th:if="${conference.url!=null and conference.url!=''}"><a target="_blank" th:href="${conference.url}"><i
-            <p class="text-muted"></p>
+                    class="fa fa-external-link fa-1x"
+                    aria-hidden="true"></i></a></p>
+            <p th:unless="${conference.url!=null and conference.url!=''}"><i class="fa fa-fw fa-2x"
+                                                                             aria-hidden="true"></i></p>
+            <a th:href="'conference?id='+${conference.id}">
+                <h7 class="service-heading" th:text="${conference.title}"> title</h7>
+            </a>
         </div>
     </div>
 </div>

src/main/resources/templates/conferences/fragments/confLineFragment.html

@@ -5,13 +5,14 @@
 </head>
 <body>
 <div th:fragment="confLine (conference)" class="row text-left conference-row h3" style="background-color: white;">
-    <div class="col">
+    <div class="col d-flex justify-content-between">
-        <a th:href="@{'conference?id='+${conference.id}}">
+        <a th:href="@{'conference?id='+${conference.id}}" class="w-100 text-decoration">
             <span class="h5" th:text="${conference.title}"/>
+            <span class="text-muted h6 float-right m-2" th:text="${conference.datesString}"/>
         </a>
         <input class="id-class" type="hidden" th:value="${conference.id}"/>
-        <a class="remove-paper pull-right" th:href="@{'/conferences/delete/'+${conference.id}}"
+        <a class="remove-paper pull-right m-auto" th:href="@{'/conferences/delete/'+${conference.id}}"
-           data-confirm="Удалить статью?">
+           data-confirm="Удалить конференцию?">
             <i class="fa fa-trash" aria-hidden="true"></i>
         </a>
     </div>

src/main/resources/templates/conferences/fragments/confNavigationFragment.html

@@ -13,7 +13,7 @@
     </div>
 
     <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
-        <a href="./actual" class="btn btn-light toolbar-button">
+        <a href="./dashboard" class="btn btn-light toolbar-button">
             <i class="fa fa-newspaper-o" aria-hidden="true"></i>
             Актуальное</a>
     </div>

src/main/resources/templates/grants/fragments/grantDashboardFragment.html

@@ -10,7 +10,9 @@
             <span th:replace="grants/fragments/grantStatusFragment :: grantStatus(grantStatus=${grant.status})"/>
         </div>
         <div class="col col-10 text-right">
+            <a th:href="'grant?id='+${grant.id}">
                 <h7 class="service-heading" th:text="${grant.title}"> title</h7>
+            </a>
             <p class="text-muted" th:text="${grant.status.statusName}"> status</p>
         </div>
     </div>

src/main/resources/templates/grants/grant.html

@@ -241,6 +241,7 @@
         });
         /*]]>*/
 
+
     </script>
     <script type="text/javascript">
         function updateAuthors() {

src/main/resources/templates/papers/fragments/paperFilesListFragment.html

@@ -8,7 +8,7 @@
 <div th:fragment="filesList (isLatexAttach)" th:remove="tag">
     <th:block th:each="file, rowStat : *{files}">
 
-        <span th:if="${file.isLatexAttach == isLatexAttach}" th:remove="tag">
+        <span th:if="${(!isLatexAttach and file.isLatexAttach == null) or file.isLatexAttach == isLatexAttach}" th:remove="tag">
 
             <div class="row" th:id="|files${rowStat.index}|"
                  th:style="${file.deleted} ? 'display: none;' :''">

src/main/resources/templates/papers/paper.html

@@ -47,6 +47,15 @@
                                             <p class="help-block text-danger"></p>
                                         </div>
 
+                                        <div class="form-group">
+                                            <label for="type">Тип статьи:</label>
+                                            <select class="form-control" th:field="*{type}" id="type">
+                                                <option th:each="type : ${allTypes}" th:value="${type}"
+                                                        th:text="${type.typeName}">Type
+                                                </option>
+                                            </select>
+                                        </div>
+
                                         <div class="form-group">
                                             <label for="status">Статус:</label>
                                             <select class="form-control" th:field="*{status}" id="status">

src/main/resources/templates/projects/dashboard.html

@@ -13,8 +13,8 @@
                 <div th:replace="projects/fragments/projectNavigationFragment"/>
             </div>
             <div class="row justify-content-center" id="dashboard">
-                <th:block>
+                <th:block th:each="project : ${projects}">
-                    <div/>
+                    <div th:replace="projects/fragments/projectDashboardFragment :: projectDashboard(project=${project})"/>
                 </th:block>
             </div>
         </div>

src/main/resources/templates/projects/fragments/projectDashboardFragment.html

@@ -0,0 +1,19 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:fragment="headerfiles">
+    <meta charset="UTF-8"/>
+</head>
+<body>
+<div th:fragment="projectDashboard (project)" class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
+    <div class="row">
+        <div class="col-2">
+            <span th:replace="projects/fragments/projectStatusFragment :: projectStatus(projectStatus=${project.status})"/>
+        </div>
+        <div class="col col-10 text-right">
+            <h7 class="service-heading" th:text="${project.title}"> title</h7>
+            <p class="text-muted" th:text="${project.status.statusName}"> status</p>
+        </div>
+    </div>
+</div>
+</body>
+</html>

src/main/resources/templates/projects/project.html

@@ -71,16 +71,21 @@
 
                                 <div class="form-group">
                                     <label>Дедлайны показателей:</label>
-                                    <div class="row">
+                                    <div class="row" th:each="deadline, rowStat : *{deadlines}">
-                                        <input type="hidden"/>
+                                        <input type="hidden" th:field="*{deadlines[__${rowStat.index}__].id}"/>
-                                        <div class="col-6">
+                                        <div class="col-6 div-deadline-date">
-                                            <input type="date" class="form-control" name="deadline"/>
+                                            <input type="date" class="form-control form-deadline-date" name="deadline"
+                                                   th:field="*{deadlines[__${rowStat.index}__].date}"/>
                                         </div>
-                                        <div class="col-4">
+                                        <div class="col-4 div-deadline-description">
-                                            <input class="form-control" type="text" placeholder="Описание"/>
+                                            <input class="form-control" type="text" placeholder="Описание"
+                                                   th:field="*{deadlines[__${rowStat.index}__].description}"/>
                                         </div>
                                         <div class="col-2">
-                                            <a class="btn btn-danger float-right"><span
+                                            <a class="btn btn-danger float-right"
+                                               th:onclick="|$('#deadlines${rowStat.index}\\.description').val('');
+                                                $('#deadlines${rowStat.index}\\.date').val('');
+                                                $('#addDeadline').click();|"><span
                                                     aria-hidden="true"><i class="fa fa-times"/></span>
                                             </a>
                                         </div>
@@ -90,8 +95,7 @@
                                 </div>
                                 <div class="form-group">
                                     <input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"
-                                           value="Добавить
+                                           value="Добавить дедлайн"/>
-                                    дедлайн"/>
                                 </div>
 
                                 <div class="form-group">
@@ -110,7 +114,8 @@
                                         Сохранить
                                     </button>
                                     <button id="cancelButton" class="btn btn-default text-uppercase"
-                                            href="/projects/projects">
+                                            onclick="location.href='/projects/projects'" href="/projects/projects"
+                                            type="button">
                                         Отмена
                                     </button>
                                 </div>
@@ -139,6 +144,7 @@
         });
         /*]]>*/
 
+
     </script>
 </div>
 </body>