@simitgroup/simpleapp-generator 1.6.3-alpha → 1.6.4-b-alpha

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

@@ -11,7 +11,7 @@ export const getDocument = (docname:SimpleAppDocumentType) =>{
 }
 
 // (appuser: UserContext, filter: any) => Promise<void>;
-export const onScreenAddDocument = <T>(docname:SimpleAppDocumentType,paras?:T,after?:(eventType:FormCrudEvent, data:T)=>Promise<void>)=>{
+export const onScreenAddDocument = <T>(docname:SimpleAppDocumentType,paras?:T,after?:(eventType:FormCrudEvent, data:T,visible:Ref<boolean>)=>Promise<void>)=>{
         useNuxtApp().$event('ViewRecord',{
             documentName: docname,
             eventId:randomUUID(),
@@ -19,24 +19,26 @@ export const onScreenAddDocument = <T>(docname:SimpleAppDocumentType,paras?:T,af
             paras:paras,
             document: getDocument(docname)?.docClass,
             viewer: getDocument(docname)?.viewer,    
-            after: (eventType:FormCrudEvent, data: any) => {
+            after: (eventType:FormCrudEvent, data: any,visible:Ref<boolean>) => {
                 //do nothing
-                 if(after)after(eventType,data as T)
+                if(after)after(eventType,data as T,visible)
             },
             label:t(docname)
         
           })
     }
-    export const onScreenEditDocument = <T>(docname:SimpleAppDocumentType,_id:string,after?:(eventType:FormCrudEvent, data:T)=>Promise<void>)=>{
+    export const onScreenEditDocument = <T>(docname:SimpleAppDocumentType,_id:string,after?:(eventType:FormCrudEvent, data:T,visible:Ref<boolean>)=>Promise<void>,autoclose:number=1)=>{
+        
         useNuxtApp().$event('ViewRecord',{
             documentName: docname,
             eventId:randomUUID(),
             _id:_id,
+            autoclose:autoclose,
             document: getDocument(docname)?.docClass,
             viewer: getDocument(docname)?.viewer,    
-            after: async (eventType:FormCrudEvent, data: any) => {
+            after: async (eventType:FormCrudEvent, data: any,visible:Ref<boolean>) => {
                 //do nothing
-                 if(after)after(eventType,data as T)
+                 if(after)after(eventType,data as T,visible)
             },
             label:t(docname)        
           })

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

@@ -9,8 +9,11 @@ import * as o from "../simpleapp/generate/openapi";
 import axios from 'axios'
 
 
-const getAxiosConfig = () => {
-  const suffix = getCurrentXorg() ?  '/'+getCurrentXorg() : ''
+export const getAxiosConfig = () => {
+  const xorg = getCurrentXorg()
+  const xorgdecode = xorg!==undefined ? atob(<string>xorg) :''
+
+  const suffix = xorgdecode.includes('-') ?  '/'+getCurrentXorg() : ''
   const config: o.Configuration = {
     basePath: `${useRuntimeConfig().public.APP_URL}/api${suffix}`,
     isJsonMime: () => true,
@@ -18,10 +21,14 @@ const getAxiosConfig = () => {
   return config
 }
 
-
+//get apisession exclude from shared axios to separate handle session
 export const getApiSession = async ()=> {
-  const res = await (new o.PROFILEApi(getAxiosConfig(),undefined,useNuxtApp().$axios)).getSession()
-  return res
+  console.log("getApiSession from computable")
+  return getUserStore().pingSession()
+  //,useNuxtApp().$axios)
+  // const  profileapi = new o.PROFILEApi(getAxiosConfig(),undefined)
+  // const res = await profileapi.getSession()
+  // return res
 }
 
 export const getDocumentApi = (documentName: string): any => {
@@ -31,10 +38,51 @@ export const getDocumentApi = (documentName: string): any => {
 
   const config = getAxiosConfig()
   const docsOpenapi: any = {
-   <%for(let i=0; i<it.modules.length;i++){ %>
-    <% const d = it.modules[i] %>
-    '<%= d['docname'].toLowerCase() %>': new o.<%= d['doctype'].toUpperCase() %>Api(config),
-    <%}%>              
+           'tenant': new o.TENANTApi(config),
+            'organization': new o.ORGApi(config),
+            'branch': new o.BRANCHApi(config),
+            'permission': new o.PERMApi(config),
+            'autoincreament': new o.AUTOINCApi(config),
+            'docnoformat': new o.DOCNOApi(config),
+            'systemmessage': new o.SYSMSGApi(config),
+            'keyvaluepair': new o.KVPAIRApi(config),
+            'webhook': new o.WEBHOOKApi(config),
+            'academysession': new o.ACADEMYSESSIONApi(config),
+            'accounttransaction': new o.ACCTRANSApi(config),
+            'agent': new o.AGENTApi(config),
+            'area': new o.AREAApi(config),
+            'attendance': new o.ATTApi(config),
+            'category': new o.CATApi(config),
+            'creditnote': new o.CNApi(config),
+            'enrollment': new o.ENROLLApi(config),
+            'enrollmenttransaction': new o.ENROLLTRANSApi(config),
+            'holiday': new o.HOLIDAYApi(config),
+            'invoice': new o.INVApi(config),
+            'level': new o.LVLApi(config),
+            'parent': new o.PARENTApi(config),
+            'payment': new o.PAYApi(config),
+            'paymentmethod': new o.PAYMETHODApi(config),
+            'product': new o.PRDApi(config),
+            'productpackage': new o.PRDPKGApi(config),
+            'race': new o.RACEApi(config),
+            'refund': new o.REFUNDApi(config),
+            'refundtype': new o.REFUNDTYPEApi(config),
+            'religion': new o.RELIGIONApi(config),
+            'room': new o.ROOMApi(config),
+            'roomtype': new o.ROOMTYPEApi(config),
+            'schedule': new o.SCHEDULEApi(config),
+            'school': new o.SCHOOLApi(config),
+            'stopenrollment': new o.STOPENROLLApi(config),
+            'stopreason': new o.STOPREASONApi(config),
+            'student': new o.STUApi(config),
+            'studentgroup': new o.STUGROUPApi(config),
+            'studentsource': new o.STUDENTSRCApi(config),
+            'studentsummary': new o.STUSUMApi(config),
+            'teacher': new o.TEACHERApi(config),
+            'teachergroup': new o.TEACHERGROUPApi(config),
+            'tuitionclass': new o.TUITIONApi(config),
+            'user': new o.USERApi(config),
+                  
     };
 
   if (!docsOpenapi[documentName]) {
@@ -57,6 +105,6 @@ export const getWorkflowApi = () => {
   
 }
 
-export const getPorfileApi = () => {
+export const getProfileApi = () => {
   return new o.PROFILEApi(getAxiosConfig())
 }

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

@@ -1,3 +1,4 @@
+import { getUserProfile } from './getUserStore.generate';
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
@@ -15,12 +16,25 @@ export const reloadUserStore = async () =>{
     await $userstore.loadRemoteUserInfo()
 }
 export const getCurrency = () =>getUserStore()?.currency ?? '$$'
-export const getUserProfile =  () =>{    
-    const userstore = getUserStore()
-    
-    return !userstore ? undefined :userstore.getUserInfo()
-}
+export const getUserProfile = () => getUserStore()?.getUserInfo()
+
 
+export const isGuideComplete=(guidename: string):boolean=>{    
+    if(useNuxtApp().$userstore.moreProps.completedTours!==undefined){
+        return useNuxtApp().$userstore.moreProps.completedTours.includes(guidename)
+    }
+    else return false        
+}
+export const setGuideComplete= async(guidename:string)=>{
+    const userstore =useNuxtApp().$userstore
+    await getProfileApi().runTourComplete(guidename);
+    if(getUserProfile()!==undefined){
+        if(!Array.isArray(getUserProfile()?.moreProps.completedTours))
+            userstore.moreProps.completedTours=[guidename]
+        else
+            userstore.moreProps.completedTours.push(guidename)
+    }
+}
 export const getCurrentXorg = () =>{
     return  (useRoute().params.xorg) ? String(useRoute().params.xorg) : undefined            
 }
@@ -34,9 +48,15 @@ export const getPageBaseUrl = (resourcename:string) =>{
  * @return boolean
  */
 export const canPerform = (resource:string,action:string):boolean =>{
-    return getUserStore().canPerform(resource,action)
+
+    return getUserStore().canPerform(upperFirst(resource),action)
+}
+export const haveAccess = (resource:string):boolean =>{
+    return getUserStore().haveAccess(upperFirst(resource))
 }
 
+
+
 export const getProfileEmail = () => getUserProfile()?.email
 export const getProfileFullName = () => getUserProfile()?.fullName
 
@@ -46,3 +66,16 @@ export const refreshOrgLogo = async () => {
 }
 export const getOrgLogo = ()=> orgLogo
 export const setOrgLogo = (str:string) => orgLogo = str
+export const getCurrentBranch = ()=>{
+    const branchId= getUserStore().branchId
+    const branchinfo = getUserStore().branches.find(item=>item.branch.branchId==branchId)
+    return branchinfo
+}
+
+export const getMySimpleAppUserPicker=()=>{
+    return {
+        _id: getUserProfile()?._id,
+        uid:getUserProfile()?.uid,
+        fullName:getUserProfile()?.fullName
+    }
+}

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

@@ -18,6 +18,9 @@ export const getDocumentUrl = (document:string,id?:string,querystr?:string)=>{
     return path
 }
 
+export const getPathResource=()=>{
+    return useRoute().path.toString().replace('/'+getCurrentXorg(),'')
+}
 
 export const goTo = (document:string,id?:string,querystr?:string)=>{    
     navigateTo(getDocumentUrl(document,id,querystr))   
@@ -38,5 +41,15 @@ export const getPathPara = (paraname:string,emptyvalue:string=''):string=>{
     return emptyvalue
    }
 }
-
+export const getPathQuery = (paraname:string,emptyvalue:string|string[]=''):string|string[]=>{
+    const paravalue = useRoute().query[paraname]
+    if( paraname.includes('[')){
+        return (typeof paravalue == 'string'? [paravalue] : paravalue) as string[]
+    }else if(typeof paravalue == 'string'){
+        return paravalue.toString()
+    }
+    else{
+     return emptyvalue
+    }
+ }
 export const setCurrentUrl = (path:string)=>useRouter().push({path:path})

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

@@ -4,7 +4,7 @@
  * last change 2024-03-13
  * Author: Ks Tan
  */
-
+import {NotificationStatus} from "~/types"
 import { createHttpLink, } from '@apollo/client/core';
 
 export const setGraphqlServer=()=>{
@@ -23,4 +23,22 @@ export const setGraphqlServer=()=>{
 
   }
   
-export const graphquery=async<T>(qqlstr: typeof gql) =>(await useAsyncQuery<T>(qqlstr)).data
+// export const graphquery=async<T>(qqlstr: typeof gql) =>(await useAsyncQuery<T>(qqlstr))
+
+
+export const gqlQuery=async<T>(gqlstr:string):Promise<T|undefined>=>{
+    const query = gql(gqlstr);
+    try{
+        const result = await useAsyncQuery<T>(query);        
+        return result.data.value as T
+    }catch(e){      
+      useNuxtApp().$event('Notification',{
+        documentName:'report',
+        summary:t('reportQueryFailed'),
+        status:NotificationStatus.error,
+        data:e
+      })      
+      // return e
+    }
+
+}

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

@@ -0,0 +1,16 @@
+import {RecentlyValue} from "~/types"
+export const getRecently = ()=>useNuxtApp().$recently
+export const setRecentDocument = (key:string, value:RecentlyValue)=>{
+    const recent = getRecently()
+    recent.set(key,value)
+    const tmp:{[key:string]:RecentlyValue}={}
+    recent.forEach((value,key)=>{
+        tmp[key]=value
+    })
+    console.log("JSON.stringify(tmp)",tmp)
+    localStorage.setItem('recently', JSON.stringify(tmp)); // Store keys as an array
+
+}
+export const getRecentDocument = (key:string)=>{
+    getRecently().get(key)
+}

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

@@ -10,23 +10,19 @@ type roletype = {resource:string, action:string}
 type grouptype = {[key:string]:roletype[]}            
 
 const allroles:roletype[] = [
-<% for(let i=0;i<it.modules.length; i++){ %>
+    <% for(let i=0;i<it.modules.length; i++){ %>
         <% const m = it.modules[i] %>
+        <% const appconfig = m.schema["x-simpleapp-config"] %>                
+        {resource: '<%=m.docname%>', action:'access'},
         {resource: '<%=m.docname%>', action:'create'},
         {resource: '<%=m.docname%>', action:'update'},
         {resource: '<%=m.docname%>', action:'delete'},
-        {resource: '<%=m.docname%>', action:'search'},
-       
-
-        <% if(m.api && m.api.length >0) {%>
-
-            <% for(let j=0;j<m.api.length; j++){ %>
-                <%let api = m.api[j]%>
-        {resource: '<%=m.docname%>', action:'<%=api.action%>'},
-        
-        
-            <%}%>
-        <%}%>
+        {resource: '<%=m.docname%>', action:'search'},       
+        <% if(Array.isArray(appconfig?.allStatus) && appconfig.allStatus.length>0){%> 
+        <% for(let sindex=0;sindex<appconfig.allStatus.length;sindex++){%> 
+         {resource: '<%=m.docname%>', action:'<%=appconfig.allStatus[sindex].status%>'},       
+        <%}%> 
+        <%}%> 
     <%}%>
 ]
 

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

@@ -21,6 +21,58 @@ export const getAvatarLink = (email:string, size:number):string=>{
   return `https://gravatar.com/avatar/${md5(email)}?size=${size}`;
   //return `https://api.simbiz.cloud/cloudapi/avatar/${md5(email)}?size=${size}`  
 }
+export const getAvatarByUid = (id:string, size:number):string=>{
+  const url = `${useRuntimeConfig().public.APP_URL}/api/${getCurrentXorg()}`
+  return `${url}/images/student/${id}`;
+  
+}
 
+export const getDefaultLocale =()=> useNuxtApp().$i18n.defaultLocale
 export const t = (txt:string,options?:any):string => !txt || txt.trim()=='' ? '' : useNuxtApp().$i18n.t(txt,options)
 export const upperFirst = (str:string) => _.upperFirst(str)
+export const labelSorter = (a,b)=>{
+   const nameA = a.label.toUpperCase(); // ignore upper and lowercase
+   const nameB = b.label.toUpperCase(); // ignore upper and lowercase
+    if (nameA < nameB) {
+      return -1;
+    }
+    if (nameA > nameB) {
+      return 1;
+    }
+
+  // names must be equal
+  return 0;
+}
+
+export const valueSorter = (a,b)=>{
+  const vA = a.value
+  const vB = b.value
+   if (vA < vB) {
+     return -1;
+   }
+   if (vA > vB) {
+     return 1;
+   }
+
+ return 0;
+}
+export const valueSorterDesc = (a,b)=>{
+  const vA = a.value
+  const vB = b.value
+   if (vA < vB) {
+     return 1;
+   }
+   if (vA > vB) {
+     return -1;
+   }
+
+ return 0;
+}
+export const numberToMoneyString = (value:number)=>{
+  const options = {
+    style: "decimal", // Other options: 'currency', 'percent', etc.
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2,
+  };
+  return value.toLocaleString(useI18n().defaultLocale, options)
+}

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

@@ -11,7 +11,7 @@ export const systemMsgQty = computed(()=>messages.value.filter(item=>!item.read)
 export const sysMessage ={
     download: async ()=> {
         messages.value = await useNuxtApp().$SystemmessageDoc().search({})
-        console.log("Download messages",messages)
+        //console.log("Download messages",messages)
         return messages.value
     },
     getMessages: () => messages.value

package/templates/nuxt/error.vue._eta

@@ -1,5 +1,5 @@
 <template>
-  <div class="w w-full items-center justify-center py-12 bg bg-gray-500">
+  <div class="w w-full items-center justify-center py-12 bg bg-gray-500 flex flex-row">
             <div class="bg-white dark:bg-gray-600 p-1 border rounded-md flex items-center justify-center mx-4 w-7/8 md:w-2/3">
                 <div class="flex flex-col items-center py-16">
                     
@@ -11,7 +11,9 @@
                         <h1 class="px-4 pt-2 pb-4 text-left text-5xl font-bold leading-10 text-gray-800">OOPS!</h1>                    
                         <p class="px-4 mt mb-4 text-4xl text-left font font-bold">{{isNaN(error?.statusCode) ? t('server'): error?.statusCode}} Error</p>                    
                         <p class="px-4 pb-10 text-base leading-none text-left text-red-400">{{t(error?.statusMessage)}}</p>  
-                        <p>    <Button @click="handleError" class="btn-primary">{{ t('backToHome') }}</Button></p>                  
+                        <p>    
+                          <ButtonPrimary @click="handleError" class="bg-secondary-600 text-white p-2 rounded">{{ t('backToHome') }}</ButtonPrimary>
+                        </p>                  
                       </div>
                     </div>
                     

package/templates/nuxt/pages/[xorg]/{organization.vue.eta → organization.vue._eta}

@@ -1,7 +1,7 @@
 <template>
   <div class="w-full flex-col flex">
     <title>{{ t("organization") }}</title>
-    <MobileToolbar class="bg-gray-600">
+    <MobileToolbar class="bg-gray-600" v-if="isMobile()">
       <template #center
         ><TextTitle class="text-white">{{
           t("organization")
@@ -18,14 +18,22 @@
       <div class="">
         <!--  -->
         <!-- <div class="border w-12 h-12 md:w-24 md:h24"> -->
-        <ImageOrganization :changable="!doc.isReadOnly()"></ImageOrganization>
+        <ImageOrganization></ImageOrganization>
         <!-- </div> -->
       </div>
       <div class="flex flex-col flex-1">
-        <TextTitle>{{ data.orgName }} / {{ data.orgCode }}</TextTitle>
+        <TextTitle>
+           {{ data.orgName }} / {{ data.orgCode }}
+           
+         </TextTitle>
         <TextSubtitle>
           {{ data.description }}
         </TextSubtitle>
+        <div>
+          <ButtonDefault @click="showEditOrg = true" class="text-sm">
+                <i class="pi pi-pencil mr-1"/> <span>{{t('edit')}}</span>
+          </ButtonDefault>
+        </div>
       </div>
     </div>
 
@@ -41,7 +49,7 @@
       <ListView
         class="border rounded-lg border-gray-400 dark:border-gray-600"
         :list="branchlist"
-        title-field="branchName"
+        title-field="branchName"        
         sub-title-field="branchCode"
         :url="getDocumentUrl('organization', id)"
         #default="{ item }"
@@ -49,7 +57,9 @@
         <div class="flex flex-row">
           <div class="flex-col flex flex-1">
             <TextPrimary>{{ item.branchName }}</TextPrimary>
-            <TextSubtitle>{{ item.description }}</TextSubtitle>
+            <TextSubsubtitle>{{ item.street1 }}</TextSubsubtitle>
+            <TextSubsubtitle>{{ item.street2 }}</TextSubsubtitle>
+            <TextSubsubtitle>{{ item.description }}</TextSubsubtitle>
           </div>
           <div class="flex-col flex text-right">
             <div>{{ item.branchCode }}</div>
@@ -59,16 +69,31 @@
       </ListView>
     </div>
 
-    <OverlaySideBarCrud v-model="showEditOrg" close-event-name="organization">
+    <OverlayPanelWithToolBar v-model="showEditOrg" close-event-name="organization">
+      <template #headerLeft>
+        <ButtonText @click="showEditOrg = false">
+          <i class="pi pi-times"></i>
+        </ButtonText>
+      </template>
+      <template #headerCenter>{{data.orgName}}</template>
+      <template #headerRight></template>
       <FormOrganization
         :_id="getUserProfile()?.orgRecordId"
         @after="afterOrganization"
       ></FormOrganization>
-    </OverlaySideBarCrud>
+    </OverlayPanelWithToolBar>
+
+    <OverlayPanelWithToolBar v-model="showEditBranch" close-event-name="branch">
+      <template #headerLeft>
+        <ButtonText @click="closeBranch">
+          <i class="pi pi-times"></i>
+        </ButtonText>
+      </template>
+      <template #headerCenter>{{t('branch')}}</template>
+      <template #headerRight></template>
 
-    <OverlaySideBarCrud v-model="showEditBranch" close-event-name="branch">
       <NuxtPage :_id="id"></NuxtPage>
-    </OverlaySideBarCrud>
+    </OverlayPanelWithToolBar>
   </div>
 </template>
 
@@ -124,6 +149,10 @@ $listen("RefreshDocumentList", async (data) => {
   }
 });
 
+const closeBranch = ()=>{
+  showEditBranch.value=false
+  goTo('organization')
+}
 const showBranchDialogIfRequired = () => {
   if (useRoute().path.includes("/new") || id.value) showEditBranch.value = true;
 };

package/templates/nuxt/pages/[xorg]/user.vue.eta

@@ -1,15 +1,15 @@
 <template>
   <div class="w-full flex flex-col p-3">
+    <div>
+      <TextTitle>{{ t("user") }}</TextTitle>
+    </div>
+    <div class="flex flex-row w-full">
+      <title>{{ t("user") }}</title>
 
-  
-    <div><TextTitle>{{ t('user') }}</TextTitle></div>
-    <div class="flex flex-row w-full ">
-      <title>{{ t("user") }}</title>    
-      
       <div class="w-full md:w-1/2 xl:w-1/3">
         <TabView>
           <TabPanel header="Active">
-            <ul role="list" class="divide-y divide-gray-100">
+            <ul role="list" class="divide-y divide-gray-100 listview-item">
               <li v-for="item in userlist" :key="item.email">
                 <NuxtLink
                   v-if="item.uid && item.active"
@@ -21,7 +21,7 @@
             </ul>
           </TabPanel>
           <TabPanel header="Inactive">
-            <ul role="list" class="divide-y divide-gray-100">
+            <ul role="list" class="divide-y divide-gray-100 listview-item">
               <li v-for="item in userlist" :key="item.email">
                 <NuxtLink
                   v-if="item.uid && !item.active"
@@ -54,9 +54,12 @@
                 </div>
               </form>
             </div>
-            <ul role="list" class="divide-y divide-gray-100">
+            <ul role="list" class="divide-y divide-gray-100 listview-item">
               <li v-for="item in userlist" :key="item.email">
-                <NuxtLink v-if="!item.uid" :to="getDocumentUrl('user', item._id)">
+                <NuxtLink
+                  v-if="!item.uid"
+                  :to="getDocumentUrl('user', item._id)"
+                >
                   <UserProfileListItem :data="item"></UserProfileListItem>
                 </NuxtLink>
               </li>

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

@@ -1,6 +1,9 @@
 <template>
   <div class="p-10 m-10 text-3xl border text-center dark:text-white">
-    {{ t('redirectToLoginPage') }}
+    <div class="flex flex-col justify-center">
+      <div class="pi pi-spin pi-spinner" style="font-size: 8rem"></div>
+      <div>{{ t("login")+'...' }}</div>
+    </div>
     <!-- <NuxtPage /> -->
   </div>
 </template>