Merge pull request #24 from SparingSoftware/fixes

Fixes and improvements

Author: szymborski

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "workometer",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "author": "Sparing Software",
   "description": "Electron based app to track tasks time",
   "license": null,
@@ -48,13 +48,14 @@
       ]
     },
     "mac": {
-      "icon": "build/icons/icon.icns"
+      "icon": "static/icons/icon.icns",
+      "target": "pkg"
     },
     "win": {
-      "icon": "build/icons/icon.ico"
+      "icon": "static/icons/icon.ico"
     },
     "linux": {
-      "icon": "build/icons"
+      "icon": "static/icons"
     }
   },
   "dependencies": {

package.json

@@ -16,13 +16,24 @@ const setDefaultApplicationMenu = () => {
     {
       label: 'Edit',
       submenu: [
-        { label: 'Undo', accelerator: 'CmdOrCtrl+Z', selector: 'undo:' },
-        { label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', selector: 'redo:' },
+        { role: 'undo' },
+        { role: 'redo' },
         { type: 'separator' },
-        { label: 'Cut', accelerator: 'CmdOrCtrl+X', selector: 'cut:' },
-        { label: 'Copy', accelerator: 'CmdOrCtrl+C', selector: 'copy:' },
-        { label: 'Paste', accelerator: 'CmdOrCtrl+V', selector: 'paste:' },
-        { label: 'Select All', accelerator: 'CmdOrCtrl+A', selector: 'selectAll:' }
+        { role: 'cut' },
+        { role: 'copy' },
+        { role: 'paste' },
+        { role: 'delete' },
+        { type: 'separator' },
+        { role: 'selectAll' }
+      ]
+    },
+    {
+      label: 'View',
+      submenu: [
+        { role: 'reload' },
+        { role: 'forcereload' },
+        { type: 'separator' },
+        { role: 'togglefullscreen' }
       ]
     },
     {

src/main/config/menu.js

@@ -4,18 +4,18 @@
       <el-form :model="form">
         <el-form-item label="Time spent">
           <el-input
-            v-model="form.worklog.timeSpent"
+            v-model="form.timeSpent"
             placeholder="1d 9h 12m"
             autocomplete="off"
             @blur="handleBlur"
           />
         </el-form-item>
         <el-form-item label="Date">
           <el-date-picker
-            v-model="form.worklog.started"
+            v-model="form.started"
             :readonly="false"
             type="datetime"
-            value-format="yyyy-MM-ddTHH:mm:ss.000ZZ"
+            format="yyyy-MM-dd HH:mm"
             placeholder="Started datetime"
           />
         </el-form-item>
@@ -34,13 +34,33 @@
 
 <script>
 import moment from 'moment'
+import service from '@/service'
+
+const getWorkedTimeParsed = timeSpent => {
+  const getNumberBeforeLetter = letter => {
+    const regex = new RegExp(`(\\d+)${letter}`, 'i')
+    return +(regex.exec(timeSpent) || [0, 0])[1]
+  }
+  return ['d', 'h', 'm'].map(getNumberBeforeLetter)
+}
+
+const parseToSeconds = timeSpent => {
+  const [days, hours, minutes] = getWorkedTimeParsed(timeSpent)
+
+  const minute = 60
+  const hour = minute * 60
+  const day = hour * 24
+
+  return (days * day) + (hours * hour) + (minutes * minute)
+}
 
 export default {
   data () {
     return {
       dialogVisible: false,
       form: {
-        worklog: {}
+        timeSpent: null,
+        started: null
       },
       issue: null
     }
@@ -50,42 +70,31 @@ export default {
       this.issue = issue
       this.dialogVisible = true
       this.form = {
-        worklog: {}
+        timeSpent: null,
+        started: null
       }
     },
     submitForm () {
-      this.$jira.issue.addWorkLog({
-        issueId: this.issue.id,
-        ...this.form
-      }).then(response => {
-        this.$notify({
-          title: 'Success',
-          message: 'Worklog saved',
-          type: 'success'
+      const timeSpentSeconds = parseToSeconds(this.form.timeSpent)
+      service.addWorkLog(this.issue.id, moment(this.form.started), timeSpentSeconds)
+        .then(() => {
+          this.$notify({
+            title: 'Success',
+            message: 'Worklog saved',
+            type: 'success'
+          })
+          this.closeDialog()
         })
-        this.closeDialog()
-      }).catch(this.handleErrors)
+        .catch(this.handleErrors)
     },
     closeDialog () {
       this.issue = null
       this.dialogVisible = false
     },
-    handleBlur (event) {
-      const inputValue = event.target.value
-      const getNumberBeforeLetter = letter => {
-        const regex = new RegExp(`(\\d+)${letter}`, 'i')
-        return +(regex.exec(inputValue) || [0, 0])[1]
-      }
-      const [days, hours, minutes] = ['d', 'h', 'm'].map(getNumberBeforeLetter)
-
-      const startDate = moment().subtract({
-        days,
-        hours,
-        minutes
-      }).toDate()
-      if (!this.form.worklog.started) {
-        this.$set(this.form.worklog, 'started', startDate)
-      }
+    handleBlur () {
+      const [days, hours, minutes] = getWorkedTimeParsed(this.form.timeSpent)
+      const startDate = moment().subtract({ days, hours, minutes }).toDate()
+      if (!this.form.started) this.$set(this.form, 'started', startDate)
     }
   }
 }

src/renderer/components/dashboardPage/issues/contextMenu/actions/logWorkDialog/index.vue

@@ -146,17 +146,18 @@ export default {
 
       const endWorkTime = trackingStopTime || moment()
       const workedTime = endWorkTime.diff(this.trackingStartTime, 'seconds')
-      const formattedWorkedTime = (moment.utc(workedTime * 1000)).format('HH:mm:ss')
+      const formattedWorkedTime = (moment.utc(workedTime * 1000)).format('HH:mm')
 
       return this.saveWorklog(workedTime)
-        .then(response => {
+        .then(() => {
           this.$notify({
             title: 'Success',
             message: `Worklog saved. You have worked ${formattedWorkedTime}`,
             type: 'success'
           })
           this.clearTracker()
-        }).catch(this.handleErrors)
+        })
+        .catch(this.handleErrors)
         .finally(() => {
           this.loading = false
         })

src/renderer/components/dashboardPage/issues/issue/tracker/index.vue

@@ -66,7 +66,7 @@ export default {
       issueId: trackedIssueId,
       worklog: {
         started: trackingStartTime.format('YYYY-MM-DDTHH:mm:ss.SSSZZ'),
-        timeSpentSeconds: timeSpentSeconds,
+        timeSpentSeconds,
         comment
       }
     })

src/renderer/components/landingPage.vue

@@ -52,7 +52,7 @@ const getters = {
 const actions = {
   async fetchBoards ({ commit, dispatch }) {
     dispatch('wait/start', 'boardsLoading', { root: true })
-    const boards = await service.getAllBoards({ type: 'scrum' })
+    const boards = await service.getAllBoards()
     commit('setBoards', boards)
     dispatch('wait/end', 'boardsLoading', { root: true })
   },

src/renderer/service.js

@@ -24,7 +24,7 @@ const mutations = {
 }
 
 const actions = {
-  saveWorklog ({commit, state}, workedTime) {
+  saveWorklog ({ commit, state }, workedTime) {
     return service.addWorkLog(state.issueTracked.id, state.trackingStartTime, workedTime)
   }
 }