@simitgroup/simpleapp-generator 1.0.63 → 1.1.0

package/templates/nuxt/components/{DebugDocumentData.vue.eta → debug/DebugDocumentData.vue.eta}

@@ -8,6 +8,7 @@
 // import Panel from 'primevue/panel';
 // import ScrollPanel from 'primevue/scrollpanel';
 import Dialog from 'primevue/dialog';
+import Sidebar from 'primevue/sidebar';
 
 import {ref} from 'vue'
 const modelValue = defineModel()
@@ -15,13 +16,16 @@ const isdebug = ref(useRuntimeConfig().public.DEBUGDATA)
 const visible = ref(false)
 const props = defineProps<{label?:string}>()
 const label = ref(props.label??'Debug')
+const op = ref();
+
 </script>
 <template>
     <div class="floatright" v-if="isdebug=='1'">
-        <Button @click="visible=true">{{ label }}</Button>
-        <Dialog v-model:visible="visible" modal header="Debug data" :style="{ width: '80vw' }">
-            <pre>{{ modelValue }}</pre>
-        </Dialog>                
+        <Button @click="visible=true" >{{ label }}</Button>      
+        <Sidebar v-model:visible="visible">
+            <pre class="pb-2">{{ modelValue }}</pre>
+        </Sidebar>
+
     </div>
         
 </template>

package/templates/nuxt/components/{EventNotification.vue.eta → event/EventNotification.vue.eta}

@@ -17,10 +17,10 @@ const toast = useToast();
 const { $event,$listen } = useNuxtApp()
 // WildcardHandler<Record<EventType, unknown>>
 let resmsg:ToastMessageOptions = {} as ToastMessageOptions
-
+const eventdata=ref()
 $listen("Notification",(data:Notification)=>{
     // $listen('*',(type:key of EventType,data:any)=>{ 
-    console.log("Event type",'data',data)
+        eventdata.value= data
     const type:NotificationStatus = data.status
     // let arrupdate = type.split(':')
     // let eventdata = data
@@ -35,10 +35,10 @@ $listen("Notification",(data:Notification)=>{
         case NotificationStatus.success:
             duration = 3000
         break;
-        case NotificationStatus.danger:
+        case NotificationStatus.error:
             duration = 0
         break;
-        case NotificationStatus.warning:
+        case NotificationStatus.warn:
             duration = 5000
         break;
         case NotificationStatus.info:
@@ -95,6 +95,7 @@ const getFieldName = (path:string)=>{
 <template>
     <Toast group="default" :pt="{}">
         <template #message="p">
+            
             <div class="bg-gray-200 dark:bg-gray-900 h-full w-full border">                
                 <div class=" flex content content-end w-full">
                     <div role="alert" class="w-full bg-white dark:bg-gray-800 shadow-lg rounded flex flex-row  transition duration-150 ease-in-out" id="notification">
@@ -104,17 +105,20 @@ const getFieldName = (path:string)=>{
                             </svg>
                         </div>
                         <div class="flex flex-col justify-center  pl-4 xl:pl-1 w-96 pt-4 sm:pb-4 pb-2">
-                            <p class="text-lg text-gray-800 dark:text-gray-100 font-semibold pb-1">{{ p.message.summary }}</p>
-                            
+                            <p class="text-lg text-gray-800 dark:text-gray-100 font-semibold pb-1">{{ p.message.summary }}</p>              
                             <div v-if="p.message.detail">                            
-                                <p v-if="Array.isArray(p.message.detail)" 
-                                    v-for="item in p.message.detail"
+                                <p v-if="Array.isArray(p.message.detail)"  v-for="item in p.message.detail"
                                     class="text-sm text-gray-600 dark:text-gray-400 font-normal">
                                     <span v-if="item.instancePath">{{ item.instancePath }}&nbsp;</span>
                                     <span v-if="item.message"> {{ item.message }}&nbsp;</span>
                                     
                                 </p>
-                                <p v-else-if="typeof p.message.detail == 'string'" class="text-sm text-gray-600 dark:text-gray-400 font-normal">{{ p.message.detail }}</p>
+                                <p v-else-if="typeof p.message.detail == 'string'" class="text-sm text-gray-600 dark:text-gray-400 font-normal">
+                                    {{ p.message.detail }}
+                                </p>
+                                <p v-else-if="typeof p.message.detail == 'object'" class="text-sm text-gray-600 dark:text-gray-400 font-normal">
+                                    {{ p.message.detail.message }}
+                                </p>
                                 <p v-else></p>
                             </div>
                         </div>

package/templates/nuxt/components/{HeaderBar.vue.eta → header/HeaderBar.vue.eta}

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import ButtonMenuPicker from "./ButtonMenuPicker.vue"
+//import ButtonMenuPicker from "./ButtonMenuPicker.vue"
 
-import ButtonProfile from './ButtonProfile.vue';
+//import ButtonProfile from './ButtonProfile.vue';
 
 
 </script>
@@ -13,22 +13,22 @@ import ButtonProfile from './ButtonProfile.vue';
         
         <div class="flex-1 flex flex-row gap-2 p-2">
             <div class="">
-                <ButtonMenuPicker/>
+                <HeaderButtonMenuPicker/>
                 
             </div>            
             <div class="">
-                <ButtonHome/>                
+                <HeaderButtonHome/>                
             </div>
             
         </div>
         <div class="flex-1 flex flex-row-reverse  gap-2 p-2">
 
             <div class=" text-right">
-                <ButtonProfile/>                                
+                <HeaderButtonProfile/>                                
             </div>
          
             <div class="">
-                <SelectBranch/>              
+                <HeaderSelectBranch/>              
             </div>        
         </div>
 

package/templates/nuxt/components/{SelectBranch.vue.eta → header/HeaderSelectBranch.vue.eta}

@@ -4,7 +4,7 @@ import {ref} from 'vue'
 
 const selectedbranch = ref(getCurrentXorg())
 const currentTenant=ref(getUserProfile().tenantId)
-console.log("currentTenant",currentTenant.value)
+
 type Org = {orgId:number, label:string,_id:string}
 const branches = getUserProfile().branches.filter((item:any)=>{return item.branch.tenantId == currentTenant.value})
 const orgList:Org[] = _.uniqBy(branches,'branch.orgId').map((item)=>({
@@ -24,7 +24,7 @@ const switchXorg = ()=>{
     navigateTo(`/${selectedbranch.value}`,{external:true})    
 }
 
-console.log("selectedbranch",selectedbranch.value)
+
 </script>
 <template>
     <div>        

package/templates/nuxt/components/{ButtonMenuPicker.vue.eta → header/button/HeaderButtonMenuPicker.vue.eta}

@@ -20,10 +20,10 @@ const selectMenu = (menu:MenuData) =>{
       </svg>
     </button>
 
-     <Dialog v-model:visible="visible" modal header="Pick Document" >
+     <Dialog v-model:visible="visible" modal header="Pick Document" :pt="{dialog:{ class:' bg-primary-800 ' }}">
       <div class="">
-          <Button v-for="menu in menus" @click="selectMenu(menu)">
-            <div v-if="menu.isolationType == 'none'" class="">
+          <Button v-for="menu in menus" @click="selectMenu(menu)" >
+            <div v-if="menu.isolationType == 'none'" class="text-warning-600 hover:text-warning-500">
               * {{ camelCaseToWords(menu.label) }}
             </div>
             <div v-else class="">{{ camelCaseToWords(menu.label) }}</div>

package/templates/nuxt/components/list/ListView.vue.eta

@@ -0,0 +1,64 @@
+<template>
+    <div>
+        <div v-if="withFilter">
+            <input 
+                autofocus
+                placeholder="search" 
+                v-model="searchvalue"                    
+                class="w-full border  p-2" 
+                type="search" />
+        </div>
+        <div class="max-h-screen overflow-auto">
+            <ul >            
+                <li v-for="item in filterlist">                    
+                    <div  :class="getSelectedCSS(item)">
+                        <NuxtLink :to="`${url}/${item[idField]}`">
+                            <div class="mr-2">{{item[titleField]  }}</div>
+                            <div class="font font-bold text-right">{{item[subTitleField]}}</div>
+                        </NuxtLink>
+                    </div>
+                
+                </li>
+            </ul>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import {ref} from 'vue'
+import {ListItem} from '~/types/listview'
+const props = withDefaults(defineProps<{
+    list:any[],
+    url:string,
+    titleField:string
+    idField?:string
+    subTitleField:string
+    withFilter?:boolean
+}>(),{
+    idField:'_id'
+})
+const emit = defineEmits(['clickitem'])
+const searchvalue = ref('')
+const selecteditem =ref('')
+const clickRow=(item:ListItem)=>{
+    // emit('clickitem',item)
+    // selecteditem.value = item.code
+}
+const filterlist =  computed(()=>{    
+    const newlist =props.list.filter((item:any)=>
+    {
+     return   String(item[props.titleField]).toLowerCase().includes(searchvalue.value.toLowerCase()) ||
+            String(item[props.subTitleField]).toLowerCase().includes(searchvalue.value.toLowerCase())
+    }) 
+
+    return newlist
+})
+const getSelectedCSS= (item:ListItem)=>{
+    if(selecteditem.value == item.code){
+        return "p-2 border bg-sky-200"
+    }else{
+        return "p-2 border hover-list-primary"
+    }
+
+}
+
+</script>

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

@@ -0,0 +1,11 @@
+<template>    
+    <NuxtLink  v-if="setting?.collection" :to="getDocumentUrl(setting.collection,modelValue ? modelValue['_id']:'')" class="text-primary-700 hover:text-primary-500 cursor-pointer">        
+        {{modelValue?.label}}
+    </NuxtLink>
+    <span v-else>{{modelValue?.label || modelValue}}</span>
+</template>
+<script setup lang="ts">
+const modelValue = defineModel()
+
+const props = defineProps<{setting:any}>()
+</script>

package/templates/nuxt/components/renderer/index.ts.eta

@@ -0,0 +1,12 @@
+import RendererBoolean from './RendererBoolean.vue'
+import RendererDate from './RendererDate.vue'
+import RendererForeignKey from './RendererForeignKey.vue'
+import RendererMoney from './RendererMoney.vue'
+import RendererMultiText from './RendererMultiText.vue'
+
+
+export default {
+    
+      RendererBoolean,RendererDate,RendererForeignKey,RendererMoney,RendererMultiText
+    
+  };

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

@@ -0,0 +1,77 @@
+
+<template>
+    
+        <div class="p-inputgroup w-full flex flex-row">
+            <InputText class="flex-1 rounded-tr-none rounded-br-none" 
+                :readonly="readonly"
+                v-model="modelValue"    
+                :placeholder="placeholder"
+            />
+            <span class="p-inputgroup-addon p p-0">
+                <button  type="button" @click="toggle" 
+                    :disabled="readonly"
+                    class="border rounded-tl-none rounded-bl-none btn btn-primary -ml-1 h-full  p-3 rounded-r-md">
+                    <i class="pi pi-angle-down"></i>
+                </button>
+                <OverlayPanel ref="op" class="p-4">           
+                    <div class="m-4">
+                        <ul>                      
+                            <li v-for="docno in docFormatlist" class="hover-list-primary p-2" >
+                                <a class="flex-row p-2 mt-4" @click="chooseFormat(docno)">
+                                    <span class="pi pi-hashtag mr-2"></span>
+                                    <span class="">{{docno.docNoFormatName}}</span>
+                                    <span class="ml-2 text text-green-600">{{docno.sample}}</span>
+                                </a>
+                            </li>                    
+                        </ul>
+                    </div>         
+                </OverlayPanel>
+            </span>
+            <!-- {{ Object.getOwnPropertyNames(setting) }} -->
+        </div>
+    
+</template>
+<script lang="ts" setup>
+import {ForeignKey} from '~/types'
+import OverlayPanel from 'primevue/overlaypanel';
+import InputText from 'primevue/inputtext';
+import {DocNoFormat} from "~/types"
+const props = defineProps<{
+    setting:any    
+    readonly?:boolean
+}>()
+const op = ref();
+const placeholder = ref('')
+const docFormatlist = ref()
+const modelValue = defineModel<string>()
+const docNoFormat = props.setting.document.getReactiveData().value.docNoFormat
+const emits = defineEmits(['update:docNoFormat'])
+
+const documenttype = props.setting.document.doctype
+
+const toggle = async (event:any) => {
+    op.value.toggle(event);            
+}
+
+const chooseFormat =  (item:any) =>{
+    placeholder.value = item.sample    
+    const f = item
+    docNoFormat.value = { _id : f._id, label : f.docNoFormatName}
+    op.value.toggle();
+    emits('update:docNoFormat',item)
+}
+
+const loadDocFormats = async () =>{
+    docFormatlist.value= await getDocFormats(documenttype)    
+    if(docFormatlist.value.length>0){
+        const f = docFormatlist.value[0]
+        docNoFormat.value = { _id : f._id, label : f.docNoFormatName}
+        placeholder.value = docFormatlist.value[0].sample        
+    }
+}
+
+onMounted(()=>{
+    loadDocFormats()
+
+})
+</script>

package/templates/nuxt/components/{SimpleFieldContainer.vue.eta → simpleApp/SimpleAppFieldContainer.vue.eta}

@@ -1,26 +1,27 @@
 <template>
     <div v-if="schema" :class="fieldcontainerclass">          
         <div v-if="hidelabel"></div>
-        <label v-else-if="error" class="error-text" :for="uuid">{{ fieldlabel }} <span v-if="props.setting.isrequired && fieldlabel" class="input-error">*</span></label>        
-        <label v-else  :for="uuid">{{ fieldlabel }} <span v-if="props.setting.isrequired && fieldlabel" class="input-error">*</span></label>        
+        <label v-else-if="error" class="text-danger-600" :for="uuid">{{ fieldlabel }} <span v-if="props.setting.isrequired && fieldlabel" class="text-danger-600">*</span></label>        
+        <label v-else  :for="uuid">{{ fieldlabel }} <span v-if="props.setting.isrequired && fieldlabel" class="text-danger-600">*</span></label>        
         
-        
-        <div v-if="typeof modelValue =='object' && typeof modelValue['_id']!='undefined' && typeof modelValue['label']!='undefined' &&  readonly ==true " :uuid="uuid" class="simpleapp-value-readonly">{{ modelValue['label'] }}</div>
-        <div v-else-if="readonly==true" :uuid="uuid" class="simpleapp-value-readonly">{{ modelValue }}</div>
-        <slot v-else name="default" :uuid="uuid" :error="error"></slot>
+        <!-- <div :uuid="uuid" >{{ modelValue }}</div> -->
+        <!-- <div v-if="typeof modelValue =='object' && typeof modelValue['_id']!='undefined' && typeof modelValue['label']!='undefined' &&  readonly ==true " :uuid="uuid" class="simpleapp-value-readonly">{{ modelValue['label'] }}</div> -->
+        <!-- <div v-else-if="readonly==true" :uuid="uuid" class="simpleapp-value-readonly">{{ modelValue }}</div> -->
+        <!-- <slot v-else name="default" :uuid="uuid" :error="error"></slot> -->
+        <slot name="default" :uuid="uuid" :error="error"></slot>
 
-        <small v-if="error" class="error-text">{{ error }}</small>
+        <small v-if="error" class="text-danger-600">{{ error }}</small>
         <small v-else class="input-desc">{{ fielddesc }}</small>
     </div>
     <div v-else :class="defaultcssclass">
-        <label class="error-text ">wrong path in getField()</label>
-        <div class="error-text">{{ props.setting.path }}</div>
+        <label class="etext-danger-600">wrong path in getField()</label>
+        <div class="text-danger-600">{{ props.setting.path }}</div>
     </div>
 </template>
 <script setup lang="ts">
 import SimpleAppValue from './SimpleAppValue.vue'
-import {camelCaseToWords} from './helper'
-import {computed,setBlockTracking,watch} from 'vue'
+// import {camelCaseToWords} from './helper'
+// import {computed,setBlockTracking,watch} from 'vue'
 
 import {ref} from 'vue'
 const uuid =  crypto.randomUUID();

package/templates/nuxt/components/{SimpleAppForm.vue.eta → simpleApp/SimpleAppForm.vue.eta}

@@ -5,10 +5,10 @@
     </form>
 </template>
 <script setup lang="ts" >
-import type {SimpleAppFieldSetting} from './type'    
-import { SimpleAppClient } from  '../simpleapp/generate/clients/SimpleAppClient'
+// import type {SimpleAppFieldSetting} from '/types'    
+import { SimpleAppClient } from  '~/simpleapp/generate/clients/SimpleAppClient'
 import type { JSONSchema7,JSONSchema7Definition } from 'json-schema';
-
+import _ from 'lodash'
     const props = defineProps<{
         title?:string,
         document: SimpleAppClient<any,any>
@@ -28,6 +28,7 @@ import type { JSONSchema7,JSONSchema7Definition } from 'json-schema';
         
         return {
             path: path,
+            key: _.last(path.split('/')),
             instancepath: getInstancePath(schema,path),
             fieldsetting: fieldsetting,
             modelObject: data,
@@ -37,7 +38,7 @@ import type { JSONSchema7,JSONSchema7Definition } from 'json-schema';
             isrequired: getIsRequired(schema,path),
             errors: props.document.getErrors(),
             readonly: props.readonly
-        } as SimpleAppFieldSetting
+        } //as SimpleAppFieldSetting
     }
 
     //    "schemaPath": "#/properties/email/format",