diff --git a/src/boot/vue-i18n.ts b/src/boot/vue-i18n.ts
index 42554a3..428d98b 100644
--- a/src/boot/vue-i18n.ts
+++ b/src/boot/vue-i18n.ts
@@ -3,6 +3,7 @@ import VueI18n from 'vue-i18n'
import messages from '../statics/i18n'
import { tools } from '../store/Modules/tools'
+
export default ({ app, store, Vue }) => {
Vue.use(VueI18n)
// Vue.config.lang = process.env.LANG_DEFAULT;
diff --git a/src/components/projects/SingleProject/SingleProject.scss b/src/components/projects/SingleProject/SingleProject.scss
index 942bbe8..545ccdd 100644
--- a/src/components/projects/SingleProject/SingleProject.scss
+++ b/src/components/projects/SingleProject/SingleProject.scss
@@ -270,7 +270,7 @@ $heightdescr: 20px;
//padding: 2px;
min-width: 100px;
text-align: left;
- color: blue !important;
+ color: blue;
overflow: hidden;
align-items: center;
diff --git a/src/components/projects/SingleProject/SingleProject.ts b/src/components/projects/SingleProject/SingleProject.ts
index e726c1b..dbb1fd6 100644
--- a/src/components/projects/SingleProject/SingleProject.ts
+++ b/src/components/projects/SingleProject/SingleProject.ts
@@ -3,6 +3,7 @@ import { Component, Prop, Watch } from 'vue-property-decorator'
import { Projects, UserStore } from '@modules'
import { tools } from '../../../store/Modules/tools'
+import { lists } from '../../../store/Modules/lists'
import { IProject } from '../../../model/index'
@@ -18,7 +19,6 @@ import { RouteNames } from '@src/router/route-names'
name: 'SingleProject'
})
export default class SingleProject extends Vue {
- public selectPriority: [] = []
public menuPopupProj: any[] = []
public classDescr: string = ''
public classDescrEdit: string = ''
@@ -77,6 +77,16 @@ export default class SingleProject extends Vue {
this.watchupdate('hoursplanned')
}
+ @Watch('itemproject.themecolor')
+ public valueChangedthemecolor() {
+ this.watchupdate('themecolor')
+ }
+
+ @Watch('itemproject.themebgcolor')
+ public valueChangedthemebgcolor() {
+ this.watchupdate('themebgcolor')
+ }
+
@Watch('itemproject.hoursworked')
public valueChangedhoursworked() {
this.watchupdate('hoursworked')
@@ -172,6 +182,9 @@ export default class SingleProject extends Vue {
this.classDescrEdit += ' titleLista-item'
}
+ this.classDescr += ' text-' + this.itemproject.themecolor + ' bg-' + this.itemproject.themebgcolor
+ this.classDescrEdit += ' text-' + this.itemproject.themecolor + ' bg-' + this.itemproject.themebgcolor
+
this.percProgress = 'percProgress'
this.classExpiring = 'flex-item data-item shadow-1 hide-if-small'
@@ -210,8 +223,6 @@ export default class SingleProject extends Vue {
this.updateClasses()
- this.selectPriority = tools.selectPriority[UserStore.state.lang]
-
}
public getClassRow() {
@@ -357,7 +368,7 @@ export default class SingleProject extends Vue {
if (((e.keyCode === 46)) && (this.precDescr === '') && !e.shiftKey) {
e.preventDefault()
this.deselectRiga()
- this.clickMenu(tools.MenuAction.DELETE)
+ this.clickMenu(lists.MenuAction.DELETE)
.then(() => {
this.faiFocus('insertProjectBottom', true)
return
@@ -385,7 +396,7 @@ export default class SingleProject extends Vue {
if (((e.keyCode === 46)) && (this.precDescr === '') && !e.shiftKey) {
e.preventDefault()
this.deselectRiga()
- this.clickMenu(tools.MenuAction.DELETE)
+ this.clickMenu(lists.MenuAction.DELETE)
.then(() => {
this.faiFocus('insertProjectBottom', true)
return
@@ -486,16 +497,16 @@ export default class SingleProject extends Vue {
public async clickMenu(action) {
console.log('click menu: ', action)
- if (action === tools.MenuAction.DELETE) {
+ if (action === lists.MenuAction.DELETE) {
return await this.askConfirmDelete()
- } else if (action === tools.MenuAction.TOGGLE_EXPIRING) {
+ } else if (action === lists.MenuAction.TOGGLE_EXPIRING) {
return await this.enableExpiring()
- } else if (action === tools.MenuAction.EDIT) {
+ } else if (action === lists.MenuAction.EDIT) {
this.activeEdit()
- } else if (action === tools.MenuAction.CUT) {
+ } else if (action === lists.MenuAction.CUT) {
const myaction = {
table: tools.projects,
- type: tools.MenuAction.CUT,
+ type: lists.MenuAction.CUT,
_id: this.itemproject._id
}
return await Projects.actions.ActionCutPaste(myaction)
@@ -505,6 +516,39 @@ export default class SingleProject extends Vue {
}
+ public selectSubMenu(action, elem) {
+ if (action === lists.MenuAction.PRIORITY) {
+ this.setPriority(elem)
+ } else if (action === lists.MenuAction.THEME) {
+ this.setThemeColor(elem, false)
+ } else if (action === lists.MenuAction.THEMEBG) {
+ this.setThemeColor(elem, true)
+ }
+ }
+
+ public setThemeColor(newtheme, bg: boolean) {
+ let changedfield = ''
+
+ if (bg) {
+ if (this.itemproject.themebgcolor !== newtheme) {
+ this.itemproject.themebgcolor = newtheme
+ changedfield = 'themebgcolor'
+ }
+ } else {
+ if (this.itemproject.themecolor !== newtheme) {
+ this.itemproject.themecolor = newtheme
+ changedfield = 'themecolor'
+ }
+ }
+
+ if (changedfield !== '') {
+ this.updatedata(changedfield)
+
+ this.updateicon()
+ }
+
+ }
+
public setPriority(newpriority) {
if (this.itemproject.priority !== newpriority) {
diff --git a/src/components/projects/SingleProject/SingleProject.vue b/src/components/projects/SingleProject/SingleProject.vue
index 993c5a2..6dae3ff 100644
--- a/src/components/projects/SingleProject/SingleProject.vue
+++ b/src/components/projects/SingleProject/SingleProject.vue
@@ -50,7 +50,7 @@
icon="menu">
+ @selectSubMenu="selectSubMenu">
diff --git a/src/components/projects/SubMenusProj/SubMenusProj.ts b/src/components/projects/SubMenusProj/SubMenusProj.ts
index 00e2f4f..23a8e3e 100644
--- a/src/components/projects/SubMenusProj/SubMenusProj.ts
+++ b/src/components/projects/SubMenusProj/SubMenusProj.ts
@@ -2,6 +2,7 @@ import Vue from 'vue'
import { Component, Prop, Watch } from 'vue-property-decorator'
import { tools } from '@src/store/Modules/tools'
+import { lists } from '@src/store/Modules/lists'
import { UserStore } from '@store'
import { IProject } from '../../../model/index'
@@ -16,18 +17,21 @@ import { IProject } from '../../../model/index'
})
export default class SubMenusProj extends Vue {
- public selectPriority: [] = tools.selectPriority[UserStore.state.lang]
@Prop({ required: false }) public menuPopupProj: any[]
@Prop({ required: false }) public itemproject: IProject
public $q: any
+ get lists() {
+ return lists
+ }
+
public clickMenu(field) {
this.$emit('clickMenu', field)
}
- public setPriority(field) {
- this.$emit('setPriority', field)
+ public selectSubMenu(action, field) {
+ this.$emit('selectSubMenu', action, field)
}
public KeychangeProgress(e) {
@@ -46,9 +50,4 @@ export default class SubMenusProj extends Vue {
}
}
- public create() {
- this.selectPriority = tools.selectPriority[UserStore.state.lang]
-
- console.log('CREAZIONE')
- }
}
diff --git a/src/components/projects/SubMenusProj/SubMenusProj.vue b/src/components/projects/SubMenusProj/SubMenusProj.vue
index 4ca5595..097f3cd 100644
--- a/src/components/projects/SubMenusProj/SubMenusProj.vue
+++ b/src/components/projects/SubMenusProj/SubMenusProj.vue
@@ -1,7 +1,9 @@