From 5520f19357510ccdadcfbf784cbe1c209cbfcd70 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Sat, 25 Apr 2020 20:34:35 +0400 Subject: [PATCH] show grants --- build.gradle | 7 +- .../java/ru/ulstu/core/navigation/Page.java | 38 +++-- .../grant/controller/GrantDashboardView.java | 76 ++++++++++ .../controller/GrantStatusConverter.java | 21 +++ .../ru/ulstu/grant/controller/GrantView.java | 94 ++++++++++++ .../ru/ulstu/grant/controller/GrantsView.java | 68 +++++++++ src/main/java/ru/ulstu/grant/model/Grant.java | 24 +-- .../java/ru/ulstu/grant/page/KiasPage.java | 19 ++- .../ru/ulstu/grant/service/GrantService.java | 66 +++++++- .../ru/ulstu/grant/service/KiasService.java | 22 ++- ...boardView.java => PaperDashboardView.java} | 2 +- .../META-INF/resources/basicTemplate.xhtml | 14 +- .../META-INF/resources/error/500.xhtml | 2 +- .../META-INF/resources/grant/dashboard.xhtml | 91 +++++++++++ .../META-INF/resources/grant/grant.xhtml | 142 ++++++++++++++++++ .../resources/grant/grantStatusFragment.xhtml | 10 ++ .../META-INF/resources/grant/grants.xhtml | 88 +++++++++++ .../META-INF/resources/paper/dashboard.xhtml | 20 +-- .../META-INF/resources/paper/papers.xhtml | 2 +- 19 files changed, 753 insertions(+), 53 deletions(-) create mode 100644 src/main/java/ru/ulstu/grant/controller/GrantDashboardView.java create mode 100644 src/main/java/ru/ulstu/grant/controller/GrantStatusConverter.java create mode 100644 src/main/java/ru/ulstu/grant/controller/GrantView.java create mode 100644 src/main/java/ru/ulstu/grant/controller/GrantsView.java rename src/main/java/ru/ulstu/paper/controller/{DashboardView.java => PaperDashboardView.java} (98%) create mode 100644 src/main/resources/META-INF/resources/grant/dashboard.xhtml create mode 100644 src/main/resources/META-INF/resources/grant/grant.xhtml create mode 100644 src/main/resources/META-INF/resources/grant/grantStatusFragment.xhtml create mode 100644 src/main/resources/META-INF/resources/grant/grants.xhtml diff --git a/build.gradle b/build.gradle index cc89c71..bc20ab3 100644 --- a/build.gradle +++ b/build.gradle @@ -27,8 +27,8 @@ mainClassName = 'ru.ulstu.NgTrackerApplication' build.dependsOn checkstyleMain bootRun.dependsOn checkstyleMain -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 11 +targetCompatibility = 11 bootRun { systemProperties = System.properties @@ -124,7 +124,8 @@ dependencies { compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.6.0' compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.6.0' - //compile group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.35.0' + compile group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.35.0' + compile group: 'xalan', name: 'xalan', version: '2.7.2' testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test' //compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1' diff --git a/src/main/java/ru/ulstu/core/navigation/Page.java b/src/main/java/ru/ulstu/core/navigation/Page.java index b78a144..78da453 100644 --- a/src/main/java/ru/ulstu/core/navigation/Page.java +++ b/src/main/java/ru/ulstu/core/navigation/Page.java @@ -5,28 +5,48 @@ import javax.inject.Named; @Named public class Page { public static final String INDEX = "/index.xhtml"; + public static final String PAPER = "/paper/paper.xhtml"; public static final String PAPER_LIST = "/paper/papers.xhtml"; - public static final String DASHBOARD = "/paper/dashboard.xhtml"; + public static final String PAPER_DASHBOARD = "/paper/dashboard.xhtml"; + public static final String GRANT = "/grant/grant.xhtml"; + public static final String GRANT_LIST = "/grant/grants.xhtml"; + public static final String GRANT_DASHBOARD = "/grant/dashboard.xhtml"; public static final String USER_LIST = "/admin/users.xhtml"; public static final String LOGOUT = "/logout"; - public String getPAPER_LIST() { - return PAPER_LIST; + public String getIndex() { + return INDEX; } - public String getINDEX() { - return INDEX; + public String getPaperList() { + return PAPER_LIST; } - public String getDASHBOARD() { - return DASHBOARD; + public String getPaperDashboard() { + return PAPER_DASHBOARD; } - public String getUSER_LIST() { + public String getUserList() { return USER_LIST; } - public String getLOGOUT() { + public String getLogout() { return LOGOUT; } + + public String getGrantList() { + return GRANT_LIST; + } + + public String getGrantDashboard() { + return GRANT_DASHBOARD; + } + + public String getPaper() { + return PAPER; + } + + public String getGrant() { + return GRANT; + } } diff --git a/src/main/java/ru/ulstu/grant/controller/GrantDashboardView.java b/src/main/java/ru/ulstu/grant/controller/GrantDashboardView.java new file mode 100644 index 0000000..81b4685 --- /dev/null +++ b/src/main/java/ru/ulstu/grant/controller/GrantDashboardView.java @@ -0,0 +1,76 @@ +package ru.ulstu.grant.controller; + +import ru.ulstu.core.util.FacesUtil; +import ru.ulstu.grant.model.Grant; +import ru.ulstu.grant.service.GrantService; +import ru.ulstu.user.service.UserService; + +import javax.annotation.PostConstruct; +import javax.faces.view.ViewScoped; +import javax.inject.Inject; +import javax.inject.Named; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +@Named +@ViewScoped +public class GrantDashboardView { + @Inject + private GrantService grantService; + + @Inject + private UserService userService; + + private List grants; + + private List selectedGrants = new ArrayList<>(); + + private String newGrantTitle; + + @PostConstruct + public void init() { + grants = grantService.findAllActiveByCurrentUser(); + } + + public List getGrants() { + return grants; + } + + public void create() { + grantService.createByTitle(newGrantTitle); + FacesUtil.showInfoMessage("Статья создана", newGrantTitle); + newGrantTitle = ""; + grants = grantService.findAllActiveByCurrentUser(); + } + + public void deleteSelected() { + grantService.delete(selectedGrants); + grants = grantService.findAllActiveByCurrentUser(); + FacesUtil.showInfoMessage("Было удалено грантов: " + selectedGrants.size(), ""); + } + + public List getGrantStatuses() { + return Arrays.asList(Grant.GrantStatus.values()); + } + + public String getNewGrantTitle() { + return newGrantTitle; + } + + public void setNewGrantTitle(String newGrantTitle) { + this.newGrantTitle = newGrantTitle; + } + + public List getSelectedGrants() { + return selectedGrants; + } + + public void setSelectedGrants(List selectedGrants) { + this.selectedGrants = selectedGrants; + } + + public String getCurrentUser() { + return userService.getCurrentUser().getUserAbbreviate(); + } +} diff --git a/src/main/java/ru/ulstu/grant/controller/GrantStatusConverter.java b/src/main/java/ru/ulstu/grant/controller/GrantStatusConverter.java new file mode 100644 index 0000000..51d1b2c --- /dev/null +++ b/src/main/java/ru/ulstu/grant/controller/GrantStatusConverter.java @@ -0,0 +1,21 @@ +package ru.ulstu.grant.controller; + +import ru.ulstu.grant.model.Grant; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.convert.Converter; +import javax.faces.convert.FacesConverter; + +@FacesConverter(value = "grantStatusConverter") +public class GrantStatusConverter implements Converter { + @Override + public Object getAsObject(FacesContext context, UIComponent component, String value) { + return Grant.GrantStatus.valueOf(value); + } + + @Override + public String getAsString(FacesContext context, UIComponent component, Object value) { + return value == null ? "" : ((Grant.GrantStatus) value).name(); + } +} diff --git a/src/main/java/ru/ulstu/grant/controller/GrantView.java b/src/main/java/ru/ulstu/grant/controller/GrantView.java new file mode 100644 index 0000000..105f5da --- /dev/null +++ b/src/main/java/ru/ulstu/grant/controller/GrantView.java @@ -0,0 +1,94 @@ +package ru.ulstu.grant.controller; + +import ru.ulstu.core.navigation.Page; +import ru.ulstu.core.util.FacesUtil; +import ru.ulstu.deadline.model.Deadline; +import ru.ulstu.deadline.service.DeadlineService; +import ru.ulstu.grant.model.Grant; +import ru.ulstu.grant.service.GrantService; +import ru.ulstu.user.model.User; +import ru.ulstu.user.service.UserService; + +import javax.annotation.PostConstruct; +import javax.faces.view.ViewScoped; +import javax.inject.Inject; +import javax.inject.Named; +import java.io.Serializable; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +@Named +@ViewScoped +public class GrantView implements Serializable { + @Inject + private GrantService grantService; + + @Inject + private DeadlineService deadlineService; + + @Inject + private UserService userService; + + private Grant grant; + + private Date newDeadlineDate; + + private String newDeadlineDescription; + + @PostConstruct + public void init() { + grant = grantService.findById(Integer.valueOf(FacesUtil.getRequestParams().get("id"))); + newDeadlineDescription = ""; + newDeadlineDate = new Date(); + FacesUtil.showInfoMessage("Статья открыта", ""); + } + + public Grant getGrant() { + return grant; + } + + public void setGrant(Grant grant) { + this.grant = grant; + } + + public List getGrantStatuses() { + return Arrays.asList(Grant.GrantStatus.values()); + } + + public List getAuthors() { + return userService.findAll(); + } + + public String save() { + grantService.save(grant); + FacesUtil.showInfoMessage("Грант сохранен", ""); + return Page.GRANT_LIST + "?faces-redirect=true"; + } + + public Date getNewDeadlineDate() { + return newDeadlineDate; + } + + public void setNewDeadlineDate(Date newDeadlineDate) { + this.newDeadlineDate = newDeadlineDate; + } + + public String getNewDeadlineDescription() { + return newDeadlineDescription; + } + + public void setNewDeadlineDescription(String newDeadlineDescription) { + this.newDeadlineDescription = newDeadlineDescription; + } + + public void deleteDeadline(Deadline deadline) { + grant.getDeadlines().remove(deadline); + } + + public void addDeadline() { + grant.getDeadlines().add(deadlineService.create(newDeadlineDescription, newDeadlineDate)); + newDeadlineDescription = ""; + newDeadlineDate = new Date(); + } +} diff --git a/src/main/java/ru/ulstu/grant/controller/GrantsView.java b/src/main/java/ru/ulstu/grant/controller/GrantsView.java new file mode 100644 index 0000000..f3c693d --- /dev/null +++ b/src/main/java/ru/ulstu/grant/controller/GrantsView.java @@ -0,0 +1,68 @@ +package ru.ulstu.grant.controller; + +import ru.ulstu.core.util.FacesUtil; +import ru.ulstu.grant.model.Grant; +import ru.ulstu.grant.service.GrantService; + +import javax.annotation.PostConstruct; +import javax.faces.view.ViewScoped; +import javax.inject.Inject; +import javax.inject.Named; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +@Named +@ViewScoped +public class GrantsView { + @Inject + private GrantService grantService; + + private List grants; + + private List selectedGrants = new ArrayList<>(); + + private String newGrantTitle; + + @PostConstruct + public void init() { + grants = grantService.findAll(); + } + + public void create() { + grantService.createByTitle(newGrantTitle); + FacesUtil.showInfoMessage("Статья создана", newGrantTitle); + newGrantTitle = ""; + grants = grantService.findAll(); + } + + public void deleteSelected() { + grantService.delete(selectedGrants); + grants = grantService.findAll(); + FacesUtil.showInfoMessage("Было удалено грантов: " + selectedGrants.size(), ""); + } + + public List getGrantStatuses() { + return Arrays.asList(Grant.GrantStatus.values()); + } + + public List getGrants() { + return grants; + } + + public String getNewGrantTitle() { + return newGrantTitle; + } + + public void setNewGrantTitle(String newGrantTitle) { + this.newGrantTitle = newGrantTitle; + } + + public List getSelectedGrants() { + return selectedGrants; + } + + public void setSelectedGrants(List selectedGrants) { + this.selectedGrants = selectedGrants; + } +} diff --git a/src/main/java/ru/ulstu/grant/model/Grant.java b/src/main/java/ru/ulstu/grant/model/Grant.java index 0d16f77..ec6e90f 100644 --- a/src/main/java/ru/ulstu/grant/model/Grant.java +++ b/src/main/java/ru/ulstu/grant/model/Grant.java @@ -41,24 +41,30 @@ import java.util.Set; @DiscriminatorValue("GRANT") public class Grant extends BaseEntity implements UserActivity, EventSource { public enum GrantStatus { - APPLICATION("Заявка"), - ON_COMPETITION("Отправлен на конкурс"), - SUCCESSFUL_PASSAGE("Успешное прохождение"), - IN_WORK("В работе"), - COMPLETED("Завершен"), - FAILED("Провалены сроки"), - LOADED_FROM_KIAS("Загружен автоматически"), - SKIPPED("Не интересует"); + APPLICATION("Заявка", "text-draft"), + ON_COMPETITION("Отправлен на конкурс", "text-review"), + SUCCESSFUL_PASSAGE("Успешное прохождение", "text-accepted"), + IN_WORK("В работе", "text-primary"), + COMPLETED("Завершен", "text-success"), + FAILED("Провалены сроки", "text-failed"), + LOADED_FROM_KIAS("Загружен автоматически", "text-warning"), + SKIPPED("Не интересует", "text-not-accepted"); private final String statusName; + private final String elementClass; - GrantStatus(String statusName) { + GrantStatus(String statusName, String elementClass) { this.statusName = statusName; + this.elementClass = elementClass; } public String getStatusName() { return statusName; } + + public String getElementClass() { + return elementClass; + } } @NotBlank diff --git a/src/main/java/ru/ulstu/grant/page/KiasPage.java b/src/main/java/ru/ulstu/grant/page/KiasPage.java index dfdec63..b57d804 100644 --- a/src/main/java/ru/ulstu/grant/page/KiasPage.java +++ b/src/main/java/ru/ulstu/grant/page/KiasPage.java @@ -1,12 +1,17 @@ package ru.ulstu.grant.page; -//import com.gargoylesoftware.htmlunit.html.DomNode; -//import com.gargoylesoftware.htmlunit.html.HtmlElement; -//import com.gargoylesoftware.htmlunit.html.HtmlPage; -//import com.gargoylesoftware.htmlunit.html.HtmlTableRow; +import com.gargoylesoftware.htmlunit.html.DomNode; +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import com.gargoylesoftware.htmlunit.html.HtmlTableRow; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; public class KiasPage { - /* private final static String KIAS_GRANT_DATE_FORMAT = "dd.MM.yyyy HH:mm"; + private final static String KIAS_GRANT_DATE_FORMAT = "dd.MM.yyyy HH:mm"; private final HtmlPage page; public KiasPage(HtmlPage page) { @@ -46,5 +51,5 @@ public class KiasPage { public boolean isTableRowGrantLine(DomNode grantElement) { return !((HtmlTableRow) grantElement).getAttribute("class").contains("pagerSavedHeightSpacer"); - }*/ -} + } +} \ No newline at end of file diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java index f46313f..b09ef9e 100644 --- a/src/main/java/ru/ulstu/grant/service/GrantService.java +++ b/src/main/java/ru/ulstu/grant/service/GrantService.java @@ -27,6 +27,7 @@ import ru.ulstu.user.service.UserService; import java.io.IOException; import java.text.ParseException; +import java.time.temporal.ChronoUnit; import java.util.Arrays; import java.util.Collections; import java.util.Date; @@ -313,13 +314,13 @@ public class GrantService extends BaseService { @Transactional public void createFromKias() throws IOException, ParseException { - /* for (GrantDto grantDto : kiasService.getNewGrantsDto()) { + for (GrantDto grantDto : kiasService.getNewGrantsDto()) { if (saveFromKias(grantDto)) { log.debug("GrantScheduler.loadGrantsFromKias new grant was loaded"); } else { log.debug("GrantScheduler.loadGrantsFromKias grant wasn't loaded, cause it's already exists"); } - }*/ + } } public List findAllActiveDto() { @@ -338,4 +339,65 @@ public class GrantService extends BaseService { public void ping(int grantId) throws IOException { pingService.addPing(findById(grantId)); } + + public void save(Grant grant) { + if (isEmpty(grant.getId())) { + create(grant); + } else { + update(grant); + } + } + + @Transactional + public Grant create(Grant grant) { + Grant newGrant = grantRepository.save(grant); + grantNotificationService.sendCreateNotification(newGrant); + return newGrant; + } + + @Transactional + public Integer update(Grant newGrant) { + Grant oldGrant = grantRepository.getOne(newGrant.getId()); + Grant.GrantStatus oldStatus = oldGrant.getStatus(); + Set oldAuthors = new HashSet<>(oldGrant.getAuthors()); + newGrant = grantRepository.save(newGrant); + for (User author : newGrant.getAuthors()) { + if (!oldAuthors.contains(author)) { + grantNotificationService.sendCreateNotification(newGrant); + } + } + + if (newGrant.getStatus() != oldStatus) { + //grantNotificationService.statusChangeNotification(newPaper, oldStatus); + } + + return newGrant.getId(); + } + + public void createByTitle(String newGrantTitle) { + Grant grant = new Grant(); + grant.setTitle(newGrantTitle); + grant.setStatus(APPLICATION); + grant.getAuthors().add(userService.getCurrentUser()); + grant.setLeader(userService.getCurrentUser()); + grant.getDeadlines().add(deadlineService.createWithOffset(new Date(), 1, ChronoUnit.WEEKS)); + create(grant); + } + + public List findAllActiveByCurrentUser() { + return findAllActive() + .stream() + .filter(grant -> grant.getAuthors().contains(userService.getCurrentUser()) || + grant.getLeader().equals(userService.getCurrentUser())) + .collect(toList()); + } + + public void delete(List grants) { + grants.forEach(grant -> delete(grant)); + } + + public void delete(Grant grant) { + deadlineService.delete(grant.getDeadlines()); + grantRepository.delete(grant); + } } diff --git a/src/main/java/ru/ulstu/grant/service/KiasService.java b/src/main/java/ru/ulstu/grant/service/KiasService.java index 0f8d5d4..e8627d3 100644 --- a/src/main/java/ru/ulstu/grant/service/KiasService.java +++ b/src/main/java/ru/ulstu/grant/service/KiasService.java @@ -1,14 +1,24 @@ package ru.ulstu.grant.service; -//import com.gargoylesoftware.htmlunit.WebClient; -//mport com.gargoylesoftware.htmlunit.html.DomNode; -//import com.gargoylesoftware.htmlunit.html.HtmlPage; - +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.html.DomNode; +import com.gargoylesoftware.htmlunit.html.HtmlPage; import org.springframework.stereotype.Service; +import ru.ulstu.configuration.ApplicationProperties; +import ru.ulstu.grant.model.GrantDto; +import ru.ulstu.grant.page.KiasPage; +import ru.ulstu.user.service.UserService; + +import java.io.IOException; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.List; @Service public class KiasService { - /* private final static String BASE_URL = "https://www.rfbr.ru/rffi/ru/contest_search?CONTEST_STATUS_ID=%s&CONTEST_TYPE=%s&CONTEST_YEAR=%s"; + private final static String BASE_URL = "https://www.rfbr.ru/rffi/ru/contest_search?CONTEST_STATUS_ID=%s&CONTEST_TYPE=%s&CONTEST_YEAR=%s"; private final static String CONTEST_STATUS_ID = "1"; private final static String CONTEST_TYPE = "-1"; @@ -59,5 +69,5 @@ public class KiasService { private List generateGrantYears() { return Arrays.asList(Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.YEAR) + 1); - }*/ + } } diff --git a/src/main/java/ru/ulstu/paper/controller/DashboardView.java b/src/main/java/ru/ulstu/paper/controller/PaperDashboardView.java similarity index 98% rename from src/main/java/ru/ulstu/paper/controller/DashboardView.java rename to src/main/java/ru/ulstu/paper/controller/PaperDashboardView.java index 6e2e30f..5bbf85d 100644 --- a/src/main/java/ru/ulstu/paper/controller/DashboardView.java +++ b/src/main/java/ru/ulstu/paper/controller/PaperDashboardView.java @@ -15,7 +15,7 @@ import java.util.List; @Named @ViewScoped -public class DashboardView { +public class PaperDashboardView { @Inject private PaperService paperService; diff --git a/src/main/resources/META-INF/resources/basicTemplate.xhtml b/src/main/resources/META-INF/resources/basicTemplate.xhtml index 2f2ef14..578bea6 100644 --- a/src/main/resources/META-INF/resources/basicTemplate.xhtml +++ b/src/main/resources/META-INF/resources/basicTemplate.xhtml @@ -25,15 +25,19 @@
- + - - + + - + + + + + - +
diff --git a/src/main/resources/META-INF/resources/error/500.xhtml b/src/main/resources/META-INF/resources/error/500.xhtml index 4a15647..72ceb67 100644 --- a/src/main/resources/META-INF/resources/error/500.xhtml +++ b/src/main/resources/META-INF/resources/error/500.xhtml @@ -13,7 +13,7 @@
- + Вернуться на главную + + + + + + + +
+
+
+ + +
+
+ + +
+
+ + + +
+ + + + +
+ + + + + + + + + + + + + + + + #{grant.title} + + + + + + + + + + + + + + + +
+ + + + diff --git a/src/main/resources/META-INF/resources/grant/grant.xhtml b/src/main/resources/META-INF/resources/grant/grant.xhtml new file mode 100644 index 0000000..6941241 --- /dev/null +++ b/src/main/resources/META-INF/resources/grant/grant.xhtml @@ -0,0 +1,142 @@ + + + + + + Редактирование гранта + + + + +
+
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + + + + + + + + + +
+ +
+ +
+
+ + + + +
+
+ +
+
+
+
+ +
+ +
+
+ +
+
+ + + +
+ +
+ +
+
+ +
+
+ + + +
+
+
+
+ +
+ +
+
+ +
+
+

+ Грант создан +

+

+ Грант обновлен +

+
+
+ +
+
+
+ + + + diff --git a/src/main/resources/META-INF/resources/grant/grantStatusFragment.xhtml b/src/main/resources/META-INF/resources/grant/grantStatusFragment.xhtml new file mode 100644 index 0000000..48313fb --- /dev/null +++ b/src/main/resources/META-INF/resources/grant/grantStatusFragment.xhtml @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/src/main/resources/META-INF/resources/grant/grants.xhtml b/src/main/resources/META-INF/resources/grant/grants.xhtml new file mode 100644 index 0000000..f919a8a --- /dev/null +++ b/src/main/resources/META-INF/resources/grant/grants.xhtml @@ -0,0 +1,88 @@ + + + + + + + + +
+
+
+ + +
+
+ + +
+
+ + + +
+ + + + +
+ + + + + + + + + + + + + + + + #{grant.title} + + + + + + + + + + + + + + + +
+ + + + diff --git a/src/main/resources/META-INF/resources/paper/dashboard.xhtml b/src/main/resources/META-INF/resources/paper/dashboard.xhtml index 8a67bb5..b7e97bd 100644 --- a/src/main/resources/META-INF/resources/paper/dashboard.xhtml +++ b/src/main/resources/META-INF/resources/paper/dashboard.xhtml @@ -10,26 +10,27 @@ text-align: right !important; } -
-
- + selection="#{paperDashboardView.selectedPapers}" rowKey="#{paper.id}"> @@ -61,7 +63,7 @@ - + #{paper.title} @@ -72,7 +74,7 @@ - diff --git a/src/main/resources/META-INF/resources/paper/papers.xhtml b/src/main/resources/META-INF/resources/paper/papers.xhtml index d2f8b25..96beeed 100644 --- a/src/main/resources/META-INF/resources/paper/papers.xhtml +++ b/src/main/resources/META-INF/resources/paper/papers.xhtml @@ -60,7 +60,7 @@ - + #{paper.title}