josha
/
wanijo2
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: josha:938f2ef619227bb6f1b6e9a1fc87abb1983da56d
Branches Tags
josha:master
..
compare: josha:9af57be30604f10cd149159a729374ecd2af6c71
Branches Tags
josha:master

No commits in common. '938f2ef619227bb6f1b6e9a1fc87abb1983da56d' and '9af57be30604f10cd149159a729374ecd2af6c71' have entirely different histories.
938f2ef619 ... 9af57be306

7 changed files with 11 additions and 59 deletions
Show Stats

5
src/main/kotlin/wanijo/wanijo2/domain/document.kt
Unescape Escape View File

@ -53,11 +53,6 @@ data class Document(
updatedAt = Instant.now(), updatedAt = Instant.now(),
dateFields = dateFields.filter { it.id != fieldId }.toSet() dateFields = dateFields.filter { it.id != fieldId }.toSet()
) )
fun updated() =
copy(
updatedAt = Instant.now()
)
} }
@Table("T_DOCUMENT") @Table("T_DOCUMENT")

12
src/main/kotlin/wanijo/wanijo2/domain/handler/AssignTaggingHandler.kt
Unescape Escape View File

@ -1,20 +1,15 @@
package wanijo.wanijo2.domain.handler package wanijo.wanijo2.domain.handler
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional
import wanijo.wanijo2.domain.DocumentDao
import wanijo.wanijo2.domain.DocumentTagging import wanijo.wanijo2.domain.DocumentTagging
import wanijo.wanijo2.domain.DocumentTaggingDao import wanijo.wanijo2.domain.DocumentTaggingDao
import wanijo.wanijo2.domain.event.AssignTaggingCommand import wanijo.wanijo2.domain.event.AssignTaggingCommand
import wanijo.wanijo2.http.DocumentNotFound
@Service @Service
class AssignTaggingHandler( class AssignTaggingHandler(
val taggingDao: DocumentTaggingDao, val taggingDao: DocumentTaggingDao
val documentDao: DocumentDao
) { ) {
@Transactional
fun exec(command: AssignTaggingCommand) { fun exec(command: AssignTaggingCommand) {
taggingDao.save( taggingDao.save(
DocumentTagging.between( DocumentTagging.between(
@ -22,11 +17,6 @@ class AssignTaggingHandler(
command.tagId command.tagId
) )
) )
documentDao.save(
(documentDao
.findById(command.documentId) ?: throw DocumentNotFound())
.updated()
)
} }
} }

12
src/main/kotlin/wanijo/wanijo2/domain/handler/DeleteTaggingHandler.kt
Unescape Escape View File

@ -1,29 +1,19 @@
package wanijo.wanijo2.domain.handler package wanijo.wanijo2.domain.handler
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional
import wanijo.wanijo2.domain.DocumentDao
import wanijo.wanijo2.domain.DocumentTaggingDao import wanijo.wanijo2.domain.DocumentTaggingDao
import wanijo.wanijo2.domain.event.DeleteTaggingCommand import wanijo.wanijo2.domain.event.DeleteTaggingCommand
import wanijo.wanijo2.http.DocumentNotFound
@Service @Service
class DeleteTaggingHandler( class DeleteTaggingHandler(
val taggingDao: DocumentTaggingDao, val taggingDao: DocumentTaggingDao
val documentDao: DocumentDao
) { ) {
@Transactional
fun exec(command: DeleteTaggingCommand) { fun exec(command: DeleteTaggingCommand) {
taggingDao.delete( taggingDao.delete(
command.documentId, command.documentId,
command.tagId command.tagId
) )
documentDao.save(
(documentDao
.findById(command.documentId) ?: throw DocumentNotFound())
.updated()
)
} }
} }

9
src/main/kotlin/wanijo/wanijo2/http/controller/ShowController.kt
Unescape Escape View File

@ -18,9 +18,6 @@ class ShowController(
val tagDao: TagDao val tagDao: TagDao
) { ) {
val markdownParser: Parser = Parser.builder().build()
val htmlRenderer: HtmlRenderer = HtmlRenderer.builder().build()
@GetMapping("/document/{id}") @GetMapping("/document/{id}")
fun show( fun show(
model: Model, model: Model,
@ -29,9 +26,11 @@ class ShowController(
val document = docDao.findById(id) ?: throw DocumentNotFound() val document = docDao.findById(id) ?: throw DocumentNotFound()
model["document"] = document model["document"] = document
model["descHtml"] = markdownParser.parse(document.description).let {
htmlRenderer.render(it) val descHtml = Parser.builder().build().parse(document.description).let {
HtmlRenderer.builder().build().render(it)
} }
model["descHtml"] = descHtml
val documentTags = tagDao.ofDocument(id) val documentTags = tagDao.ofDocument(id)
model["documentTags"] = documentTags.sortedBy { it.name.lowercase() } model["documentTags"] = documentTags.sortedBy { it.name.lowercase() }

24
src/main/resources/static/stylesheet.css
Unescape Escape View File

@ -74,10 +74,7 @@ main {
.tag-block { .tag-block {
border: 1px solid var(--light-grey); border: 1px solid var(--light-grey);
border-left: .5rem solid AccentColor; border-left: .5rem solid AccentColor;
padding: .2rem .2rem .2rem .5rem;
[type=submit] {
padding: .5rem;
}
} }
fieldset { fieldset {
@ -135,25 +132,6 @@ form {
} }
} }
form.vert {
display: grid;
grid-template-columns: 100%;
grid-auto-flow: row;
row-gap: 1rem;
label {
grid-column: 1;
}
input, textarea, select, button, .form__widget {
grid-column: 1;
}
textarea {
min-height: 20rem;
}
}
.form-link { .form-link {
display: inline; display: inline;

4
src/main/resources/templates/new.html
Unescape Escape View File

@ -8,7 +8,7 @@
</head> </head>
<body> <body>
<main id="content" layout:fragment="content"> <main id="content" layout:fragment="content">
<form th:action="@{/document/new}" th:object="${form}" method="post" class="vert"> <form th:action="@{/document/new}" th:object="${form}" method="post">
<label for="name">name</label> <label for="name">name</label>
<input id="name" type="text" th:field="*{name}" required> <input id="name" type="text" th:field="*{name}" required>
@ -24,7 +24,7 @@
</label> </label>
</div> </div>
<label for="tags">tags <small>(csv)</small></label> <label for="tags">tags</label>
<input id="tags" type="text" th:field="*{newTags}"> <input id="tags" type="text" th:field="*{newTags}">
<button type="submit"> <button type="submit">

4
src/main/resources/templates/show.html
Unescape Escape View File

@ -71,7 +71,7 @@
<form class="form-inline" th:action="@{/document/{id}/field/label/delete(id=${document.id})}" method="post"> <form class="form-inline" th:action="@{/document/{id}/field/label/delete(id=${document.id})}" method="post">
<input type="hidden" name="labelFieldId" th:value="${field.id}"> <input type="hidden" name="labelFieldId" th:value="${field.id}">
<input type="hidden" name="documentId" th:value="${document.id}"> <input type="hidden" name="documentId" th:value="${document.id}">
<button type="submit" class="warning">löschen</button> <button type="submit" class="warning">weg</button>
</form> </form>
</dt> </dt>
<dd th:text="${field.value}"></dd> <dd th:text="${field.value}"></dd>
@ -87,7 +87,7 @@
<form class="form-inline" th:action="@{/document/{id}/field/date/delete(id=${document.id})}" method="post"> <form class="form-inline" th:action="@{/document/{id}/field/date/delete(id=${document.id})}" method="post">
<input type="hidden" name="dateFieldId" th:value="${field.id}"> <input type="hidden" name="dateFieldId" th:value="${field.id}">
<input type="hidden" name="documentId" th:value="${document.id}"> <input type="hidden" name="documentId" th:value="${document.id}">
<button type="submit" class="warning">löschen</button> <button type="submit" class="warning">weg</button>
</form> </form>
</dt> </dt>
<dd th:text="${#temporals.format(field.value, 'yyyy-MM-dd HH:mm')}"></dd> <dd th:text="${#temporals.format(field.value, 'yyyy-MM-dd HH:mm')}"></dd>

Write Preview
Loading…
Cancel
Save