diff --git a/.env.development b/.env.development index 498e006..e109a77 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="DEV 0.0.32" +APP_VERSION="DEV 0.0.33" SERVICE_WORKER_FILE='service-worker.js' APP_ID='1' APP_URL='https://freeplanet.app' diff --git a/src/components/todos/SingleTodo/SingleTodo.scss b/src/components/todos/SingleTodo/SingleTodo.scss index 69959b1..7b93789 100644 --- a/src/components/todos/SingleTodo/SingleTodo.scss +++ b/src/components/todos/SingleTodo/SingleTodo.scss @@ -48,7 +48,7 @@ $heightdescr: 20px; border-width: 1px 0px 1px 0px; border-style: solid; border-color: rgba(49, 68, 240, 0.6); - //background-color: rgba(166, 153, 240, 0.7) !important; + background-color: rgba(83, 132, 250, 0.44) !important; } @@ -218,7 +218,7 @@ $heightdescr: 20px; } .data-item { - max-width: 80px; + max-width: 85px; //min-width: 100px; //display: flex; //visibility: initial; @@ -246,19 +246,27 @@ $heightdescr: 20px; } */ +.divdescrTot { + display: table; + flex: 1; + height: $heightitem; + vertical-align: middle; +} + .div_descr, .div_descr_edit { - margin: auto auto auto 2px; + margin: auto auto auto 0px; //padding: 2px; min-width: 100px; - vertical-align: middle; text-align: left; color: blue !important; - max-height: 42px; overflow: hidden; - flex: 1; + vertical-align: middle; + line-height: 120%; + + //background-color: #d50000; + //order: 2; - line-height: $heightdescr; /* same as height! */ &.hide { display: none !important; @@ -269,9 +277,15 @@ $heightdescr: 20px; } } +.div_descr { + display: table-cell; + +} + .div_descr_edit { max-height: 90px; + line-height: $heightitem; } .div_descr:hover { diff --git a/src/components/todos/SingleTodo/SingleTodo.ts b/src/components/todos/SingleTodo/SingleTodo.ts index 4794947..4f36b77 100644 --- a/src/components/todos/SingleTodo/SingleTodo.ts +++ b/src/components/todos/SingleTodo/SingleTodo.ts @@ -95,7 +95,7 @@ export default class SingleTodo extends Vue { // this.classCompleted = 'completed-item' this.classCompleted = 'completed-item-popover' this.classDescr = 'flex-item div_descr show donotdrag' - this.classDescrEdit = 'flex-item div_descr_edit' + this.classDescrEdit = 'flex-item div_descr_edit donotdrag' if (!this.isTodo()) { this.classDescr += ' titleLista-item' this.classDescrEdit += ' titleLista-item' diff --git a/src/components/todos/SingleTodo/SingleTodo.vue b/src/components/todos/SingleTodo/SingleTodo.vue index b6d8b75..37adbc6 100644 --- a/src/components/todos/SingleTodo/SingleTodo.vue +++ b/src/components/todos/SingleTodo/SingleTodo.vue @@ -2,9 +2,9 @@
{{itemtodo.pos}}
- - - + + +
@@ -15,16 +15,21 @@
- +
+ -
{{itemtodo.descr}}
+
{{itemtodo.descr}} +
+ +
- - + + @@ -42,7 +47,7 @@
{{percentageProgress}}% - +
@@ -55,16 +60,17 @@ v-model="itemtodo.expiring_at" class="myexpired" format="DD/MM/YY" - @change="val => { model = val }" > + @change="val => { model = val }">
-
+
+ icon="menu"> - + diff --git a/src/components/todos/todo/todo.ts b/src/components/todos/todo/todo.ts index f4eec4d..eaa2a1a 100644 --- a/src/components/todos/todo/todo.ts +++ b/src/components/todos/todo/todo.ts @@ -52,6 +52,7 @@ export default class Todo extends Vue { public itemdrag: any = {} public service: any public actualMaxPosition: number = 15 + public scrollable = true fieldtochange: String [] = ['descr', 'completed', 'category', 'expiring_at', 'priority', 'id_prev', 'id_next', 'pos', 'enableExpiring', 'progress'] @@ -444,9 +445,35 @@ export default class Todo extends Vue { this.onEnd(itemdragend) }) + let mythis = this + + $service.eventBus.$on('drag', function (el, source) { + console.log('+++ DRAG') + mythis.scrollable = false + }) + $service.eventBus.$on('drop', function (el, source) { + console.log('+++ DROP') + mythis.scrollable = true + }) + + this.load() } + mounted() { + + let mythis = this + if (window) { + window.addEventListener('touchmove', function (e) { + console.log('touchmove') + if (!mythis.scrollable) { + e.preventDefault() + } + }, { passive: false }) + } + + } + setarrPriority() { this.arrPrior = [] const arr = rescodes.selectPriority[UserStore.state.lang] diff --git a/src/layouts/drawer/drawer.vue b/src/layouts/drawer/drawer.vue index fa91f63..fc36cb3 100644 --- a/src/layouts/drawer/drawer.vue +++ b/src/layouts/drawer/drawer.vue @@ -23,9 +23,9 @@ - Small --> -
- Powered by Perseo -
+ + +