@simitgroup/simpleapp-generator 1.4.2-alpha → 1.5.0-alpha

package/templates/nest/src/simpleapp/generate/types/workflow.type.ts.eta

@@ -0,0 +1,15 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-04-15
+ * Author: Ks Tan
+ */
+
+ export type WorkflowCatalogue = {
+    <%for(let i=0; i<it.allbpmn.length;i++){ %>
+    <% const bpmn = it.allbpmn[i] %>      
+        <%=bpmn%>:any,
+    <%}%>
+}
+
+export type WorkflowName = keyof WorkflowCatalogue

package/templates/nest/src/simpleapp/generate/workflow/workflow.config.ts.eta

@@ -65,8 +65,8 @@ export class WorkflowConfig {
       },
       appDelegate: (server: BPMNServer) =>
         _this.workflowdelegate.setServer(server),
-      userService: (server: BPMNServer) =>
-        _this.workflowUserService.setServer(server),
+      //userService: (server: BPMNServer) =>
+        //_this.workflowUserService.setServer(server),
       dataStore: function (server: BPMNServer) {
         return new MyDataStore(server);
       },

package/templates/nest/src/simpleapp/generate/workflow/workflow.controller.ts.eta

@@ -1,7 +1,7 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
+ * last change 2024-04-15
  * Author: Ks Tan
  */
 import {
@@ -15,6 +15,7 @@ import {
   Delete,
   HttpCode,
 } from '@nestjs/common';
+
 import { WorkflowService } from './workflow.service';
 import { UserTaskActors } from './workflow.type';
 import { Roles } from '../commons/roles/roles.decorator';
@@ -29,6 +30,7 @@ import {
 import { ApiTags, ApiBody, ApiResponse, ApiOperation } from '@nestjs/swagger';
 import { AppUser } from '../commons/decorators/appuser.decorator';
 import { UserContext } from '../commons/user.context';
+import { WorkflowName } from '../types';
 @ApiTags('workflow')
 @Controller('workflow')
 export class WorkflowController {
@@ -210,7 +212,7 @@ export class WorkflowController {
   })
   async newWorkflowDefinitions(
     @AppUser() appuser: UserContext,
-    @Param('workflowname') workflowname: string,
+    @Param('workflowname') workflowname: WorkflowName,
     @Body() xml: string,
   ) {
     return await this.workflowService.newWorkflowDefinitions(
@@ -234,7 +236,7 @@ export class WorkflowController {
   })
   async updateWorkflowDefinition(
     @AppUser() appuser: UserContext,
-    @Param('workflowname') workflowname: string,
+    @Param('workflowname') workflowname: WorkflowName,
     @Body() xml: string,
   ) {
     return await this.workflowService.updateWorkflowDefinition(
@@ -254,7 +256,7 @@ export class WorkflowController {
   })
   async readWorkflowDefinition(
     @AppUser() appuser: UserContext,
-    @Param('workflowname') workflowname: string,
+    @Param('workflowname') workflowname: WorkflowName,
   ) {
     return await this.workflowService.readWorkflowDefinition(
       appuser,
@@ -271,7 +273,7 @@ export class WorkflowController {
   })
   async dropWorkflowDefinition(
     @AppUser() appuser: UserContext,
-    @Param('workflowname') workflowname: string,
+    @Param('workflowname') workflowname: WorkflowName,
   ) {
     return await this.workflowService.deleteWorkflowDefinition(
       appuser,
@@ -344,7 +346,7 @@ export class WorkflowController {
   })
   async startWorkflow(
     @AppUser() appuser: UserContext,
-    @Param('workflowname') workflowname: string,
+    @Param('workflowname') workflowname: WorkflowName,
     @Body() data: any,
   ) {
     return await this.workflowService.startWorkflow(

package/templates/nest/src/simpleapp/generate/workflow/workflow.service.ts.eta

@@ -1,7 +1,7 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
+ * last change 2024-04-15
  * Author: Ks Tan
  */
 import { WorkflowConfig } from './workflow.config';
@@ -33,6 +33,7 @@ import {
 } from 'bpmn-server';
 // import { configuration } from './configuration';
 import { UserContext } from '../commons/user.context';
+import { WorkflowName } from '../types';
 //import * as formschemas from '../../workflow/formschema';
 export {
   WorkflowSettingApiSchema,
@@ -110,7 +111,7 @@ export class WorkflowService {
    */
   async newWorkflowDefinitions(
     appuser: UserContext,
-    workflowName: string,
+    workflowName: WorkflowName,
     xml: string,
   ) {
     throw new BadRequestException(
@@ -124,13 +125,19 @@ export class WorkflowService {
     );
   }
 
-  async readWorkflowDefinition(appuser: UserContext, workflowname: string) {
+  async readWorkflowDefinition(
+    appuser: UserContext,
+    workflowname: WorkflowName,
+  ) {
     throw new BadRequestException(
       `readWorkflowDefinition is not supported yet`,
     );
   }
 
-  async deleteWorkflowDefinition(appuser: UserContext, workflowname: string) {
+  async deleteWorkflowDefinition(
+    appuser: UserContext,
+    workflowname: WorkflowName,
+  ) {
     throw new BadRequestException(
       `deleteWorkflowDefinition is not supported yet`,
     );
@@ -138,7 +145,7 @@ export class WorkflowService {
 
   async updateWorkflowDefinition(
     appuser: UserContext,
-    workflowname: string,
+    workflowname: WorkflowName,
     xml: string,
   ) {
     throw new BadRequestException(
@@ -193,21 +200,20 @@ export class WorkflowService {
     data: any,
   ) {
     try {
-      
       const response = await this.bpmnServer.engine.invoke(
         { 'items.id': taskId, 'items.status': 'wait' },
         data,
         appuser.getUid(),
-        {appuser:appuser}
+        { appuser: appuser },
       );
       return {
-        parentKeys:Object.keys(response),
-        parentId:response.id,
-        data:response.instance.data,
+        parentKeys: Object.keys(response),
+        parentId: response.id,
+        data: response.instance.data,
         // parentId:response,
-        input:response.item.input,
-        vars:response.item.vars,
-        id:response.item.id,
+        input: response.item.input,
+        vars: response.item.vars,
+        id: response.item.id,
         status: response.item.status,
       };
     } catch (e) {
@@ -313,12 +319,26 @@ export class WorkflowService {
    * @returns workflowsummary
    */
   @OnEvent('workflow.start')
-  async startWorkflow(appuser: UserContext, workflowName: string, data?: any) {
+  async startWorkflow(
+    appuser: UserContext,
+    workflowName: WorkflowName,
+    data?: any,
+  ) {
+    //run as event, it wont have transaction
+    appuser.setDBSession(undefined);
+    
+    if (!data ) data = {}    
+    
+    //sometimes data is Mongoose object instead of pure data, need serialize and deserialize to remove that
+    data=JSON.parse(JSON.stringify(data))
+    
     try {
       // console.log('startWorkflow started: ', workflowName);
+      
       data.tenantId = appuser.getTenantId();
       data.orgId = appuser.getOrgId();
       data.branchId = appuser.getBranchId();
+    
       const result = await this.bpmnServer.engine.start(
         workflowName,
         data,
@@ -457,13 +477,12 @@ export class WorkflowService {
       const elementProps = event.context.item.element.def;
       // const usertaskinput = event.context.item.input ?? null;
       const data = event.context.instance.data;
-      const vars = {}
-      Object.assign(vars,event.context.item.input);
-      event.context.item.input={}
+      const vars = {};
+      Object.assign(vars, event.context.item.input);
+      event.context.item.input = {};
       const options = event.context.options;
       switch (elementType) {
         case BPMN_TYPE.UserTask:
-          
           let usertaskeventtype: UserTaskEventType;
           if (eventType == EXECUTION_EVENT.node_start)
             usertaskeventtype = 'start';
@@ -475,7 +494,7 @@ export class WorkflowService {
             usertaskeventtype = 'invoked';
           else if (eventType == EXECUTION_EVENT.node_wait)
             usertaskeventtype = 'wait';
-            // console.log("event-------=================================",eventType,usertaskeventtype)
+          // console.log("event-------=================================",eventType,usertaskeventtype)
           if (usertaskeventtype) {
             const props: UserTaskData = {
               workflowName: workflowName,
@@ -492,9 +511,9 @@ export class WorkflowService {
                 followUpDate: event.context.item.followUpDate,
                 priority: event.context.item.priority,
                 formKey: elementProps.formKey,
-              },              
+              },
               data: data,
-              vars:vars,
+              vars: vars,
               options: options,
             };
             this.eventEmitter.emit(
@@ -518,7 +537,7 @@ export class WorkflowService {
               elementId: elementId,
               elementName: elementName,
               data: data,
-              vars:vars,
+              vars: vars,
               options: options,
             };
             this.eventEmitter.emit(

package/templates/nest/src/simpleapp/resolvers/readme.md.eta

@@ -0,0 +1 @@
+graphql resolver

package/templates/nest/src/simpleapp/simpleapp.module.ts.eta

@@ -13,6 +13,7 @@ import { AuditTrail } from './generate/commons/audittrail.service';
 <% for(let i=0;i<it.modules.length; i++){ %>
 <% let obj = it.modules[i]%>
 import { <%= obj.docname %>Service } from './services/<%= obj.doctype %>.service';    
+import { <%= obj.docname %>Resolver } from './generate/resolvers/<%= obj.doctype %>.resolver';    
 import { <%= obj.docname %>Controller } from './generate/controllers/<%= obj.doctype %>.controller';    
 import { <%= obj.docname %>MongoSchema } from './generate/models/<%= obj.doctype %>.model';
 <%}%>
@@ -45,12 +46,18 @@ import { <%=capitalizeFirstLetter(bpmn)%>ListenerService } from 'src/simpleapp/w
   ],
   controllers: [<% for(let i=0;i<it.modules.length; i++){ %><%= it.modules[i].docname %>Controller,<%}%> ProfileController,WorkflowController],
   providers: [
-    AuditTrail,DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %><%= it.modules[i].docname %>Service,<%}%> ProfileService,WorkflowDelegate,WorkflowConfig,WorkflowService,WorkflowUserService,
+    AuditTrail,DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %>
+      <%= it.modules[i].docname %>Service,
+      <%= it.modules[i].docname %>Resolver,
+      <%}%> ProfileService,WorkflowDelegate,WorkflowConfig,WorkflowService,WorkflowUserService,
      <%for(let i=0; i<it.allbpmn.length;i++){%>
         <%let bpmn = it.allbpmn[i]%>
         <%=capitalizeFirstLetter(bpmn)%>ListenerService,
     <%}%>
   ],
-  exports:[AuditTrail,DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %><%= it.modules[i].docname %>Service,<%}%> ProfileService,WorkflowDelegate,WorkflowConfig,WorkflowService,WorkflowUserService,]
+  exports:[AuditTrail,DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %>
+    <%= it.modules[i].docname %>Service,
+    <%= it.modules[i].docname %>Resolver,
+    <%}%> ProfileService,WorkflowDelegate,WorkflowConfig,WorkflowService,WorkflowUserService,]
 })
 export class GenerateModule {}

package/templates/nuxt/app.vue._eta

@@ -13,13 +13,15 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-11-12
+ * last change 2024-03-17
  * Author: Ks Tan
  */
+
 watch(()=>useRoute().params['xorg'],async (newval,oldvalue)=>{
   await reloadUserStore()  
   if(getPathPara('xorg','')!=''){
     if(!getUserProfile()?.currentGroup) goTo('pickgroup')
+    setGraphqlServer()
   }  
 })
 
@@ -36,6 +38,10 @@ const getLayout = ()=>{
 onMounted(()=>{
   const currentgroup = useCookie('currentGroup').value
   //if no xorg, no enforce pick group
-  if(getCurrentXorg() &&  !currentgroup)  goTo('pickgroup')
+  if(getCurrentXorg()){
+    if (!currentgroup)goTo('pickgroup')
+    setGraphqlServer()
+  }
+    
 })
 </script>

package/templates/nuxt/components/renderer/RendererMoney.vue.eta

@@ -1,11 +1,13 @@
-
 <template>
-    <span v-if="showCurrency"> {{ Intl.NumberFormat(  useI18n().defaultLocale,{
-        style:'currency',
-        currency: getUserProfile()?.currency,
-        currencyDisplay: 'symbol',        
-    }).format(modelValue) }}</span>
-    <span v-else> {{ modelValue.toLocaleString(useI18n().defaultLocale,options) }}</span>
+  <span v-if="typeof modelValue=='undefined' || typeof modelValue=='string' ">-</span>
+  <span v-else-if="showCurrency">
+    {{
+      currenyValue
+    }}</span
+  >
+  <span v-else>
+    {{ modelValue.toLocaleString(useI18n().defaultLocale, options) }}</span
+  >
 </template>
 <script lang="ts" setup>
 /**
@@ -14,12 +16,19 @@
  * last change 2024-02-04
  * author: Ks Tan
  */
-
+const currenyValue = computed(()=>{
+  if(modelValue.value === undefined) return '-'
+  return Intl.NumberFormat(useI18n().defaultLocale, {
+        // style: "currency",
+        // currency: getUserProfile()?.currency ?? '',
+        // currencyDisplay: "symbol",
+      }).format(modelValue.value)
+})
 const options = {
-  style: 'decimal',  // Other options: 'currency', 'percent', etc.
+  style: "decimal", // Other options: 'currency', 'percent', etc.
   minimumFractionDigits: 2,
   maximumFractionDigits: 2,
 };
-const modelValue = defineModel<number>({required:true})
-const props = defineProps<{showCurrency?:boolean}>()
-</script>
+const modelValue = defineModel<number>({ required: true });
+const props = defineProps<{ showCurrency?: boolean }>();
+</script>

package/templates/nuxt/composables/graphquery.generate.ts.eta

@@ -0,0 +1,26 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-03-13
+ * Author: Ks Tan
+ */
+
+import { createHttpLink, } from '@apollo/client/core';
+
+export const setGraphqlServer=()=>{
+    const apolloclient = useNuxtApp().$apollo.defaultClient
+    const newlink = createHttpLink({
+        uri: `${useRuntimeConfig().public.API_URL}/${getCurrentXorg()}/graphql`,
+      })
+      apolloclient.setLink(newlink)
+    //   apolloclient.defaultOptions={
+       
+    //     query:{
+    //      fetchPolicy: 'no-cache',
+    //      errorPolicy: 'all'
+    //     }
+    //   }
+
+  }
+  
+export const graphquery=async(qqlstr: typeof gql) =>(await useAsyncQuery(qqlstr)).data

package/templates/nuxt/composables/refreshDocumentList.generate.ts.eta

@@ -1,19 +1,20 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-03-07
+ * last change 2024-04-15
  * Author: Ks Tan
  */
-export const refreshDocumentList = (docName:string)=>useNuxtApp().$event('RefreshDocumentList',{documentName:docName})
-export const refreshDocument = (docName:string)=>useNuxtApp().$event('RefreshDocument',docName)
+import {SimpleAppDocumentType} from '~/types'
+export const refreshDocumentList = (docName:SimpleAppDocumentType)=>useNuxtApp().$event('RefreshDocumentList',{documentName:docName})
+export const refreshDocument = (docName:SimpleAppDocumentType)=>useNuxtApp().$event('RefreshDocument',docName)
 
-export const listenDocument =  (docName:string,callback:Function) =>{
+export const listenDocument =  (docName:SimpleAppDocumentType,callback:Function) =>{
     useNuxtApp().$listen('RefreshDocument',async (eventdocname:string)=>{
         if(eventdocname==docName) await callback()
     })
 }
-export const listenDocumentList =  (docName:string,callback:Function) =>{
+export const listenDocumentList =  (docName:SimpleAppDocumentType,callback:Function) =>{
     useNuxtApp().$listen('RefreshDocumentList',async (eventdata)=>{
         if(eventdata.documentName == docName) await callback()
     })
-}
+}

package/templates/nuxt/layouts/mobile.vue._eta

@@ -23,9 +23,9 @@
                 
                 <HeaderButtonMenuPicker v-model="showMenu"></HeaderButtonMenuPicker>
                 <HeaderButtonProfile v-model="showProfile"/>
-                <UserInvitation/>
+                
         </div> 
-        
+        <UserInvitation/>
         <!-- <HeaderBar class="border flex flex-row h-10 fixed left-0 w-full  justify justify-between top-0 z-50 bg-white  dark:bg-gray-800"/> -->
      
     </div>

package/templates/nuxt/nuxt.config.ts._eta

@@ -50,6 +50,7 @@ devServer: {
     'dayjs-nuxt',
     '@sidebase/nuxt-auth',
     'nuxt-primevue',
+    '@nuxtjs/apollo',
     // '@nuxtjs/pwa', //cannot turn on, will cause nuxt cant start
     // "nuxt-security",     //temporary avoid nuxt-security cause cors
     '@vueuse/nuxt',     
@@ -89,6 +90,13 @@ devServer: {
     ],
     defaultLocale: "en",    
   },
+  apollo: {
+    clients: {
+      default: {
+        httpEndpoint: process.env.API_URL
+      }
+    },
+  },
   primevue: {
     
     options: {

package/templates/nuxt/pages/[xorg]/index.vue._eta

@@ -16,4 +16,13 @@
  * author: Ks Tan
  */
 useNuxtApp().$event('SetTitle',t('home'))
+
+onMounted(()=>{
+  if(!getUserStore()?.currency || !getUserStore()?.country){
+    const id=getUserStore().orgRecordId
+    onScreenEditDocument<Organization>('organization',id, async (actionName:FormCrudEvent,data:Organization)=>{
+      
+    })
+  }
+})
 </script>

package/templates/nuxt/pages/[xorg]/mobile/index.vue._eta

@@ -1,19 +1,6 @@
 <template>
-  <div class="frontpage-container">
-    <client-only>
-      <title>{{ getUserProfile()?.branchName }}</title>
-    </client-only>
-    <h1 class="border text-3xl text-center m-20 p-20">
-      {{ t("createYourContentHere") }}
-    </h1>
-  </div>
+  <IndexPage></IndexPage>
 </template>
 <script lang="ts" setup>
-/**
- * This file was automatically generated by simpleapp generator during initialization. It is changable.
- * --remove-this-line-to-prevent-override--
- * last change 2024-02-22
- * author: Ks Tan
- */
-useNuxtApp().$event('SetTitle',t('home'))
+import IndexPage from '../index.vue'
 </script>

package/templates/nuxt/pages/picktenant.vue._eta

@@ -2,7 +2,9 @@
   <div class="flex flex-col w-full">
     <TextTitle class="text-center p-2">{{ t("pickYourDatabase") }}</TextTitle>
     <div class="flex flex-col">
+      
       <div class="p-4">
+        {{ t('welcome ') }} {{ getUserProfile()?.fullName }}
         <UserButtonCreateTenant></UserButtonCreateTenant>
       </div>
       <UserTenantPicker></UserTenantPicker>
@@ -13,7 +15,7 @@
 /**
  * This file was automatically generated by simpleapp generator.
  * --remove-this-line-to-prevent-override--
- * last change 2023-09-09
+ * last change 2023-04-17
  * author: Ks Tan
  */
 </script>

package/templates/nuxt/simpleapp/generate/clients/SimpleAppClient.ts.eta

@@ -68,6 +68,7 @@ export class SimpleAppClient<
     return await this.docapi.runFindOne(id,this.axios)
     .then((res: AxiosResponse) => {
       // if(this.event){this.event('info:getById',res.data)}
+      this.data.value={} as TData
       Object.assign(this.data.value, res.data);
       return res;
     }).catch((res:any)=>{
@@ -100,6 +101,7 @@ export class SimpleAppClient<
           //   summary:'Record create successfully',
           //   status:NotificationStatus.success
           // })
+          this.data.value = {} as TData
           this.data.value = { ...res.data };
           holdScreenEnd()
           return res.data;

package/templates/nuxt/types/events.ts.eta

@@ -1,18 +1,19 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
+ * last change 2024-04-15
  * Author: Ks Tan
  */
 import { Component } from 'vue';
 import {Notification} from './notifications'
 import { SimpleAppClient } from '~/simpleapp/generate/clients/SimpleAppClient';
 import { FormCrudEvent } from './simpleappinput';
+import { SimpleAppDocumentType } from './documentlist';
 export type ViewRecord = {
     _id: string    
     eventId:string
     label:string
-    documentName: string
+    documentName: SimpleAppDocumentType
     viewer?: any 
     readonly?:boolean    
     paras?:any
@@ -20,7 +21,7 @@ export type ViewRecord = {
     document?:SimpleAppClient<any,any>
 }
 export type RefreshDocumentList ={
-    documentName : string,
+    documentName : SimpleAppDocumentType,
     data?:any
 }
 export type EventType ={

package/templates/project/workflows/bpmn/{suspendcustomer.bpmn._eta → sayhello.bpmn._eta}

@@ -1,55 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn">
+<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn">
   <bpmn:process id="process1" name="Suspend Customer" isExecutable="false">
     <bpmn:extensionElements />
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>Flow_1a63g0z</bpmn:outgoing>
     </bpmn:startEvent>
     <bpmn:endEvent id="Event_0qpgd23">
-      <bpmn:incoming>Flow_1oty8vq</bpmn:incoming>
+      <bpmn:incoming>Flow_1rspxq4</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_1a63g0z" sourceRef="StartEvent_1" targetRef="hello1" />
-    <bpmn:sequenceFlow id="Flow_1rspxq4" sourceRef="hello1" targetRef="approve1" />
+    <bpmn:sequenceFlow id="Flow_1rspxq4" sourceRef="hello1" targetRef="Event_0qpgd23" />
     <bpmn:serviceTask id="hello1" name="hello1">
       <bpmn:documentation>hello1 doc
 bbb</bpmn:documentation>
       <bpmn:incoming>Flow_1a63g0z</bpmn:incoming>
       <bpmn:outgoing>Flow_1rspxq4</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:sequenceFlow id="Flow_1khvymz" sourceRef="approve1" targetRef="hello2" />
-    <bpmn:userTask id="approve1" name="approve1" camunda:formKey="simpleapprove" camunda:assignee="kstan">
-      <bpmn:documentation>approve1 doc
-abc</bpmn:documentation>
-      <bpmn:incoming>Flow_1rspxq4</bpmn:incoming>
-      <bpmn:outgoing>Flow_1khvymz</bpmn:outgoing>
-    </bpmn:userTask>
-    <bpmn:sequenceFlow id="Flow_1oty8vq" sourceRef="hello2" targetRef="Event_0qpgd23" />
-    <bpmn:serviceTask id="hello2" name="hello2">
-      <bpmn:documentation>hello2 doc
-ccc</bpmn:documentation>
-      <bpmn:incoming>Flow_1khvymz</bpmn:incoming>
-      <bpmn:outgoing>Flow_1oty8vq</bpmn:outgoing>
-    </bpmn:serviceTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="process1">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="122" y="202" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0qpgd23_di" bpmnElement="Event_0qpgd23">
-        <dc:Bounds x="672" y="202" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1trhs2m_di" bpmnElement="hello1">
         <dc:Bounds x="200" y="180" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0l36sc9_di" bpmnElement="approve1">
-        <dc:Bounds x="370" y="180" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1mg3y6c_di" bpmnElement="hello2">
-        <dc:Bounds x="510" y="180" width="100" height="80" />
-        <bpmndi:BPMNLabel />
+      <bpmndi:BPMNShape id="Event_0qpgd23_di" bpmnElement="Event_0qpgd23">
+        <dc:Bounds x="402" y="202" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_1a63g0z_di" bpmnElement="Flow_1a63g0z">
         <di:waypoint x="158" y="220" />
@@ -57,15 +35,7 @@ ccc</bpmn:documentation>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1rspxq4_di" bpmnElement="Flow_1rspxq4">
         <di:waypoint x="300" y="220" />
-        <di:waypoint x="370" y="220" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1khvymz_di" bpmnElement="Flow_1khvymz">
-        <di:waypoint x="470" y="220" />
-        <di:waypoint x="510" y="220" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1oty8vq_di" bpmnElement="Flow_1oty8vq">
-        <di:waypoint x="610" y="220" />
-        <di:waypoint x="672" y="220" />
+        <di:waypoint x="402" y="220" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>