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

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

@@ -0,0 +1,13 @@
+<template>
+  <span v-if="modelValue">{{ toUTCTime(modelValue) }}</span>
+  <span v-else>-</span>
+</template>
+<script lang="ts" setup>
+/**
+ * This file was automatically generated by simpleapp generator during initialization.
+ * DONT CHANGE THIS FILE CAUSE IT OVERRIDE
+ * last change 2024-04-14
+ * author: Ks Tan
+ */
+const modelValue = defineModel<Date | string>();
+</script>

package/templates/nuxt/components/simpleApp/SimpleAppInput.vue.eta

@@ -95,7 +95,7 @@
       :readonly="isReadonly"
       :placeholder="placeholder"
       :date-format="getDateFormat()"
-      showTime 
+      showTime
       hourFormat="12"
       v-bind="componentProps as CalendarProps"
     />
@@ -229,17 +229,19 @@
     <InputNumber
       v-else-if="inputType == SimpleAppInputType.number"
       :type="type"
-      v-model="modelValue as number"
+      v-model="modelValue"
       @focus="setFocus"
       :readonly="isReadonly"
       :pt="pt"
       :class="!pt ? 'w-full flex flex-col' : ''"
       :inputId="slotprops.uuid"
       @update:modelValue="onChange"
+      
       :path="setting.instancepath"
       v-bind="componentProps as InputNumber"
       :placeholder="placeholder"
     />
+    <!-- // // -->
     <InputNumber
       v-else-if="inputType == SimpleAppInputType.money"
       :type="type"
@@ -252,7 +254,7 @@
       :class="!pt ? 'w-full flex flex-col' : ''"
       :inputId="slotprops.uuid"
       :path="setting.instancepath"
-      @change="onChange"
+      @update:modelValue="onChange"
       v-bind="componentProps as InputNumber"
       :placeholder="placeholder"
     />
@@ -359,7 +361,7 @@ if (props.inputType == SimpleAppInputType.date && modelValue.value) {
   datevalue.value = undefined;
 }
 if (props.inputType == SimpleAppInputType.datetime && modelValue.value) {
-  datetimevalue.value = stringToDate(<string>modelValue.value); 
+  datetimevalue.value = stringToDate(<string>modelValue.value);
 } else {
   datetimevalue.value = undefined;
 }
@@ -427,14 +429,14 @@ const updateDate = (value: any) => {
   }
   onChange();
 };
-const updateDateTime = (value:any)=>{
+const updateDateTime = (value: any) => {
   if (value) {
     modelValue.value = dateToISOString(value);
   } else {
     modelValue.value = "";
   }
   onChange();
-}
+};
 
 const setFocus = (ev: any) => {
   if (!isMobile()) ev.target.select();
@@ -476,15 +478,13 @@ watch(modelValue, (newvalue: any) => {
     } else {
       timevalue.value = undefined;
     }
-  
   } else if (props.inputType == SimpleAppInputType.datetime) {
     if (modelValue.value) {
       datetimevalue.value = stringToDate(modelValue.value as string);
     } else {
       timevalue.value = undefined;
     }
-  }
-   else if (props.inputType == SimpleAppInputType.time) {
+  } else if (props.inputType == SimpleAppInputType.time) {
     if (modelValue.value) {
       timevalue.value = stringToDate(
         (today() + "T" + modelValue.value) as string,
@@ -505,7 +505,7 @@ onMounted(() => {
     } else {
       datevalue.value = undefined;
     }
-  } else  if (props.inputType == SimpleAppInputType.datetime) {
+  } else if (props.inputType == SimpleAppInputType.datetime) {
     if (modelValue.value) {
       datetimevalue.value = stringToDate(modelValue.value as string);
     } else {
@@ -523,6 +523,7 @@ onMounted(() => {
 });
 
 const onChange = () => {
+  console.log("On change ", props.inputType)
   pt.value = undefined;
   resetcount.value++;
   emits("change", modelValue.value);

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

@@ -1,9 +1,11 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-03-08
+ * last change 2024-04-13
  * Author: Ks Tan
  */
+import { DurationType } from "~/types"
+
 export const setDateLocale = (localename:string) =>  useDayjs().locale(localename)
 export const dateExists = (date:Date,listDate:Date[]) => {
     const existsrecord = listDate.find(item=>{
@@ -18,11 +20,16 @@ export const dateToString = (date:Date) => useDayjs()(date).format('YYYY-MM-DD')
 export const dateToISOString = (date:Date) => useDayjs()(date).toISOString()
 export const dateToTimeString = (date:Date) => useDayjs()(date).format('HH:mm:ss')
 export const stringToDate = (datestr:string) => new Date(datestr)
-export const dateToDateTimeString = (date:Date)=> useDayjs()(date).format('YYYY-MM-DD HH:mm:ss')
-export const toLocalDate = (date:string | Date)=> useDayjs()(date).format(getDateFormat())
+export const dateToDateTimeString = (date:Date)=> useDayjs().utc(date).format('YYYY-MM-DD HH:mm:ss')
+export const toUTCDate = (date:string | Date)=> useDayjs().utc(date).format(getDateFormat())
+export const toUTCDateTime = (date:string | Date)=> useDayjs().utc(date).format(getDateTimeFormat())
+export const toUTCTime = (date:string | Date)=> useDayjs().utc(date).format('HH:mm')
 export const getDateFormat = ():string=> 'DD-MM-YYYY'
+export const getDateTimeFormat = ():string=> 'DD-MM-YYYY HH:mm'
 export const calculateHourDifferent = (date1:Date, date2:Date) => (date1.getTime() - date2.getTime())/60/60/1000
 export const getPrimevueCalendarDateFormat = () => {
   const country = <string>getUserProfile()?.country
   return 'dd/mm/yy'
 }
+export const getDayNameInWeek = (date:Date|string) => useDayjs()(date).format('ddd').toLowerCase();
+export const addTime = (date:Date|string,duration:number,unit:DurationType) => getDayJs()(date).add(duration, 'hour').toDate()

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

@@ -5,13 +5,13 @@
  * Author: Ks Tan
  */
 import {getAllDocuments} from '~/simpleapp/generate/commons/documents'
-import { FormCrudEvent } from '~/types'
-export const getDocument = (docname:string) =>{
+import { FormCrudEvent,SimpleAppDocumentType } from '~/types'
+export const getDocument = (docname:SimpleAppDocumentType) =>{
         return getAllDocuments().find((item)=>item.docName==docname)   //?.docClass
 }
 
 // (appuser: UserContext, filter: any) => Promise<void>;
-export const onScreenAddDocument = <T>(docname:string,paras?:T,after?:(eventType:FormCrudEvent, data:T)=>Promise<void>)=>{
+export const onScreenAddDocument = <T>(docname:SimpleAppDocumentType,paras?:T,after?:(eventType:FormCrudEvent, data:T)=>Promise<void>)=>{
         useNuxtApp().$event('ViewRecord',{
             documentName: docname,
             eventId:randomUUID(),
@@ -27,7 +27,7 @@ export const onScreenAddDocument = <T>(docname:string,paras?:T,after?:(eventType
         
           })
     }
-    export const onScreenEditDocument = <T>(docname:string,_id:string,after?:(eventType:FormCrudEvent, data:T)=>Promise<void>)=>{
+    export const onScreenEditDocument = <T>(docname:SimpleAppDocumentType,_id:string,after?:(eventType:FormCrudEvent, data:T)=>Promise<void>)=>{
         useNuxtApp().$event('ViewRecord',{
             documentName: docname,
             eventId:randomUUID(),

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/holdscreen.generate.ts.eta

@@ -0,0 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-03-13
+ * Author: Ks Tan
+ */
+
+export const holdScreenStart=()=> useNuxtApp().$event('HoldScreen',true)
+export const holdScreenEnd=()=> useNuxtApp().$event('HoldScreen',false)

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

@@ -2,7 +2,7 @@
     <div class="h-screen flex flex-col">
         
         <div class="flex flex-col grow overflow-y-auto">
-            <div class="flex flex-row mb-36 w-full">
+            <div class="flex flex-col mb-14 w-full">
             <slot></slot>                          
             </div>
                         
@@ -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)=>{
@@ -76,7 +77,7 @@ export class SimpleAppClient<
     });
   }
 
-  async create() {
+  async create() {    
     const errors = this.validateFailed();
     const {$event} =useNuxtApp()
     if (errors) {
@@ -85,10 +86,11 @@ export class SimpleAppClient<
         summary:'Record create failed',
         status:NotificationStatus.error,
         data:errors
-      })
+      })      
       // this.event('error:create',errors)
       return await Promise.reject(errors);
     } else {
+      holdScreenStart()
       return await this.docapi
         .runCreate(this.data.value,this.axios)
         .then((res: AxiosResponse) => {
@@ -99,7 +101,9 @@ export class SimpleAppClient<
           //   summary:'Record create successfully',
           //   status:NotificationStatus.success
           // })
+          this.data.value = {} as TData
           this.data.value = { ...res.data };
+          holdScreenEnd()
           return res.data;
         }).catch((errors:any)=>{             
             $event('Notification',{
@@ -109,6 +113,7 @@ export class SimpleAppClient<
               data:errors.response.data
             })
             console.error('error:create',errors.response.data)
+            holdScreenEnd()
           return Promise.reject(errors)
         });
     }
@@ -129,6 +134,7 @@ export class SimpleAppClient<
       console.error('update errors',errors)
       return await Promise.reject(errors);
     } else {
+      holdScreenStart()
       return await this.docapi
         .runUpdate(recordid, this.data.value,this.axios)
         .then((res: AxiosResponse) => {
@@ -139,7 +145,8 @@ export class SimpleAppClient<
           //   status:NotificationStatus.success,
           //   data:errors
           // })        
-          this.data.value = res.data          
+          this.data.value = res.data     
+          holdScreenEnd()     
           return res.data;
         }).catch((errors:any)=>{
           $event('Notification',{
@@ -152,6 +159,7 @@ export class SimpleAppClient<
           // if(this.event){
           // this.event('error:update',errors.response.data.data)}
           console.error('error:update',errors.response.data)
+          holdScreenEnd()
           return Promise.reject(errors)
         });
     }
@@ -160,6 +168,7 @@ export class SimpleAppClient<
   async patch() {
     const {$event} =useNuxtApp()
     const recordid: string = this.data.value._id ?? '';
+    holdScreenStart()
       return await this.docapi
         .runPatch(recordid, this.data.value,this.axios)
         .then((res: AxiosResponse) => {
@@ -171,6 +180,7 @@ export class SimpleAppClient<
           //   data:errors
           // })        
           this.data.value = res.data          
+          holdScreenEnd()
           return res.data;
         }).catch((errors:any)=>{
           $event('Notification',{
@@ -183,6 +193,7 @@ export class SimpleAppClient<
           // if(this.event){
           // this.event('error:update',errors.response.data.data)}
           console.error('error:patch',errors.response.data)
+          holdScreenEnd()
           return Promise.reject(errors)
         
     })
@@ -192,6 +203,7 @@ export class SimpleAppClient<
       id = this.data.value._id ?? ''
     }
     const {$event} =useNuxtApp()
+    holdScreenStart()
     return await this.docapi.runDelete(id,this.axios)
       .then((res:AxiosResponse)=>{
         // if(this.event){this.event('success:delete',res.data)}
@@ -201,6 +213,7 @@ export class SimpleAppClient<
         //   status:NotificationStatus.success,
         //   data:res.data
         // })
+        holdScreenEnd()
         return Promise.resolve(res.data)
       }).catch((errors:any)=>{
         // if(this.event){this.event('error:delete',errors.response.data.data)}
@@ -211,6 +224,7 @@ export class SimpleAppClient<
           data:errors.response.data
         })
         console.error(errors.response.data)
+        holdScreenEnd()
         return Promise.reject(errors)
       });
   }

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

@@ -4,13 +4,18 @@
  * last change 2024-02-23
  * Author: Ks Tan
  */
-import { ForeignKey } from "./others"
-export type OffDay={
+  import { ForeignKey } from "./others"
+  export type OffDay={
     _id:string
     date:Date
     title:string
   }
-  
+  export type DurationType  = keyof  {
+    'hour':'hour',
+    'month':'month',
+    'day':'day',
+    'minute':'minute'
+  }  
   export type CalRightClickEvent = {
       class: string //"vuecal__cell--day5"
       content: number //16

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

@@ -3,4 +3,16 @@
  * MODIFICATION OVERRIDE BY GENERATEOR
  * last change 2024-02-23
  * Author: Ks Tan
- */
+ */
+
+
+export type SimpleAppDocuments = {
+   <%for(let i=0; i<it.modules.length;i++){ %>
+      <% const d = it.modules[i] %>            
+      <%= d['docname'].toLowerCase() %>:any,
+    <%}%>
+}
+
+export type SimpleAppDocumentType = keyof SimpleAppDocuments
+
+

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 ={
@@ -36,4 +37,5 @@ export type EventType ={
     'SessionExpire': string
     'CloseDialog': string
     'pickGroup':string
+    'HoldScreen':boolean
 }

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

@@ -1,13 +1,11 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
+ * last change 2024-04-14
  * Author: Ks Tan
  */
 import {SimpleAppClient} from '~/simpleapp/generate/clients/SimpleAppClient'
-import {CellSetting} from './documentlist'
-import { Component } from 'vue'
-
+import { SimpleAppDocumentType } from './documentlist';
   export type ForeignKey = {
     _id: string;
     label: string;
@@ -44,7 +42,7 @@ import { Component } from 'vue'
   
   
   export type RendererSetting ={
-    documentName:string,
+    documentName:SimpleAppDocumentType,
     [key:string]:any
   }
   export type SearchBody = {

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>