Skip to content

Commit 21a526e

Browse files
elsiosanchezelsiosanchez
andauthored
Add guide (#1002)
Co-authored-by: elsiosanchez <elsiossanches@gmail.com>
1 parent e573a05 commit 21a526e

File tree

5 files changed

+76
-25
lines changed

5 files changed

+76
-25
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import language from '@/lang'
2+
const steps = [
3+
{
4+
element: '#WorkflowActivity',
5+
popover: {
6+
title: language.t('form.activity.guide.table.title'),
7+
description: language.t('form.activity.guide.table.description'),
8+
position: 'bottom'
9+
}
10+
},
11+
{
12+
element: '#workflow',
13+
popover: {
14+
title: language.t('form.activity.guide.workflow.title'),
15+
description: language.t('form.activity.guide.workflow.description'),
16+
position: 'bottom'
17+
}
18+
},
19+
{
20+
element: '#logsWorkflow',
21+
popover: {
22+
title: language.t('form.activity.guide.workflowLogs.title'),
23+
description: language.t('form.activity.guide.workflowLogs.description'),
24+
position: 'top'
25+
}
26+
}
27+
]
28+
export default steps

src/components/ADempiere/Form/WorkflowActivity/index.vue

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
-->
1616
<template>
1717
<el-container style="height: 100% !important;">
18-
<el-header id="WorkflowActivity" class="header" :style="!collapse ? 'height: 35% !important;' : 'height: 10%!important'">
18+
<el-header id="WorkflowActivity" class="header" :style="!collapse ? 'height: 45% !important;' : 'height: 10%!important'">
1919
<el-card :style="!collapse ? 'height: 100% !important;' : 'height: auto'">
2020
<div slot="header">
2121
<span> {{ $t('form.activity.title') }} </span>
@@ -44,7 +44,7 @@
4444
</el-header>
4545
<el-main class="main">
4646
<el-container style="height: 100%;">
47-
<el-aside v-if="!isEmptyValue(currentActivity)" width="70%" style="background: white;">
47+
<el-aside v-if="!isEmptyValue(currentActivity)" id="workflow" width="70%" style="background: white;">
4848
<transition name="el-zoom-in-center">
4949
<el-card v-show="show" :style="{position: 'absolute', zIndex: '5', left: leftContextualMenu + 'px', top: topContextualMenu + 'px'}" class="box-card">
5050
<div slot="header" class="clearfix">
@@ -78,8 +78,8 @@
7878
@state-click="onLabelClicked(node, $event)"
7979
/>
8080
</el-aside>
81-
<el-main v-if="!isEmptyValue(currentActivity)">
82-
<el-card class="box-card">
81+
<el-main v-if="!isEmptyValue(currentActivity)" style="overflow: hidden;">
82+
<el-card id="logsWorkflow" class="box-card">
8383
<div slot="header" class="clearfix">
8484
{{ $t('field.logsField') }}
8585
</div>
@@ -99,24 +99,6 @@
9999
</el-main>
100100
</el-container>
101101
</el-main>
102-
<el-footer :class="styleFooter">
103-
<el-card shadow="hover" class="search">
104-
<el-form v-if="!isEmptyValue(fieldsList)" :disabled="isEmptyValue(currentActivity)" label-position="top" class="from-main">
105-
<el-form-item>
106-
<el-row>
107-
<el-col v-for="(field, index) in fieldsList" :key="index" :span="6">
108-
<field
109-
:key="field.columnName"
110-
:metadata-field="field"
111-
:v-model="field.value"
112-
/>
113-
</el-col>
114-
</el-row>
115-
</el-form-item>
116-
</el-form>
117-
<el-button type="primary" icon="el-icon-check" style="float: right;" :disabled="isEmptyValue(currentActivity)" />
118-
</el-card>
119-
</el-footer>
120102
</el-container>
121103
</template>
122104

src/lang/ADempiere/en.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,14 @@ export default {
566566
table: {
567567
priority: 'Priority',
568568
node: 'Node'
569+
},
570+
workflow: {
571+
title: 'Workflow',
572+
description: 'Workflow life cycle diagram. The highlighted Node is the one currently awaiting verification.'
573+
},
574+
workflowLogs: {
575+
title: 'Change Log',
576+
description: 'Workflow timeline'
569577
}
570578
}
571579
}

src/lang/ADempiere/es.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export default {
5757
navbar: {
5858
badge: {
5959
Notifications: 'Notificaciones',
60-
activity: 'Actividades pendiente',
60+
activity: 'Flujos de Trabajos por Aprobar',
6161
link: 'Ir a Histórico de Procesos'
6262
},
6363
logOut: 'Salir',
@@ -542,6 +542,20 @@ export default {
542542
table: {
543543
priority: 'Prioridad',
544544
node: 'Nodo'
545+
},
546+
guide: {
547+
table: {
548+
title: 'Lista de Flujos de trabajos por aprobar',
549+
description: 'Seleccione al menos uno para ver el detalle y responsable de aprobación. De igual manera puede decidir si aprueba, rechaza o redirecciona el mismo'
550+
},
551+
workflow: {
552+
title: 'Flujo de Trabajo',
553+
description: 'Diagrama del ciclo de vida del flijo de trabajo. El Nodo resaltado es el que se encuentra actualmente a la espera de verificación.'
554+
},
555+
workflowLogs: {
556+
title: 'Bitacora de Cambios',
557+
description: 'Linea de tiempo del flujo de trabajo'
558+
}
545559
}
546560
}
547561
}

src/layout/components/Navbar.vue

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ import Badge from '@/components/ADempiere/Badge'
6868
import { getImagePath } from '@/utils/ADempiere/resource.js'
6969
import Driver from 'driver.js' // import driver.js
7070
import 'driver.js/dist/driver.min.css' // import driver.js css
71-
import steps from '@/components/ADempiere/Form/VPOS/Guide/steps'
7271
7372
export default {
7473
components: {
@@ -134,6 +133,26 @@ export default {
134133
return list.filter(field => field.isShowedFromUserDefault)
135134
}
136135
return []
136+
},
137+
getForm() {
138+
return this.$store.getters.getForm(this.$route.meta.uuid)
139+
},
140+
formSteps() {
141+
let form
142+
switch (this.getForm.fileName) {
143+
case 'WFActivity':
144+
form = require('@/components/ADempiere/Form/WorkflowActivity/Guide/steps')
145+
break
146+
case 'VPOS':
147+
form = require('@/components/ADempiere/Form/VPOS/Guide/steps')
148+
break
149+
default:
150+
form = {
151+
default: []
152+
}
153+
break
154+
}
155+
return form.default
137156
}
138157
},
139158
mounted() {
@@ -202,7 +221,7 @@ export default {
202221
})
203222
break
204223
case 'form':
205-
field = this.showCollection && this.isShowedPOSKeyLaout ? steps : steps.filter(steps => this.isEmptyValue(steps.panel))
224+
field = this.formSteps
206225
break
207226
}
208227
return field

0 commit comments

Comments
 (0)