From 045536f4b0842907f2e96a573c185fd86393d91c Mon Sep 17 00:00:00 2001
From: elsiosanchez <45974454+elsiosanchez@users.noreply.github.com>
Date: Fri, 31 Jan 2020 07:41:20 -0400
Subject: [PATCH] group by logId (#288)

* group by logId

* changing structure of the change log
---
 src/views/ADempiere/Window/index.vue | 69 +++++++++++++---------------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/src/views/ADempiere/Window/index.vue b/src/views/ADempiere/Window/index.vue
index 488edc76..8fd61590 100644
--- a/src/views/ADempiere/Window/index.vue
+++ b/src/views/ADempiere/Window/index.vue
@@ -5,7 +5,7 @@
   >
     <el-container style="height: 86vh;">
       <Split>
-        <SplitArea :size="!show ? 100 : 70" :min-size="100">
+        <SplitArea :size="!show ? 100 : 50" :min-size="100">
           <el-aside width="100%">
             <split-pane :min-percent="10" :default-percent="defaultPorcentSplitPane" split="vertical">
               <template>
@@ -148,7 +148,7 @@
             </split-pane>
           </el-aside>
         </SplitArea>
-        <SplitArea :size="show ? 30 : 0">
+        <SplitArea :size="show ? 50 : 0">
           <el-main>
             <div style="top: 40%;position: absolute;">
               <el-button v-show="show" type="info" icon="el-icon-info" circle style="float: right;" class="el-button-window" @click="conteInfo" />
@@ -165,35 +165,32 @@
                         <div
                           v-if="getIsChangeLog"
                         >
-                          <el-card
-                            v-for="(listLogs, index) in getTypeLogs"
-                            :key="index"
-                          >
-                            <el-scrollbar wrap-class="scroll-window-log-change">
-                              <el-timeline>
-                                <el-timeline-item
-                                  v-for="(evenType, key) in listLogs.logs"
-                                  :key="key"
-                                  :timestamp="translateDate(evenType.logDate)"
-                                  placement="top"
-                                  :color="listLogs.eventType === 1 ? 'rgb(22, 130, 230)' : 'rgba(67, 147, 239, 1)'"
-                                >
-                                  <el-card shadow="hover" @click.native="changeField(evenType)">
-                                    <div>
-                                      <span>{{ evenType.userName }}</span>
-                                      <el-link type="primary" style="float: right;" @click="showkey(key, index)"> {{ $t('window.containerInfo.changeDetail') }} </el-link>
+                          <el-scrollbar wrap-class="scroll-window-log-change">
+                            <el-timeline>
+                              <el-timeline-item
+                                v-for="(listLogs, key) in gettersListRecordLogs"
+                                :key="key"
+                                :timestamp="translateDate(listLogs.logDate)"
+                                placement="top"
+                                color="#008fd3"
+                              >
+                                <el-card shadow="hover" class="clearfix">
+                                  <div>
+                                    {{ listLogs.userName }}
+                                    <el-link type="primary" style="float: right;" @click="showkey(key)"> {{ $t('window.containerInfo.changeDetail') }} </el-link>
+                                  </div>
+                                  <br>
+                                  <el-collapse-transition>
+                                    <div v-show="(currentKey === key)">
+                                      <span v-for="(list, index) in listLogs.changeLogs" :key="index">
+                                        <p><b> {{ list.displayColumnName }} :</b> <strike> {{ list.oldDisplayValue }} </strike> {{ list.newDisplayValue }} </p>
+                                      </span>
                                     </div>
-                                    <br>
-                                    <el-collapse-transition>
-                                      <div v-show="(currentKey === key) && (typeAction === index)" :key="key" class="text item">
-                                        <span><p><b> {{ evenType.displayColumnName }}: </b> <strike>{{ evenType.oldDisplayValue }} </strike>     {{ evenType.newDisplayValue }}</p></span>
-                                      </div>
-                                    </el-collapse-transition>
-                                  </el-card>
-                                </el-timeline-item>
-                              </el-timeline>
-                            </el-scrollbar>
-                          </el-card>
+                                  </el-collapse-transition>
+                                </el-card>
+                              </el-timeline-item>
+                            </el-timeline>
+                          </el-scrollbar>
                         </div>
                         <div
                           v-else
@@ -491,16 +488,16 @@ export default {
     },
     getTypeLogs() {
       const groupLog = this.gettersListRecordLogs.reduce((groupLog, item) => {
-        if (!groupLog.includes(item.eventType)) {
-          groupLog.push(item.eventType)
+        if (!groupLog.includes(item.logId)) {
+          groupLog.push(item.logId)
         }
         return groupLog
       }, [])
-        .map(i => {
+        .map(log => {
           // agrup for logId
           return {
-            logs: this.gettersListRecordLogs.filter(b => b.eventType === i),
-            eventType: i
+            logs: this.gettersListRecordLogs.filter(change => change.logId === log),
+            logId: log
           }
         })
       return groupLog
@@ -822,7 +819,7 @@ export default {
 </style>
 <style>
   .scroll-window-log-change {
-    max-height: 45vh !important;
+    max-height: 74vh !important;
   }
   .scroll-window-log-workflow {
     max-height: 68vh !important;