Onkel-Werner-Freizeiten/CampOrganizer2
1
1
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

finetuning on overview

Browse Source
This commit is contained in:
Jottyfan 2022-12-06 22:07:35 +01:00
parent 75a625b969
commit 64f130733f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/jottyfan/camporganizer/module/common/IndexGateway.java
View File

@ -4,6 +4,7 @@ import static de.jottyfan.camporganizer.db.jooq.Tables.T_PERSON;
import static de.jottyfan.camporganizer.db.jooq.Tables.T_PROFILE; import static de.jottyfan.camporganizer.db.jooq.Tables.T_PROFILE;
import static de.jottyfan.camporganizer.db.jooq.Tables.V_CAMP; import static de.jottyfan.camporganizer.db.jooq.Tables.V_CAMP;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -14,6 +15,7 @@ import org.jooq.Condition;
import org.jooq.DSLContext; import org.jooq.DSLContext;
import org.jooq.Record; import org.jooq.Record;
import org.jooq.SelectConditionStep; import org.jooq.SelectConditionStep;
import org.jooq.SelectSeekStep1;
import org.jooq.UpdateConditionStep; import org.jooq.UpdateConditionStep;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@ -37,7 +39,7 @@ public class IndexGateway {
private DSLContext jooq; private DSLContext jooq;
public Stream<VCampRecord> getAllCamps(Condition condition) { public Stream<VCampRecord> getAllCamps(Condition condition) {
SelectConditionStep<VCampRecord> sql = jooq.selectFrom(V_CAMP).where(condition); SelectSeekStep1<VCampRecord, LocalDateTime> sql = jooq.selectFrom(V_CAMP).where(condition).orderBy(V_CAMP.ARRIVE);
LOGGER.debug(sql.toString()); LOGGER.debug(sql.toString());
return sql.fetchStream(); return sql.fetchStream();
} }

2
src/main/resources/templates/index.html
View File

@ -47,7 +47,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-3">Preis</div> <div class="col-sm-3">Preis</div>
<div class="col-sm-9" th:text="${c.price + ' €'}"></div> <div class="col-sm-9" th:text="${c.price}"></div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-3">Ferien</div> <div class="col-sm-3">Ferien</div>