Permalink
Browse files

Merge branch 'master' of github.com:jjug-ccc/cfp

  • Loading branch information...
making committed Jan 11, 2018
2 parents 041ff89 + bb4251a commit 2431030f0b81b21239ae60e6b0ce2c7f87706916
@@ -18,6 +18,6 @@ long countBySubmission_SubmissionIdAndGithub(@Param("submissionId") UUID submiss
@Param("github") String github);
@RestResource(exported = false)
@Query("SELECT s.submissionId AS submissionId, s.title AS title, sp.name AS name, sp.github AS github, sp.email AS email, s.category AS category, s.level AS level, s.talkType AS talkType, s.submissionStatus AS status, count(v) AS count FROM Vote v RIGHT OUTER JOIN v.submission s JOIN s.speaker sp WHERE s.conference.confId = :confId AND s.submissionStatus IN (jjug.submission.enums.SubmissionStatus.SUBMITTED, jjug.submission.enums.SubmissionStatus.ACCEPTED, jjug.submission.enums.SubmissionStatus.SPONSORED, jjug.submission.enums.SubmissionStatus.REJECTED) GROUP BY s.submissionId ORDER BY count(v) DESC, s.createdAt ASC")
@Query("SELECT s.submissionId AS submissionId, s.title AS title, sp.name AS name, sp.github AS github, sp.email AS email, s.category AS category, s.level AS level, s.talkType AS talkType, s.submissionStatus AS status, s.updatedAt AS updatedAt, count(v) AS count FROM Vote v RIGHT OUTER JOIN v.submission s JOIN s.speaker sp WHERE s.conference.confId = :confId AND s.submissionStatus IN (jjug.submission.enums.SubmissionStatus.SUBMITTED, jjug.submission.enums.SubmissionStatus.ACCEPTED, jjug.submission.enums.SubmissionStatus.SPONSORED, jjug.submission.enums.SubmissionStatus.REJECTED) GROUP BY s.submissionId ORDER BY count(v) DESC, s.createdAt ASC")
List<VoteSummary> reportSummary(@Param("confId") UUID confId);
}
@@ -1,12 +1,13 @@
package jjug.vote;
import java.util.UUID;
import jjug.submission.enums.Category;
import jjug.submission.enums.Level;
import jjug.submission.enums.SubmissionStatus;
import jjug.submission.enums.TalkType;
import java.time.Instant;
import java.util.UUID;
public interface VoteSummary {
UUID getSubmissionId();
@@ -26,5 +27,7 @@
SubmissionStatus getStatus();
Instant getUpdatedAt();
long getCount();
}
@@ -53,6 +53,7 @@ email=Email
transportationAllowance=Need transportation allowance
city=Country and City (if you require transportation allowance)
note=Notes to the staff / Additional session information
updatedAt=Updated date
# validation
NotNull={0} may not be null
NotEmpty={0} may not be empty
@@ -53,7 +53,7 @@ email=Email
transportationAllowance=Need transportation allowance
city=Country and City (if you require transportation allowance)
note=Notes to the staff / Additional session information
updatedAt=Updated date
# validation
NotNull={0} may not be null
NotEmpty={0} may not be empty
@@ -53,6 +53,7 @@ email=Email
transportationAllowance=交通費支給を希望
city=国・市町村(交通費支給を要する場合)
note=事務局へのコメント、セッションの補足情報など
updatedAt=更新日時
# validation
NotNull={0}は入力必須です
NotEmpty={0}は入力必須です
@@ -135,6 +135,7 @@ <h3>投票結果</h3>
<th th:text="#{category}">aa</th>
<th th:text="#{level}">aa</th>
<th th:text="#{talkType}">aa</th>
<th th:text="#{updatedAt}">aa</th>
<th>投票数</th>
</tr>
<tr th:each="vote,row : ${voteSummaries}">
@@ -155,6 +156,7 @@ <h3>投票結果</h3>
<td th:text="${vote.category.message(@messageSource, #locale)}"></td>
<td th:text="${vote.level.message(@messageSource, #locale)}"></td>
<td th:text="${vote.talkType.message(@messageSource, #locale)}"></td>
<td th:text="${vote.updatedAt}"></td>
<td th:text="${vote.count}"></td>
</tr>
</table>

0 comments on commit 2431030

Please sign in to comment.