Calendar, Events

src/components/CDate/CDate.scss

@@ -1,20 +1,5 @@
 $heightBtn: 100%;
 
-.flex-item{
-  // background-color: #d5e2eb;
-  display: flex;
-  padding: 2px;
-  margin: 2px;
-  margin-left: 3px;
-  margin-right: 3px;
-  color: #000;
-  font-size: 1rem;
-  height: $heightBtn;
-  line-height: $heightBtn;
-  vertical-align: middle;
-  //flex: 0 0 100%;
-}
-
 .progress-item {
   margin: 1px;
   padding: 2px;

src/components/CProgress/CProgress.scss

@@ -1,20 +1,5 @@
 $heightBtn: 100%;
 
-.flex-item{
-  // background-color: #d5e2eb;
-  display: flex;
-  padding: 2px;
-  margin: 2px;
-  margin-left: 3px;
-  margin-right: 3px;
-  color: #000;
-  font-size: 1rem;
-  height: $heightBtn;
-  line-height: $heightBtn;
-  vertical-align: middle;
-  //flex: 0 0 100%;
-}
-
 .progress-item {
   margin: 1px;
   padding: 2px;

src/components/Header/Header.ts

@@ -9,7 +9,7 @@ import { GlobalStore, UserStore } from '@modules'
 import { Watch } from 'vue-property-decorator'
 import { tools } from '../../store/Modules/tools'
 
-import Quasar from 'quasar'
+import Quasar, { Screen } from 'quasar'
 
 @Component({
   name: 'Header',
@@ -43,6 +43,14 @@ export default class Header extends Vue {
     // { label: 'German', icon: 'fa-flag-de', value: 'de', image: '../statics/images/de.png', short: 'DE' },
   ]
 
+  get getappname(){
+    if (Screen.width < 400) {
+      return this.$t('msg.myAppNameShort')
+    } else {
+      return this.$t('msg.myAppName')
+    }
+  }
+
   get conn_changed() {
     return GlobalStore.state.stateConnection
   }

src/components/Header/Header.vue

@@ -39,7 +39,7 @@
                     <q-avatar>
                         <img :src="imglogo" height="27">
                     </q-avatar>
-                    {{$t('msg.myAppName')}}
+                    {{getappname}}
                     <div slot="subtitle">{{$t('msg.myDescriz')}} {{ getAppVersion() }}</div>
                 </q-toolbar-title>
 

src/components/index.ts

@@ -2,4 +2,7 @@ export * from '../views/categories'
 export * from './todos'
 export * from './logo'
 export * from './CProgress'
+export * from './CCard'
+export * from './CPage'
+export * from './CTitle'
 export * from './CDate'

src/components/projects/SingleProject/SingleProject.scss

@@ -7,25 +7,11 @@ $heightBtn: 100%;
 $heightcounter: 26px;
 $heightdescr: 20px;
 
-.flex-item{
-   // background-color: #d5e2eb;
-  padding: 2px;
-  margin: 2px;
-  margin-left: 3px;
-  margin-right: 3px;
-  color: #000;
-  font-size: 1rem;
-  height: $heightBtn;
-  line-height: $heightBtn;
-  vertical-align: middle;
-  //flex: 0 0 100%;
-}
-
 
 .flex-container2 {
   flex-flow: row wrap;
   justify-content: space-between;
-  margin: 0px 1px 0px 1px;  // top right bottom left
+  margin: 0px 10px 0px 10px;  // top right bottom left
 }
 
 // Set visibility: visible to the icon menu of pos-item-popover

src/components/projects/SingleProject/SingleProject.ts

@@ -235,14 +235,14 @@ export default class SingleProject extends Vue {
     // if (!this.sel) {
 
     if (!this.inEdit) {
-      console.log('entrato...')
-      // this.attivaEdit = true
+      // console.log('entrato...')
       this.$emit('deselectAllRowstodo', null, false)
       this.$emit('deselectAllRowsproj', this.itemproject, true)
 
       if (!this.sel) {
         this.selectRiga()
       } else {
+        this.$emit('deselectAllRowsproj', null, false, false, true)
         this.deselectRiga()
       }
     }

src/components/todos/CTodo/CTodo.ts

@@ -191,8 +191,8 @@ export default class CTodo extends Vue {
 
   }
 
-  public deselectAllRowsproj(item: IProject, check, onlythis: boolean = false) {
-    this.$emit('deselectAllRowsproj', item, check, onlythis)
+  public deselectAllRowsproj(item: IProject, check, onlythis: boolean = false, deselectRiga: boolean = false) {
+    this.$emit('deselectAllRowsproj', item, check, onlythis, deselectRiga)
   }
 
   public setitemsel(item: ITodo) {

src/components/todos/SingleTodo/SingleTodo.scss

@@ -7,25 +7,10 @@ $heightBtn: 100%;
 $heightcounter: 26px;
 $heightdescr: 20px;
 
-.flex-item{
-   // background-color: #d5e2eb;
-  padding: 0px;
-  margin: 1px;
-  margin-left: 3px;
-  margin-right: 3px;
-  color: #000;
-  font-size: 0.85rem;
-  height: $heightBtn;
-  line-height: $heightBtn;
-  vertical-align: middle;
-  //flex: 0 0 100%;
-}
-
-
 .flex-container2 {
   flex-flow: row wrap;
   justify-content: space-between;
-  margin: 0px 1px 0px 1px;  // top right bottom left
+  margin: 0px 10px 0px 10px;  // top right bottom left
 }
 
 // Set visibility: visible to the icon menu of pos-item-popover

src/components/todos/SingleTodo/SingleTodo.ts

@@ -41,6 +41,7 @@ export default class SingleTodo extends Vue {
   public itemtodoPrec: ITodo
   public clButtPopover: string = 'pos-item-popover'
   public numpos: number = 0
+  public attivaEdit: boolean = false
 
   public $q: any
 
@@ -215,16 +216,15 @@ export default class SingleTodo extends Vue {
   public clickRiga(clickmenu: boolean = false) {
     // console.log('CLICK RIGA ************')
 
-    if (!this.sel) {
-      if (!this.inEdit) {
-        this.$emit('deselectAllRowsproj', null, false, false)
-        this.$emit('deselectAllRowstodo', this.itemtodo, true)
+    if (!this.inEdit) {
+      this.$emit('deselectAllRowsproj', null, false, false)
+      this.$emit('deselectAllRowstodo', this.itemtodo, true)
 
-        if (!this.sel) {
-          this.selectRiga()
-        } else {
-          this.deselectRiga()
-        }
+      if (!this.sel) {
+        this.selectRiga()
+      } else {
+        this.$emit('deselectAllRowsproj', null, false, false, true)
+        this.deselectRiga()
       }
     }
   }
@@ -238,10 +238,11 @@ export default class SingleTodo extends Vue {
   }
 
   public deselectRiga() {
-    // console.log('DeselectRiga', this.itemtodo.descr)
+    console.log('DeselectRiga', this.itemtodo.descr)
     this.sel = false
     this.classRow = ''
     this.inEdit = false
+    this.attivaEdit = false
     this.updateClasses()
   }
 
@@ -267,7 +268,8 @@ export default class SingleTodo extends Vue {
   }
 
   public editTodo() {
-    if (this.itemtodo.statustodo !== tools.Status.COMPLETED) {
+
+    if (this.attivaEdit) {
       // console.log('INIZIO - editTodo')
       this.$emit('click')
       this.precDescr = this.itemtodo.descr
@@ -299,7 +301,7 @@ export default class SingleTodo extends Vue {
         theField.focus()
       }
       // console.log('focus()')
-    }, 300)
+    }, 400)
   }
 
   public exitEdit(singola: boolean = false) {
@@ -309,6 +311,7 @@ export default class SingleTodo extends Vue {
       }
       // console.log('exitEdit')
       this.inEdit = false
+      this.attivaEdit = false
       this.updateClasses()
       this.$emit('deselectAllRowsproj', null, false, false)
       this.$emit('deselectAllRowstodo', this.itemtodo, false, singola)
@@ -390,6 +393,7 @@ export default class SingleTodo extends Vue {
 
     this.watchupdate('descr')
     this.inEdit = false
+    this.attivaEdit = false
     // this.precDescr = this.itemtodo.descr
     this.updateClasses()
   }
@@ -456,6 +460,12 @@ export default class SingleTodo extends Vue {
 
   }
 
+  public activeEdit() {
+    console.log('Attiva Edit')
+    this.attivaEdit = true
+    this.editTodo()
+  }
+
   public async clickMenu(action) {
     console.log('click menu: ', action)
     if (action === lists.MenuAction.DELETE) {
@@ -464,6 +474,8 @@ export default class SingleTodo extends Vue {
       return await this.enableExpiring()
     } else if (action === lists.MenuAction.COMPLETED) {
       return await this.setCompleted()
+    } else if (action === lists.MenuAction.EDIT) {
+      this.activeEdit()
     } else if (action === lists.MenuAction.PROGRESS_BAR) {
       return await this.updatedata('progress')
     } else if (action === lists.MenuAction.CUT) {

src/components/todos/SingleTodo/SingleTodo.vue

@@ -11,7 +11,7 @@
         </div>
 
         <div class="flex-item donotdrag divdescrTot">
-            <q-input v-if="sel && itemtodo.statustodo !== tools.Status.COMPLETED" hide-underline type="textarea" ref="inputdescr"
+            <q-input v-if="sel && inEdit && itemtodo.statustodo !== tools.Status.COMPLETED" hide-underline type="textarea" ref="inputdescr"
                      v-model.trim="precDescr"
                      autogrow
                      borderless
@@ -65,7 +65,7 @@
                    data_class="data_string" :readonly="!CanIModifyTodo">
             </CDate>
         </div>
-        <div v-if="isTodo()" :class="classMenuBtn" @mousedown="clickRiga">
+        <div :class="classMenuBtn" @mousedown="clickRiga">
             <q-btn flat
                    :class="clButtPopover"
                    :readonly="!CanIModifyTodo"