From f632259c05b629e8fc6e200b417e6b0eb3238e14 Mon Sep 17 00:00:00 2001
From: Paolo Arena <paolo.arena77@gmail.com>
Date: Sat, 6 Apr 2019 21:02:33 +0200
Subject: [PATCH] Updated Project calculation for hours and progress.

---
 src/components/CProgress/CProgress.scss       |  7 +++-
 src/components/CProgress/CProgress.ts         | 19 +++++++--
 src/components/CProgress/CProgress.vue        |  9 ++++
 .../projects/SingleProject/SingleProject.ts   |  2 +-
 .../projects/SingleProject/SingleProject.vue  |  2 +-
 src/components/todos/SingleTodo/SingleTodo.ts |  7 ++--
 src/store/Modules/ApiTables.ts                | 27 ++----------
 src/store/Modules/GlobalStore.ts              |  2 +-
 src/store/Modules/Projects.ts                 | 42 +++++++++----------
 src/store/Modules/Todos.ts                    | 22 +++++-----
 src/store/Modules/tools.ts                    |  3 +-
 src/views/projects/proj-list/proj-list.ts     | 38 +++++++++++++----
 src/views/projects/proj-list/proj-list.vue    | 22 ++++++----
 13 files changed, 117 insertions(+), 85 deletions(-)

diff --git a/src/components/CProgress/CProgress.scss b/src/components/CProgress/CProgress.scss
index 477fd3d..331af6a 100644
--- a/src/components/CProgress/CProgress.scss
+++ b/src/components/CProgress/CProgress.scss
@@ -27,10 +27,15 @@ $heightBtn: 100%;
 
 .cpr-progrbar-item {
   //height: 10px
-  padding-top: 7px;
+  margin-top: 11px;
+  margin-bottom: 11px;
   height:15px;
 }
 
+.cpr-slider-item {
+  //height: 10px
+}
+
 .cpr-percProgress {
   padding-top: 3px;
   color: #888;
diff --git a/src/components/CProgress/CProgress.ts b/src/components/CProgress/CProgress.ts
index cc4717f..c087c6b 100644
--- a/src/components/CProgress/CProgress.ts
+++ b/src/components/CProgress/CProgress.ts
@@ -10,6 +10,7 @@ import { tools } from '@src/store/Modules/tools'
 export default class CProgress extends Vue {
   public cpr_colProgress: string = 'blue'
   public cpr_percProgress: string = 'cpr-percProgress'
+  public progressvalinternal: number = 0
 
   @Watch('progressval')
   public changeprogress() {
@@ -18,12 +19,24 @@ export default class CProgress extends Vue {
 
   @Prop({ required: true }) public progressval: number
   @Prop() public descr: string
+  @Prop({ default: false }) public slider: boolean
 
-  public updateclasses() {
-    this.cpr_colProgress = tools.getProgressColor(this.progressval)
+  @Watch('progressval')
+  public valchanged(value) {
+    this.progressvalinternal = value
   }
 
-  get getdescr(){
+  public updateclasses() {
+    this.cpr_colProgress = tools.getProgressColor(this.progressvalinternal)
+  }
+
+  public setchange(value) {
+    this.progressvalinternal = value
+    console.log('setchange', this.progressvalinternal)
+    this.$emit('input', this.progressvalinternal)
+  }
+
+  get getdescr() {
     if (!!this.descr) {
       return this.descr + ' : '
     }
diff --git a/src/components/CProgress/CProgress.vue b/src/components/CProgress/CProgress.vue
index 004c9b3..1df9ef2 100644
--- a/src/components/CProgress/CProgress.vue
+++ b/src/components/CProgress/CProgress.vue
@@ -1,7 +1,16 @@
 <template>
     <div>
         <div class="flex-item progress-item shadow-1">
+            <q-slider v-if="slider" label
+                      class="cpr-slider-item"
+                      :value="progressval"
+                      :min="0"
+                      :max="100"
+                      @change="setchange"
+                      :step="5">
+            </q-slider>
             <q-linear-progress
+                    v-else
                     stripe
                     rounded
                     :value="progressval / 100"
diff --git a/src/components/projects/SingleProject/SingleProject.ts b/src/components/projects/SingleProject/SingleProject.ts
index 0714383..14a93ee 100644
--- a/src/components/projects/SingleProject/SingleProject.ts
+++ b/src/components/projects/SingleProject/SingleProject.ts
@@ -233,7 +233,7 @@ export default class SingleProject extends Vue {
     this.editProject()
   }
 
-  get getrouteto(){
+  get getrouteto() {
     return '/projects/' + this.itemproject._id
   }
 
diff --git a/src/components/projects/SingleProject/SingleProject.vue b/src/components/projects/SingleProject/SingleProject.vue
index d6faf11..0e81fbc 100644
--- a/src/components/projects/SingleProject/SingleProject.vue
+++ b/src/components/projects/SingleProject/SingleProject.vue
@@ -2,7 +2,7 @@
     <div :class="getClassRow()" @click="clickProject" >
 
         <q-btn class="flex-item donotdrag " size="sm" push color="primary" round icon="arrow_forward"
-        :to="getrouteto" />
+        :to="getrouteto"/>
 
         <div class="flex-item donotdrag divdescrTot">
             <q-input v-if="(sel && inEdit)" hide-underline type="textarea" ref="inputdescr"
diff --git a/src/components/todos/SingleTodo/SingleTodo.ts b/src/components/todos/SingleTodo/SingleTodo.ts
index 2dc17eb..53aa785 100644
--- a/src/components/todos/SingleTodo/SingleTodo.ts
+++ b/src/components/todos/SingleTodo/SingleTodo.ts
@@ -74,7 +74,7 @@ export default class SingleTodo extends Vue {
     console.log('itemtodo.hoursplanned', this.itemtodo.hoursplanned)
     this.watchupdate('hoursplanned')
   }
-  @Watch('itemtodo.status', { immediate: true, deep: true }) public valueChangedstatus() {
+  @Watch('itemtodo.status') public valueChangedstatus() {
     console.log('itemtodo.status', this.itemtodo.status)
     this.watchupdate('status')
   }
@@ -125,6 +125,7 @@ export default class SingleTodo extends Vue {
   }
 
   public watchupdate(field = '') {
+    console.log('watchupdate', field)
     this.$emit('eventupdate', {myitem: this.itemtodo, field } )
     this.updateicon()
   }
@@ -396,9 +397,9 @@ export default class SingleTodo extends Vue {
     this.updateClasses()
   }
 
-  public aggiornaProgress(value, initialval){
+  public aggiornaProgress(value, initialval) {
     if (value !== initialval) {
-      this.itemtodo.progress = value
+      this.itemtodo.progress = parseInt(value, 10)
       this.updatedata('progress')
       this.deselectAndExitEdit()
     }
diff --git a/src/store/Modules/ApiTables.ts b/src/store/Modules/ApiTables.ts
index 85d407e..9fbd41e 100644
--- a/src/store/Modules/ApiTables.ts
+++ b/src/store/Modules/ApiTables.ts
@@ -383,9 +383,7 @@ export async function table_ModifyRecord(nametable, myitem, listFieldsToChange,
   console.log('--> table_ModifyRecord', nametable, myitem.descr)
 
   if ((field === 'status') && (nametable === 'todos') && (myitem.status === tools.Status.COMPLETED)) {
-    console.log('AAAAAAAAAAAAAAAAAAAAAAAA  ', myitem.completed_at)
     myitem.completed_at = tools.getDateNow()
-    console.log('   DOPO ', myitem.completed_at)
   }
 
   const myobjsaved = tools.jsonCopy(myitem)
@@ -397,44 +395,28 @@ export async function table_ModifyRecord(nametable, myitem, listFieldsToChange,
     return
   }
 
-  console.log(' 0-> ')
-
-  console.log('myobjsaved.completed_at', myobjsaved.completed_at)
-  console.log('miorec.completed_at', miorec.completed_at)
-
-  console.log('miorec', miorec.descr, miorec.id_prev, nametable)
-  console.log('status', miorec.status, myobjsaved.status)
-
-  console.log(' 3-> ')
-
   listFieldsToChange.forEach((myfield) => {
     setmodifiedIfchanged(miorec, myobjsaved, myfield)
   })
 
   if (miorec.modified) {
-    console.log('    ' + nametable + ' MODIFICATO! ', miorec.descr, miorec.pos, 'SALVALO SULLA IndexedDB')
+    // console.log('    ' + nametable + ' MODIFICATO! ', miorec.descr, miorec.pos, 'SALVALO SULLA IndexedDB')
     miorec.modify_at = tools.getDateNow()
     miorec.modified = false
 
-    console.log(' 0)  ARR MIOREC PRIMA ', miorec.completed_at, miorec)
-
     // 1) Permit to Update the Views
     tools.notifyarraychanged(miorec)
 
-    console.log(' 1)  MIOREC CALL WRITE: ', miorec.completed_at, miorec)
-
     // 2) Modify on IndexedDb
     return globalroutines(null, 'write', nametable, miorec)
       .then((ris) => {
 
-        console.log(' 2)  MIOREC !: ', miorec.completed_at)
-
         // 3) Modify on the Server (call)
         return Sync_SaveItem(nametable, 'PATCH', miorec)
 
       })
-  } else {
-    console.log('      ', miorec.descr, 'NON MODIF!')
+  // } else {
+    //   console.log('      ', miorec.descr, 'NON MODIF!')
   }
 }
 
@@ -450,6 +432,5 @@ export function table_DeleteRecord(nametable, myobjtrov, id) {
 
   // 3) Delete from the Server (call)
   Sync_DeleteItem(nametable, myobjtrov, id)
-
+  
 }
-
diff --git a/src/store/Modules/GlobalStore.ts b/src/store/Modules/GlobalStore.ts
index b55160c..ebd4c62 100644
--- a/src/store/Modules/GlobalStore.ts
+++ b/src/store/Modules/GlobalStore.ts
@@ -151,7 +151,7 @@ namespace Getters {
         level_child: 0.5
       })
 
-      addRoute(arrroutes,{ route: '/projects/' + tools.FIRST_PROJ, faIcon: 'fa fa-list-alt', materialIcon: 'next_week', name: 'pages.Projects',
+      addRoute(arrroutes,{ route: '/projects/' + process.env.PROJECT_ID_MAIN, faIcon: 'fa fa-list-alt', materialIcon: 'next_week', name: 'pages.Projects',
         routes2: listaprojects,
         level_parent: 0,
         level_child: 0.5
diff --git a/src/store/Modules/Projects.ts b/src/store/Modules/Projects.ts
index 7b3d8a2..0faf68f 100644
--- a/src/store/Modules/Projects.ts
+++ b/src/store/Modules/Projects.ts
@@ -13,7 +13,7 @@ const nametable = 'projects'
 
 // import _ from 'lodash'
 
-const state: IProjectsState = {
+const stateglob: IProjectsState = {
   showtype: costanti.ShowTypeTask.SHOW_LAST_N_COMPLETED,
   projects: [],
   insidePending: false,
@@ -22,19 +22,14 @@ const state: IProjectsState = {
 
 const listFieldsToChange: string [] = ['descr', 'longdescr', 'hoursplanned', 'hoursworked', 'id_parent', 'status', 'category', 'expiring_at', 'priority', 'id_prev', 'pos', 'enableExpiring', 'progress', 'live_url', 'test_url', 'begin_development', 'begin_test']
 
-const b = storeBuilder.module<IProjectsState>('Projects', state)
+const b = storeBuilder.module<IProjectsState>('Projects', stateglob)
 const stateGetter = b.state()
 
-// function getindexbycategory(category: string) {
-//   return state.categories.indexOf(category)
-// }
-
 function getarrByCategory(category: string) {
-  // const indcat = state.categories.indexOf(category)
-  if (!state.projects) {
+  if (!stateglob.projects) {
     return []
   }
-  return state.projects
+  return stateglob.projects
 }
 
 function initcat() {
@@ -89,7 +84,7 @@ namespace Getters {
   const listaprojects = b.read((state: IProjectsState) => (): IMenuList[] => {
     if (state.projects) {
       // console.log('state.projects', state.projects)
-      const listaproj = tools.mapSort(state.projects.filter((proj) => proj.id_parent === tools.FIRST_PROJ))
+      const listaproj = tools.mapSort(state.projects.filter((proj) => proj.id_parent === process.env.PROJECT_ID_MAIN))
       const myarr: IMenuList[] = []
       for (const proj of listaproj) {
         myarr.push({nametranslate: '', description: proj.descr, idelem: proj._id})
@@ -102,12 +97,12 @@ namespace Getters {
   }, 'listaprojects')
 
   const getDescrById = b.read((state: IProjectsState) => (id: string): string => {
-    if (id === tools.FIRST_PROJ)
+    if (id === process.env.PROJECT_ID_MAIN)
       return 'Projects'
     if (state.projects) {
-      const item = state.projects.find((item) => item._id === id)
-      if (!!item)
-        return item.descr
+      const itemtrov = state.projects.find((item) => item._id === id)
+      if (!!itemtrov)
+        return itemtrov.descr
     }
 
     return ''
@@ -115,9 +110,10 @@ namespace Getters {
 
   const getParentById = b.read((state: IProjectsState) => (id: string): string => {
     if (state.projects) {
-      const item = state.projects.find((item) => item._id === id)
-      if (!!item)
-        return item.id_parent
+      const itemfound = state.projects.find((item) => item._id === id)
+      if (!!itemfound) {
+        return itemfound.id_parent
+      }
     }
 
     return ''
@@ -193,7 +189,7 @@ namespace Actions {
   async function dbLoad(context, { checkPending, onlyiffirsttime }) {
 
     if (onlyiffirsttime) {
-      if (state.projects.length > 0) {
+      if (stateglob.projects.length > 0) {
         // if already set, then exit.
         return false
       }
@@ -208,18 +204,18 @@ namespace Actions {
     const ris = await Api.SendReq('/projects/' + UserStore.state.userId, 'GET', null)
       .then((res) => {
         if (res.data.projects) {  // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories)
-          state.projects = res.data.projects
+          stateglob.projects = res.data.projects
         } else {
-          state.projects = []
+          stateglob.projects = []
         }
 
-        state.showtype = parseInt(GlobalStore.getters.getConfigStringbyId({
+        stateglob.showtype = parseInt(GlobalStore.getters.getConfigStringbyId({
           id: costanti.CONFIG_ID_SHOW_TYPE_TODOS,
           default: costanti.ShowTypeTask.SHOW_LAST_N_COMPLETED
         }), 10)
 
         if (process.env.DEBUG === '1') {
-          console.log('dbLoad', 'state.projects', state.projects)
+          console.log('dbLoad', 'state.projects', stateglob.projects)
         }
 
         return res
@@ -307,7 +303,7 @@ namespace Actions {
   }
 
   async function swapElems(context, itemdragend: IDrag) {
-    console.log('PROJECT swapElems', itemdragend, state.projects)
+    console.log('PROJECT swapElems', itemdragend, stateglob.projects)
 
     const myarr = Getters.getters.items_dacompletare(itemdragend.id_proj)
 
diff --git a/src/store/Modules/Todos.ts b/src/store/Modules/Todos.ts
index 6987739..64d7f27 100644
--- a/src/store/Modules/Todos.ts
+++ b/src/store/Modules/Todos.ts
@@ -251,19 +251,21 @@ namespace Actions {
     const myarr = gettodosByCategory(cat)
 
     const myobjtrov = tools.getElemById(myarr, idobj)
-
-    console.log('myobjtrov', myobjtrov.descr)
-
     if (!!myobjtrov) {
-      const myobjnext = tools.getElemPrevById(myarr, myobjtrov._id)
 
-      if (!!myobjnext) {
-        myobjnext.id_prev = myobjtrov.id_prev
-        myobjnext.modified = true
-        await modify(context, { myitem: myobjnext, field: 'id_prev' })
+      console.log('myobjtrov', myobjtrov.descr)
+
+      if (!!myobjtrov) {
+        const myobjnext = tools.getElemPrevById(myarr, myobjtrov._id)
+
+        if (!!myobjnext) {
+          myobjnext.id_prev = myobjtrov.id_prev
+          myobjnext.modified = true
+          await modify(context, { myitem: myobjnext, field: 'id_prev' })
+        }
+
+        ApiTables.table_DeleteRecord(nametable, myobjtrov, idobj)
       }
-
-      ApiTables.table_DeleteRecord(nametable, myobjtrov, idobj)
     }
   }
 
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index ca3140f..a559da9 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -25,7 +25,7 @@ export const tools = {
 
   NUMSEC_CHECKUPDATE: 20000,
 
-  FIRST_PROJ: '__PROJECTS',
+  FIRST_PROJ: '5ca8f17fcd40dc5012f53346',
 
   WHAT_TODO: 1,
   WHAT_PROJECT: 2,
@@ -1258,7 +1258,6 @@ export const tools = {
 
   getDateNow() {
     const mydate = new Date()
-    console.log('mydate', mydate)
     return mydate
   }
   ,
diff --git a/src/views/projects/proj-list/proj-list.ts b/src/views/projects/proj-list/proj-list.ts
index 9db2bd2..31d95b9 100644
--- a/src/views/projects/proj-list/proj-list.ts
+++ b/src/views/projects/proj-list/proj-list.ts
@@ -40,7 +40,7 @@ export default class ProjList extends Vue {
   public service: any
   public scrollable = true
   public dragname: string = 'second'
-  public idProjAtt: string = tools.FIRST_PROJ
+  public idProjAtt: string = process.env.PROJECT_ID_MAIN
   public idProjParentAtt: string = ''
   public splitterModel = 50 // start at 50%
   public itemproj: IProject = null
@@ -59,6 +59,10 @@ export default class ProjList extends Vue {
     ctodo: CTodo
   }
 
+  get getidProjParentAtt() {
+    return this.idProjParentAtt
+  }
+
   public watchupdatetodo(field = '') {
     console.log('watchupdate', field)
     this.$emit('eventupdate', {myitem: this.itemtodosel, field } )
@@ -68,6 +72,12 @@ export default class ProjList extends Vue {
     return '/projects/' + this.idProjParentAtt
   }
 
+  public selproj() {
+    this.deselectAllRowsproj(null, false, false)
+    this.deselectAllRowstodo(null, false, false)
+    this.setidsel(this.idProjAtt)
+  }
+
   get tools() {
     return tools
   }
@@ -89,25 +99,23 @@ export default class ProjList extends Vue {
     return tools.listOptionShowTask[UserStore.state.lang]
   }
 
-  get descrParent() {
-    return Projects.getters.getDescrById(this.idProjParentAtt)
-  }
-
   get descrProject() {
     return Projects.getters.getDescrById(this.idProjAtt)
   }
 
-  // get ProjectsCount() {
-  //   return Projects.getters.ProjectsCount(this.idProjParentAtt)
-  // }
-
   @Getter('items_dacompletare', { namespace })
   public items_dacompletare: (state: IProjectsState, id_parent: string) => IProject[]
 
+  @Watch('items_dacompletare')
+  public changeitems() {
+    this.idProjParentAtt = Projects.getters.getParentById(this.idProjAtt)
+  }
+
   @Watch('$route.params.idProj')
   public changeparent() {
     this.idProjAtt = this.$route.params.idProj
     this.idProjParentAtt = Projects.getters.getParentById(this.idProjAtt)
+    this.selproj()
   }
 
   @Watch('itemsel.progressCalc')
@@ -164,6 +172,8 @@ export default class ProjList extends Vue {
     this.idProjAtt = this.$route.params.idProj
     this.idProjParentAtt = Projects.getters.getParentById(this.idProjAtt)
 
+    console.log('this.idProjParentAtt', this.idProjParentAtt, 'idproj', this.idProjAtt, 'params' , this.$route.params)
+
     tools.touchmove(this.scrollable)
   }
 
@@ -346,4 +356,14 @@ export default class ProjList extends Vue {
 
   }
 
+  get getCalcTodoHoursWorked() {
+    if (this.itemtodosel.hoursplanned <= 0) {
+      return 0
+    }
+    const myperc = Math.round(this.itemtodosel.hoursworked / this.itemtodosel.hoursplanned * 100)
+
+    return myperc
+
+  }
+
 }
diff --git a/src/views/projects/proj-list/proj-list.vue b/src/views/projects/proj-list/proj-list.vue
index c3a3ee8..e2c546e 100644
--- a/src/views/projects/proj-list/proj-list.vue
+++ b/src/views/projects/proj-list/proj-list.vue
@@ -11,9 +11,11 @@
                     <div>
                         <div class="divtitlecat clMain">
                             <div class="flex-container clMain">
-                                <q-btn v-if="!!idProjParentAtt" size="sm" push color="secondary" round
+                                <q-btn v-if="!!getidProjParentAtt" size="sm" push color="secondary" round
                                        icon="arrow_back"
-                                       :to="getrouteup"/>
+                                       :to="getrouteup">
+
+                                </q-btn>
                                 <div class="flex-item categorytitle shadow-4">{{descrProject | capitalize}}</div>
                                 <div class="flex-item">
                                     <q-btn push
@@ -130,12 +132,12 @@
                             <div class="flex-item itemdescr">
                                 <q-input
                                         ref="input"
+                                        readonly
                                         v-model="itemsel.hoursworked"
                                         type="number"
                                         rounded outlined
                                         :label="$t('proj.hoursworked')"
-                                        debounce="500"
-                                />
+                                        debounce="500"></q-input>
                                 <CProgress descr="" :progressval="getCalcHoursWorked"></CProgress>
                             </div>
                             <q-icon class="flex-item flex-icon" name="watch_later"/>
@@ -143,11 +145,13 @@
                                 <q-input
                                         ref="input"
                                         type="number"
+                                        readonly
                                         v-model="itemsel.hoursplanned"
                                         rounded outlined
                                         :label="$t('proj.hoursplanned')"
-                                        debounce="500"
-                                />
+                                        debounce="500">
+
+                                </q-input>
                                 <CProgress :descr="$t('proj.progresstask')"
                                            :progressval="itemsel.progressCalc"></CProgress>
                             </div>
@@ -213,7 +217,7 @@
                                     debounce="500">
 
                             </q-input>
-                            <CProgress descr="" :progressval="getCalcHoursWorked"></CProgress>
+                            <CProgress descr="" :progressval="getCalcTodoHoursWorked"></CProgress>
                         </div>
                         <q-icon class="flex-item flex-icon" name="watch_later"/>
                         <div class="flex-item itemdata content-center">
@@ -226,8 +230,10 @@
                                     debounce="500">
 
                             </q-input>
+
                             <CProgress :descr="$t('proj.progresstask')"
-                                       :progressval="itemtodosel.progressCalc"></CProgress>
+                                       :progressval="itemtodosel.progress"
+                                        :slider="true" @input="itemtodosel.progress = arguments[0]"></CProgress>
                         </div>
                     </div>
                     <div class="flex-container clMain">