Merge pull request #33 from EmerisScala/feature/adempiere-vue

Fix #20 The window should show the four columns vs 2 columns
adempiere · Mar 10, 2021 · 40e35cc · 40e35cc
2 parents 5eb904c + fa7c018
commit 40e35cc
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 44 deletions.
diff --git a/src/ADempiere/modules/window/components/ChatEntries/index.ts b/src/ADempiere/modules/window/components/ChatEntries/index.ts
@@ -36,13 +36,14 @@ export default class ChatEntries extends Vue {
 
   get tableNameToSend(): string | undefined {
     if (!this.tableName) {
-      return this.tableName
+      this.$route.params.tableName as string
     }
+    return this.tableName
   }
 
-  get recordIdToSend(): number | undefined {
+  get recordIdToSend() {
     if (!this.recordId) {
-      return Number(this.$route.params.recordId)
+      return this.$route.params.recordId
     }
     return this.recordId
   }
@@ -58,9 +59,14 @@ export default class ChatEntries extends Vue {
   sendComment() {
     // const comment = this.$store.getters[Namespaces.ChatEntries]
     const comment: string = this.$store.getters[Namespaces.ChatEntries + '/' + 'getChatTextLong']
+    console.log('sendComment active')
+    console.log('comment')
+    console.log(comment)
+    console.log('tableName')
+    console.log(this.tableName)
 
-    if (!comment) {
-      this.$store.dispatch('createChatEntry', {
+    if (comment) {
+      this.$store.dispatch(Namespaces.ChatEntries + '/' + 'createChatEntry', {
         tableName: this.tableNameToSend,
         recordId: this.recordIdToSend,
         comment

diff --git a/src/ADempiere/modules/window/views/Window/template.vue b/src/ADempiere/modules/window/views/Window/template.vue
@@ -98,8 +98,8 @@
                                   {{ $t('window.containerInfo.notes') }}
                                 </span>
                                 <chat-entries
-                                  :table-name="getTableName"
-                                  :record-id="recordId"
+                                  :table-name="this.getTableName"
+                                  :record-id="this.recordId"
                                 />
                               </el-tab-pane>
 

diff --git a/src/ADempiere/shared/components/Field/index.ts b/src/ADempiere/shared/components/Field/index.ts
@@ -219,7 +219,7 @@ export default class FieldDefinition extends Vue {
         return DEFAULT_SIZE
       }
 
-      let sizeField: Partial<ISizeData> = {}
+      let sizeField: ISizeData | undefined
       if (this.field.size) {
         // set field size property
         sizeField = this.field.size
@@ -229,23 +229,27 @@ export default class FieldDefinition extends Vue {
         sizeField = DEFAULT_SIZE
       }
 
-      const newSizes: Partial<ISizeData> = {}
+      let newSizes: Partial<ISizeData> | undefined
 
       // in table set max width, used by browser result and tab children of window
       if (this.inTable) {
-        newSizes.xs = 24
-        newSizes.sm = 24
-        newSizes.md = 24
-        newSizes.lg = 24
-        newSizes.xl = 24
+        newSizes = {
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 24,
+          xl: 24
+        }
         return <ISizeData>newSizes
       }
       if (this.isAdvancedQuery) {
-        newSizes.xs = 24
-        newSizes.sm = 24
-        newSizes.md = 12
-        newSizes.lg = 12
-        newSizes.xl = 12
+        newSizes = {
+          xs: 24,
+          sm: 24,
+          md: 12,
+          lg: 12,
+          xl: 12
+        }
         return <ISizeData>newSizes
       }
 
@@ -259,15 +263,19 @@ export default class FieldDefinition extends Vue {
           this.getWidth <= 768 ||
                 (this.getWidth >= 768 && this.field.isShowedRecordNavigation)
         ) {
-          newSizes.xs = 12
-          newSizes.sm = 12
-          newSizes.md = 12
-          newSizes.lg = 12
-          newSizes.xl = 12
+          newSizes = {
+            xs: 12,
+            sm: 12,
+            md: 12,
+            lg: 12,
+            xl: 12
+          }
           return <ISizeData>newSizes
         } else if (this.inGroup && this.getWidth >= 992) {
-          newSizes.xs = sizeField.xs
-          newSizes.sm = sizeField.sm! * 2
+          newSizes = {
+            xs: sizeField.xs,
+            sm: sizeField.sm * 2
+          }
           if (this.getWidth <= 1199) {
             newSizes.md = sizeField.md
           } else {

diff --git a/src/ADempiere/shared/components/Panel/MixinMainPanel.ts b/src/ADempiere/shared/components/Panel/MixinMainPanel.ts
@@ -534,8 +534,7 @@ export default class MixinMainPanel extends Vue {
             }
           })
           .catch(error => {
-            console.warn(
-                        `Error getting data list tab. Message: ${error.message}, code ${error.code}.`
+            console.warn(`Error getting data list tab. Message: ${error.message}, code ${error.code}.`
             )
           })
       }
@@ -586,7 +585,7 @@ export default class MixinMainPanel extends Vue {
 
       // count and add the field numbers according to your group
       groupsList.forEach(groupFields => {
-        const typeG = groupFields.metadataFields![0].typeGroupAssigned
+        const typeG = groupFields.metadataFields![0].typeGroupAssigned || ''
         groupFields.typeGroup = typeG
 
         const fieldsDisplayed = groupFields.metadataFields!.filter(

diff --git a/src/ADempiere/shared/lang/en.ts b/src/ADempiere/shared/lang/en.ts
@@ -277,7 +277,7 @@ export default {
     undoNew: 'Undo New Record',
     containerInfo: {
       notes: 'Notes',
-      changeLog: 'ACtivity',
+      changeLog: 'Activity',
       workflowLog: 'Workflow Log',
       changeDetail: 'Change detail',
       logWorkflow: {

diff --git a/src/ADempiere/shared/store/modules/Utils/getters.ts b/src/ADempiere/shared/store/modules/Utils/getters.ts
@@ -12,8 +12,9 @@ export const getters: UtilsGetterTree = {
   getProcessSelect: (state: UtilsState): Partial<ISelectionProcessData> => {
     return state.selectionProcess
   },
-  getWidthLayout: (state: UtilsState, rootGetters): number => {
-    if (rootGetters.toggleSideBar) {
+  getWidthLayout: (state: UtilsState, getters, rootState, rootGetters): number => {
+    const toggleSidebar = rootGetters.toggleSideBar
+    if (toggleSidebar) {
       return state.width - 250
     }
     return state.width - 54

diff --git a/src/ADempiere/shared/utils/DictionaryUtils/index.ts b/src/ADempiere/shared/utils/DictionaryUtils/index.ts
@@ -647,10 +647,10 @@ export function assignedGroup(params: {
 
   fieldsList.forEach(fieldElement => {
     if (fieldElement.panelType !== PanelContextType.Window) {
-      // fieldElement.groupAssigned = ''
-      // fieldElement.typeGroupAssigned = ''
-      fieldElement.fieldGroup.groupName = ''
-      fieldElement.fieldGroup.groupType = ''
+      fieldElement.groupAssigned = ''
+      fieldElement.typeGroupAssigned = ''
+      // fieldElement.fieldGroup.groupName = ''
+      // fieldElement.fieldGroup.groupType = ''
       return
     }
 
@@ -675,14 +675,14 @@ export function assignedGroup(params: {
       }
     }
 
-    // fieldElement.groupAssigned = currentGroup
-    // fieldElement.typeGroupAssigned = typeGroup
-    fieldElement.fieldGroup.groupName = currentGroup
-    fieldElement.fieldGroup.groupType = typeGroup
+    fieldElement.groupAssigned = currentGroup
+    fieldElement.typeGroupAssigned = typeGroup
+    // fieldElement.fieldGroup.groupName = currentGroup
+    // fieldElement.fieldGroup.groupType = typeGroup
 
     if (groupToAssigned !== undefined) {
-      // fieldElement.groupAssigned = groupToAssigned
-      fieldElement.fieldGroup.groupName = groupToAssigned
+      fieldElement.groupAssigned = groupToAssigned
+      // fieldElement.fieldGroup.groupName = groupToAssigned
     }
   })
 

diff --git a/src/ADempiere/shared/utils/DictionaryUtils/type.ts b/src/ADempiere/shared/utils/DictionaryUtils/type.ts
@@ -76,7 +76,8 @@ export type IFieldDataExtendedUtils = IFieldData &
         handleRequestFocus?: any
         // Panel
         isActiveLogics?: boolean
-        groupAssigned?: any
+        groupAssigned?: string
+        typeGroupAssigned?: string
     }
 
 export interface IActionAttributesData {

diff --git a/src/App.vue b/src/App.vue
@@ -8,12 +8,38 @@
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator'
 import ServiceWorkerUpdatePopup from '@/pwa/components/ServiceWorkerUpdatePopup.vue'
+import { Namespaces } from './ADempiere/shared/utils/types'
 
 @Component({
   name: 'App',
   components: {
     ServiceWorkerUpdatePopup
   }
 })
-export default class extends Vue {}
+export default class extends Vue {
+  // Methods
+  getWindowWidth() {
+    this.$store.dispatch(Namespaces.Utils + '/' + 'setWidth', document.documentElement.clientWidth)
+  }
+
+  getWindowHeight() {
+    this.$store.dispatch(Namespaces.Utils + '/' + 'setHeight', document.documentElement.clientHeight)
+  }
+
+  // Hooks
+  mounted() {
+    this.$nextTick(() => {
+      window.addEventListener('resize', this.getWindowWidth)
+      window.addEventListener('resize', this.getWindowHeight)
+
+      this.getWindowWidth()
+      this.getWindowHeight()
+    })
+  }
+
+  beforeDestroy() {
+    window.removeEventListener('resize', this.getWindowWidth)
+    window.removeEventListener('resize', this.getWindowHeight)
+  }
+}
 </script>