This is an automated email from the git hooks/post-receive script. New commit to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit e804d128d552a498e773b0927cb2ff0e97a94699 Author: Benjamin <poussin@codelutin.com> Date: Wed May 20 00:03:30 2020 +0200 Agencement un peu meilleur pour l'edition --- pkg/utils/stats.go | 22 ++++++--- web/src/components/Bookmark.vue | 2 +- .../{bookmark => common}/BookmarkDate.vue | 0 web/src/components/common/TagsInput.vue | 8 +++- web/src/views/BookmarkEdit.vue | 54 ++++++++++++++-------- 5 files changed, 57 insertions(+), 29 deletions(-) diff --git a/pkg/utils/stats.go b/pkg/utils/stats.go index 0d37308..c51d7ba 100644 --- a/pkg/utils/stats.go +++ b/pkg/utils/stats.go @@ -8,13 +8,17 @@ import ( ) type Stat struct { - Nb int64 `json:"call"` - Min time.Duration `json:"min"` - MinInfo string - Max time.Duration `json:"max"` - MaxInfo string - Avg time.Duration `json:"avg"` - StdDeviation time.Duration `json:"stddeviation"` + Nb int64 `json:"call"` + Min time.Duration `json:"min"` + MinHumain string + MinInfo string + Max time.Duration `json:"max"` + MaxHumain string + MaxInfo string + Avg time.Duration `json:"avg"` + AvgHumain string + StdDeviation time.Duration `json:"stddeviation"` + StdDeviationHumain string // pour l'ecart type (standard deviation) delta int64 @@ -70,18 +74,22 @@ func (call *OneCall) Stop() { s.Nb++ if s.Min == 0 || s.Min > duration { s.Min = duration + s.MinHumain = duration.String() s.MinInfo = call.info } if s.Max < duration { s.Max = duration + s.MaxHumain = duration.String() s.MaxInfo = call.info } s.delta = duration.Nanoseconds() - s.Avg.Nanoseconds() s.Avg = time.Duration(s.Avg.Nanoseconds() + s.delta/s.Nb) + s.AvgHumain = s.Avg.String() s.m2 = s.m2 + s.delta*(duration.Nanoseconds()-s.Avg.Nanoseconds()) variance := float64(s.m2) / math.Max(1, float64(s.Nb-1)) s.StdDeviation = time.Duration(int64(math.Sqrt(variance))) + s.StdDeviationHumain = s.StdDeviation.String() } diff --git a/web/src/components/Bookmark.vue b/web/src/components/Bookmark.vue index 5c98f7d..36cdcdb 100644 --- a/web/src/components/Bookmark.vue +++ b/web/src/components/Bookmark.vue @@ -45,7 +45,7 @@ <script> import { Component, Prop, Vue } from 'vue-property-decorator' import Aliases from '@/components/bookmark/Alias' -import BookmarkDate from '@/components/bookmark/BookmarkDate' +import BookmarkDate from '@/components/common/BookmarkDate' import Tags from '@/components/bookmark/Tags' import Description from '@/components/bookmark/Description' import LinkCount from '@/components/bookmark/LinkCount' diff --git a/web/src/components/bookmark/BookmarkDate.vue b/web/src/components/common/BookmarkDate.vue similarity index 100% rename from web/src/components/bookmark/BookmarkDate.vue rename to web/src/components/common/BookmarkDate.vue diff --git a/web/src/components/common/TagsInput.vue b/web/src/components/common/TagsInput.vue index a904468..65dd562 100644 --- a/web/src/components/common/TagsInput.vue +++ b/web/src/components/common/TagsInput.vue @@ -7,7 +7,7 @@ props: */ <template> <vue-tags-input - id="oldTags" + class="tags-input" v-model="currentTag" :tags="selectedTags" @tags-changed="onChange" @@ -81,4 +81,8 @@ class TagsInput extends Vue { export default TagsInput </script> -<style scoped lang="less"></style> +<style scoped lang="less"> +.tags-input { + max-width: 100%; +} +</style> diff --git a/web/src/views/BookmarkEdit.vue b/web/src/views/BookmarkEdit.vue index f1271ba..48c710b 100644 --- a/web/src/views/BookmarkEdit.vue +++ b/web/src/views/BookmarkEdit.vue @@ -1,26 +1,31 @@ <template> - <div class="bookmark"> + <div class="bookmark-editor"> <div>{{ errorMsg }}</div> - <span>{{ bookmark.importdate || bookmark.creationdate }}</span> - <form> - <input type="text" v-model.trim="bookmark.uri" /> <br /> + <form class="fields"> + <BookmarkDate :creationDate="bookmark.importdate || bookmark.creationdate"></BookmarkDate> + <input type="text" v-model.trim="bookmark.uri" placeholder="add uri" /> <br /> <!-- <span>{{ bookmark.authenticationinfo }}</span> faire afficher une popup de modification de l'objet auth--> - <textarea v-model.trim="bookmark.description"></textarea> - tags: <TagsInput :selected="bookmark.tags"></TagsInput> <!-- <input type="text" v-model.trim="bookmark.tags" /> <br /> --> + <textarea v-model.trim="bookmark.description" placeholder="add description"></textarea> + <TagsInput id="tags" :selected="bookmark.tags"></TagsInput> <!-- <input type="text" v-model.trim="bookmark.tags" /> <br /> --> <!-- <span>{{ bookmark.lang }}</span> --> <!-- <span>{{ bookmark.owner }}</span> si mon id n'est pas le meme alors c'est le bookmark d'un autre partage par un group --> - private alias: <input type="text" v-model.trim="bookmark.privatealias" /> - <br /> - public alias: <input type="text" v-model.trim="bookmark.publicalias" /> - <br /> - <button @click.prevent="cancel">Cancel</button> - <button @click.prevent="save">Save</button> + <label for="private-alias">private alias: + <input id="private-alias" type="text" v-model.trim="bookmark.privatealias" /> + </label> + <label for="public-alias">public alias: + <input id="public-alias" type="text" v-model.trim="bookmark.publicalias" /> + </label> + <div class="actions"> + <button @click.prevent="cancel">Cancel</button> + <button @click.prevent="save">Save</button> + </div> </form> </div> </template> <script> import { Component, Prop, Vue } from 'vue-property-decorator' +import BookmarkDate from '@/components/common/BookmarkDate' import TagsInput from '@/components/common/TagsInput' @Component({ @@ -34,7 +39,7 @@ import TagsInput from '@/components/common/TagsInput' 'publicalias', 'lang' ], - components: {TagsInput} + components: {BookmarkDate, TagsInput} }) class BookmarkEdit extends Vue { @Prop id @@ -48,6 +53,7 @@ class BookmarkEdit extends Vue { errorMsg = '' bookmark = { uri: this.uri, + creationdate: new Date(), description: this.description, tags: this.stringToArray(this.tags), privatealias: this.stringToArray(this.privatealias), @@ -72,12 +78,13 @@ class BookmarkEdit extends Vue { data => { if (data.length > 0) { let b = data[0] - this.bookmark.id = b.id - this.bookmark.description = b.description + '\n' + new Date().toISOString().slice(0, 10) + '\n' + this.bookmark.description - this.bookmark.tags = [...new Set(this.stringToArray(b.tags).concat(this.bookmark.tags))] - this.bookmark.privatealias = [...new Set(this.stringToArray(b.privatealias).concat(this.bookmark.privatealias))] - this.bookmark.publicalias = [...new Set(this.stringToArray(b.publicalias).concat(this.bookmark.publicalias))] - this.bookmark.lang = b.lang || this.bookmark.lang + b.description = b.description + '\n' + new Date().toISOString().slice(0, 10) + '\n' + this.bookmark.description + b.tags = [...new Set(this.stringToArray(b.tags).concat(this.bookmark.tags))] + b.privatealias = [...new Set(this.stringToArray(b.privatealias).concat(this.bookmark.privatealias))] + b.publicalias = [...new Set(this.stringToArray(b.publicalias).concat(this.bookmark.publicalias))] + b.lang = b.lang || this.bookmark.lang + + this.bookmark = b } }, err => { @@ -149,3 +156,12 @@ class BookmarkEdit extends Vue { export default BookmarkEdit </script> + +<style lang="less" scoped> +.fields { + width: 100%; + display: flex; + flex-direction: column; + align-items: stretch; +} +</style> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.