@simitgroup/simpleapp-generator 1.0.63 → 1.1.0

package/templates/basic/nuxt/{pages.crud.vue.eta → pages.new.vue.eta}

@@ -1,4 +1,9 @@
-<% const skipcolumns = ['_id','createdby','created','updatedby','updated','orgId','branchId','tenantId','doctype'] %>  
+<% const skipcolumns = ['_id','createdBy','created','updatedBy','updated','orgId','branchId','tenantId','doctype','docNoFormat'] %>  
+<% const getBasicElement = ( inputtype, pathStr, modelValue,subtype=undefined,hidelabel=false,instancepath='') => 
+      `<SimpleAppInput :input-type="SimpleAppInputType.${inputtype}"  :setting="o.getField('${pathStr}')" v-model="${modelValue}"`+ 
+        (subtype? `type="${subtype}"`:'') +' ' + 
+        (hidelabel? ':hidelabel="true"':'') +
+        (instancepath ?  `:instancepath="\`${instancepath}\`"` : '') + '/>' %>
 <script setup lang="ts">
 /**
  * This file was automatically generated by simpleapp everytime regenerate code.
@@ -7,21 +12,22 @@
  * last change 2023-09-09
  * author: Ks Tan
  */
+ import {SimpleAppInputType} from "~/types"
  import ConfirmPopup from 'primevue/confirmpopup';
  import { useConfirm } from "primevue/useconfirm";
  const confirm = useConfirm();
- 
+ const isReadOnly =ref(true)
  const {$<%= it.typename %>Doc,$event } = useNuxtApp();
   const doc = $<%= it.typename %>Doc()
   const data = doc.getReactiveData();
 
-const fetchRecord = async (id:string) =>{
-  await doc.getById(id)
+const fetchRecord = async (recordid:string) =>{
+  await doc.getById(recordid)
 }
-onMounted(()=>{
-  const id = String(useRoute().params.id);
-  fetchRecord(id);
-})
+
+const id = computed(()=>String(useRoute().params.id??''))
+  
+
 const disabled = computed(()=>{
   return false
 })
@@ -73,60 +79,74 @@ const newData = ()=>{
 const refresh = ()=>{
   $event('RefreshDocumentList',{documentName:doc.getDocName()})
 }
+
+
+if (id.value) {
+  fetchRecord(id.value);
+}else{
+  isReadOnly.value=false
+}
 </script>
-<template>
-    <SimpleAppForm #default="o" :document="doc">
-    <div class="simpleapp-tool-bar   col-span-4 text-left gap-4"  >
+<template>    
+    <SimpleAppForm #default="o" :document="doc" :readonly="isReadOnly">
+        <div v-if="isReadOnly" class="w-full">
+            <Button
+                class="btn btn-primary" @click="isReadOnly=false"
+                type="button" >Edit</Button>
+            <Button class="" :disabled="disabled" @click="newData" type="button" v-if="canPerform(doc.getDocName(),'create')">New</Button>
+        </div>
+        <div v-else class="simpleapp-tool-bar   col-span-4 text-left gap-4"  >
               <Button class="" :disabled="disabled" @click="newData" type="button" v-if="canPerform(doc.getDocName(),'create')">New</Button>
-              <Button class="bg-primary-600 hover:bg-primary-400 text-white" :disabled="disabled" @click="createData" type="button" v-if="canPerform(doc.getDocName(),'create') && doc.isNew()">Create</Button>
-              <Button class="bg-primary-600 hover:bg-primary-400 text-white" :disabled="disabled" @click="updateData" type="button" v-if="canPerform(doc.getDocName(),'update') && !doc.isNew()">Update</Button>
-              <Button class="bg-danger-600 hover:bg-danger-400 text-white" :disabled="disabled" @click="deleteData($event)" type="button" v-if="canPerform(doc.getDocName(),'delete') && !doc.isNew()">Delete</Button>
+              <Button class="btn btn-primary" :disabled="disabled" @click="createData" type="button" v-if="canPerform(doc.getDocName(),'create') && doc.isNew()">Create</Button>
+              <Button class="btn btn-primary" :disabled="disabled" @click="updateData" type="button" v-if="canPerform(doc.getDocName(),'update') && !doc.isNew()">Update</Button>
+              <Button class="btn btn-danger" :disabled="disabled" @click="deleteData($event)" type="button" v-if="canPerform(doc.getDocName(),'delete') && !doc.isNew()">Delete</Button>
 
               
               <ProgressSpinner v-if="disabled==true" style="width: 2rem; height: 2rem" ></ProgressSpinner>
               <ConfirmPopup></ConfirmPopup>              
             </div>
+        <div class="grid grid-cols-4 gap-4">
+    <% let isautofocus='' %>
      <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
       
         <% let obj=it.jsonschema.properties[key] %>
         <% if(skipcolumns.indexOf(key)>=0){ %>
         <% } else if(obj.type=='boolean'){ %>
-            <SimpleAppCheckbox  autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
+            <%~ getBasicElement('checkbox',`#/properties/${key}`,`data.${key}`) %>
         <% } else if(obj.type=='number' || obj.type=='integer'){ %>
-            <SimpleAppNumber  autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+            <%~ getBasicElement('number',`#/properties/${key}`,`data.${key}`) %>            
         <% } else if(obj.type=='array'  && obj.items && obj.items.type =='string' ){ %>              
-            <SimpleAppChip   autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
+            <%~ getBasicElement('chip',`#/properties/${key}`,`data.${key}`) %>            
         <% } else if(obj.type=='object'  && typeof obj['x-foreignkey']!='undefined'){ %>              
-            <SimpleAppAutocomplete :setting="o.getField('#/properties/<%= key %>')"
-                    v-model="data.<%= key %>" optionLabel="label" :remote-src="getAutocomplete('<%=obj['x-foreignkey']%>')"/>
+            <%~ getBasicElement('autocomplete',`#/properties/${key}`,`data.${key}`) %>            
         <% } else if(obj.type=='string'){ %>                 
                 <% if(obj.format=='documentno'){ %>
-                        <SimpleAppDocumentNo autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>" v-model:docNoFormat="data.docNoFormat" />   
+                    <%~ getBasicElement('documentno',`#/properties/${key}`,`data.${key}`) %>                                    
                 <% }else if(obj.format=='date'){ %>
-                    <SimpleAppText type="<%=obj.format%>"  autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                    <%~ getBasicElement('date',`#/properties/${key}`,`data.${key}`) %>            
                 <% } else if(obj.format=='text'){ %>
-                    <SimpleAppTextarea :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                    <%~ getBasicElement('textarea',`#/properties/${key}`,`data.${key}`) %>            
                 <% } else if(obj.format=='html'){ %>
-                    <SimpleAppEditor editorStyle="height: 320px" :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                    <%~ getBasicElement('textarea',`#/properties/${key}`,`data.${key}`) %>            
                 <% } else if(obj.format=='email'){ %>
-                    <SimpleAppText  autofocus type="<%=obj.type%>" :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                    <%~ getBasicElement('text',`#/properties/${key}`,`data.${key}`,'email') %>            
                 <% } else if(obj.enum){ %>
-                    <SimpleAppSelect  autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
+                    <%~ getBasicElement('select',`#/properties/${key}`,`data.${key}`) %>            
                 <% } else if(obj['anyOf']){ %>
                     <% for(let f = 0; f < obj['anyOf'].length; f++){ %>
                         <%if(obj['anyOf'][f]['format']){ %>
-                            <SimpleAppText type='<%=obj['anyOf'][f]['format']%>'  autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                            <%~ getBasicElement('text',`#/properties/${key}`,`data.${key}`,obj['anyOf'][f]['format']) %>            
                         <%}%>
                     <%}%>
                 <% } else if(obj['oneOf']){ %>
                     <% for(let f = 0; f < obj['oneOf'].length; f++){ %>
                         <%if(obj['oneOf'][f]['format']){ %>
-                            <SimpleAppText type='<%=obj['oneOf'][f]['format']%>'  autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                            <%~ getBasicElement('text',`#/properties/${key}`,`data.${key}`,obj['anyOf'][f]['format']) %>            
                         <%}%>
                     <%}%>
 
                 <% } else {%>
-                        <SimpleAppText   autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                        <%~ getBasicElement('text',`#/properties/${key}`,`data.${key}`) %>            
                 <% }%>  
         <% } else if(obj.type=='object' && obj.properties){ %>                  
             <SimpleAppValue :setting="o.getField('#/properties/<%= key %>')">
@@ -137,14 +157,13 @@ const refresh = ()=>{
                 <% let instancePath=`#/${key}/${skey}` %>
 
                 <% if(sobj.type=='boolean'){ %>
-                    <SimpleAppCheckbox  autofocus :setting="<%~fieldpath%>" instancePath="<%=instancePath%>" v-model="<%= vmodel %>"/>
+                    <%~ getBasicElement('checkbox',fieldpath,vmodel) %>
                 <% } else if(sobj.type=='number' || sobj.type=='integer'){ %>
-                    <SimpleAppNumber  autofocus :setting="<%~fieldpath%>" instancePath="<%=instancePath%>" v-model="<%= vmodel %>"/>  
-                <% } else if(sobj.type=='array'  && sobj.items && sobj.items.type =='string' ){ %>              
-                    <SimpleAppChip   autofocus :setting="<%~fieldpath%>" instancePath="<%=instancePath%>" v-model="<%= vmodel %>"/>
+                    <%~ getBasicElement('number',fieldpath,vmodel) %>
+                <% } else if(sobj.type=='array'  && sobj.items && sobj.items.type =='string' ){ %>                                  
+                    <%~ getBasicElement('chip',fieldpath,vmodel) %>
                 <% } else if(sobj.type=='object'  && typeof sobj['x-foreignkey']!='undefined'){ %>              
-                    <SimpleAppAutocomplete  autofocus :setting="<%~fieldpath%>" instancePath="<%=instancePath%>"
-                            v-model="<%= vmodel %>" optionLabel="label" :remote-src="getAutocomplete('<%=sobj['x-foreignkey']%>')"/>
+                    <%~ getBasicElement('chip',fieldpath,vmodel) %>
                 <% } else if(sobj.type=='string'){ %>            
                          <% if(sobj.format=='date'){ %>
                             <SimpleAppText type="<%=sobj.format%>" instancePath="<%=instancePath%>" autofocus :setting="<%~fieldpath%>" v-model="<%= vmodel %>"/>  
@@ -163,63 +182,41 @@ const refresh = ()=>{
             <%})%>   
             </SimpleAppValue>            
         <% } else if(obj.type=='array' && obj.items.type=='object'){%>
-            <SimpleAppInputTable :getAutocomplete="getAutocomplete" :getField="o.getField" class="col-span-4"
+            <SimpleAppInputTable  :getField="o.getField" class="col-span-4"
                 :setting="o.getField('#/properties/<%=key%>')" v-model="data.<%=key%>">
                     <%let tablefields = Object.keys(obj.items.properties) %>
                     <% for(let a=0;a<tablefields.length;a++){%>
                         <%let col= tablefields[a] %>
                         <% if(skipcolumns.includes(col)){ continue}%> 
                         <%let subobj = obj.items.properties[col] %>
-                        <column field="<%=col%>" #body="{index}" :header="camelCaseToWords('<%=col%>')">                            
+                        <Column field="<%=col%>" #body="{index}" :header="camelCaseToWords('<%=col%>')">                            
                             <%if(subobj['x-foreignkey']){%>
-                                <SimpleAppAutocomplete v-model="data.<%=key%>[index].<%=col%>" 
-                                    :setting="o.getField('#/properties/<%=key%>/items/properties/<%=col%>')" 
-                                    :remoteSrc="getAutocomplete('<%=subobj[`x-foreignkey`]%>')"
-                                    optionLabel="label"
-                                    :hidelabel="true"
-                                    :instancePath="`/<%=key%>/${index}/<%=col%>`"/>
+                                <%~ getBasicElement('autocomplete',`#/properties/${key}/items/properties/${col}`,`data.${key}[index].${col}`,undefined,true,`/${key}/\${index}/${col}`) %>                                
                             <% } else if(subobj.type=='boolean'){%>
-                                <SimpleAppCheckbox v-model="data.<%=key%>[index].<%=col%>" 
-                                    :setting="o.getField('#/properties/<%=key%>/items/properties/<%=col%>')" 
-                                    :hidelabel="true"
-                                    :instancePath="`/<%=key%>/${index}/<%=col%>`"/>
+                                <%~ getBasicElement('checkbox',`#/properties/${key}/items/properties/${col}`,`data.${key}[index].${col}`,undefined,true,`/${key}/\${index}/${col}`) %>                                
                             <% } else if(subobj.type=='number' || subobj.type=='integer'){%>
-                                <SimpleAppNumber v-model="data.<%=key%>[index].<%=col%>" 
-                                    :setting="o.getField('#/properties/<%=key%>/items/properties/<%=col%>')" 
-                                    :hidelabel="true"
-                                    :instancePath="`/<%=key%>/${index}/<%=col%>`"/>
+                                <%~ getBasicElement('number',`#/properties/${key}/items/properties/${col}`,`data.${key}[index].${col}`,undefined,true,`/${key}/\${index}/${col}`) %>                                
                             <%} else if(subobj.type=='string' && subobj.format){%>
-                                <SimpleAppText v-model="data.<%=key%>[index].<%=col%>" 
-                                    :setting="o.getField('#/properties/<%=key%>/items/properties/<%=col%>')" 
-                                    text="subobj.format"
-                                    :hidelabel="true"
-                                    :instancePath="`/<%=key%>/${index}/<%=col%>`"/>
-                            <%} else if(subobj.type=='string' && subobj['enum']){%>        
-                                <SimpleAppSelect v-model="data.<%=key%>[index].<%=col%>" 
-                                    :setting="o.getField('#/properties/<%=key%>/items/properties/<%=col%>')" 
-                                    :hidelabel="true"
-                                    :instancePath="`/<%=key%>/${index}/<%=col%>`"/>
+                                <%~ getBasicElement('number',`#/properties/${key}/items/properties/${col}`,`data.${key}[index].${col}`,subobj.format,true,`/${key}/\${index}/${col}`) %>                                
+                            <%} else if(subobj.type=='string' && subobj['enum']){%>  
+                                <%~ getBasicElement('select',`#/properties/${key}/items/properties/${col}`,`data.${key}[index].${col}`,undefined,true,`/${key}/\${index}/${col}`) %>                                      
                              <%} else if(subobj.type=='string' ){%>        
-                                <SimpleAppText v-model="data.<%=key%>[index].<%=col%>" 
-                                    :setting="o.getField('#/properties/<%=key%>/items/properties/<%=col%>')" 
-                                    :hidelabel="true"
-                                    :instancePath="`/<%=key%>/${index}/<%=col%>`"/>
+                                <%~ getBasicElement('text',`#/properties/${key}/items/properties/${col}`,`data.${key}[index].${col}`,undefined,true,`/${key}/\${index}/${col}`) %>                                                                      
                             <%} else if(subobj.type=='number'){%>
-                                <SimpleAppDynamicInput v-model="data.<%=key%>[index].<%=col%>" 
-                                    :setting="o.getField('#/properties/<%=key%>/items/properties/<%=col%>')" 
-                                    :hidelabel="true"
-                                    :instancePath="`/<%=key%>/${index}/<%=col%>`"/>
+                                <%~ getBasicElement('number',`#/properties/${key}/items/properties/${col}`,`data.${key}[index].${col}`,undefined,true,`/${key}/\${index}/${col}`) %>                                                                      
                             <%}%>
-                        </column>                        
+                        </Column>                        
                     <%}%>
-                    <column #body="{index}" header="Delete">
+                    <Column #body="{index}" header="Delete">
                             <Button class="btn-danger" type="button" @click="data.<%=key%>.splice(index,1)">X</Button>
-                        </column>
+                        </Column>
             </SimpleAppInputTable>
         <% } else{%>
             <!-- Can auto generate <%=obj.key %> -->  
             <!--  <%~ JSON.stringify(obj) %>-->  
         <%}%>
       <%})%>  
+      </div>
     </SimpleAppForm>
+    <DebugDocumentData v-model="data"/>
 </template>

package/templates/basic/nuxt/simpleapp.generate.client.ts.eta

@@ -104,8 +104,8 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
 
   <%for(let i=0;i<it.apiSettings.length;i++){%>
   <% let api = it.apiSettings[i] %>
-  async <%=api.action%>(<% if(api.entrypoint && api.entrypoint.includes(':')) {%>
-          <%let subpath = api.entrypoint.split('/')%>
+  async <%=api.action%>(<% if(api.entryPoint && api.entryPoint.includes(':')) {%>
+          <%let subpath = api.entryPoint.split('/')%>
           <% for(let a=0;a<subpath.length;a++){%>
             <%const partstr = subpath[a]%>
             <%if(partstr.includes(':')){%>
@@ -116,8 +116,8 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
         <%}%>){
     //const recordid: string = this.data.value._id ?? '';
     return await this.docapi.<%=api.action%>(
-      <% if(api.entrypoint && api.entrypoint.includes(':')) {%>
-          <%let subpath = api.entrypoint.split('/')%>
+      <% if(api.entryPoint && api.entryPoint.includes(':')) {%>
+          <%let subpath = api.entryPoint.split('/')%>
           <% for(let a=0;a<subpath.length;a++){%>
             <%const partstr = subpath[a]%>
             <%if(partstr.includes(':')){%>
@@ -140,7 +140,7 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
 
   
   reCalculateValue(){
-    console.log('trigger new recalculate')
+    //console.log('trigger new recalculate')
     const data = this.getData()
     
     <% if(it.jsonschema['x-simpleapp-config']['formulas']){ %>
@@ -149,7 +149,7 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
         // <%~ JSON.stringify(fml) %>
         //const tmp = jsonpath.query(vdata,fieldpath).filter((item:string)=>item!='')
         
-        jsonpath.apply(data, '<%~ fml.jsonpath %>', function(value) { return <%~fml.formula %> });
+        jsonpath.apply(data, '<%~ fml.jsonPath %>', function(value) { return <%~fml.formula %> });
 
       <%}) %>
     <%} %>

package/templates/nest/src/simpleapp/generate/commons/interceptors/response.interceptor.ts.eta

@@ -40,7 +40,7 @@ export class ResponseInterceptor implements NestInterceptor {
       _id: logid,
       created: starttime.toISOString(),
       duration : 0,
-      createdby: usersession.getUid(),
+      createdBy: usersession.getUid(),
       path: url,
       method: method,
       headers: headers,

package/templates/nest/src/simpleapp/generate/commons/user.context.ts.eta

@@ -34,6 +34,8 @@ export class UserContext {
   protected xOrg: string = '';
   protected tenantId: number = 0;
   protected orgId: number = 0;
+  protected orgRecordId:string = ''
+  protected branchRecordId:string = ''
   protected branchId: number = 0;
   protected ssoACL: any = {};
   protected token: string = '';
@@ -157,14 +159,18 @@ export class UserContext {
     if(users && users.length>0){
       const userinfo = users[0]
 
-
+      console.log(userinfo)
       if(this.tenantId>0){
         const myperm=userinfo.permissions[0]
+        
         if(myperm && myperm.group){
           userinfo.group = myperm.group                    
           userinfo.roles = rolegroups[userinfo.group]()
+          
+          userinfo.branchRecordId = myperm.currentbranch[0].branchRecordId
           userinfo.branchCode = myperm.currentbranch[0].branchCode
           userinfo.branchName = myperm.currentbranch[0].branchName          
+          userinfo.orgRecordId = myperm.currentorg[0]._id
           userinfo.orgCode = myperm.currentorg[0].orgCode
           userinfo.orgName = myperm.currentorg[0].orgName
           
@@ -181,11 +187,11 @@ export class UserContext {
    
 
       //update last activtity dont too frequent
-      if(!dblastactivity || currentitme - lastvisit > 5000 ){         
-        const newusermodel = await this.usermodel.findById(userinfo._id)      
-        newusermodel.lastActivity= this.lastActivity        
-        const result = await newusermodel.save()
-      }
+      //if(!dblastactivity || currentitme - lastvisit > 5000 ){         
+      //  const newusermodel = await this.usermodel.findById(userinfo._id)      
+      //  newusermodel.lastActivity= this.lastActivity        
+      //  const result = await newusermodel.save()
+      //}
       
       // const result =  await this.usermodel.findOneAndUpdate({_id: userinfo._id},{lastActivity: new Date().toISOString})
       return userinfo  
@@ -217,6 +223,8 @@ export class UserContext {
       this.branchName = userinfo['branchName'] ?? ''
       this.orgCode = userinfo['orgCode'] ?? ''
       this.orgName = userinfo['orgName'] ?? ''
+      this.orgRecordId = userinfo['orgRecordId'] ?? ''
+      this.branchRecordId = userinfo['branchRecordId'] ?? ''
       this.group = userinfo['group'] ?? ''
       this.roles = userinfo['roles'] ?? [Role.Everyone,Role.User]
     }else{
@@ -271,8 +279,8 @@ export class UserContext {
       tenantId: u.tenantId,
       orgId: u.orgId,
       branchId: u.branchId,
-      createdby: u.uid,
-      updatedby: u.uid,
+      createdBy: u.uid,
+      updatedBy: u.uid,
       created: new Date().toISOString(),
       updated: new Date().toISOString()
     };
@@ -280,7 +288,7 @@ export class UserContext {
   getUpdateFilter = () => {
     const u = this;
     return {
-      updatedby: u.uid,
+      updatedBy: u.uid,
       updated: new Date().toISOString()
     };
   };  
@@ -312,6 +320,8 @@ export class UserContext {
       sessionId:this.sessionId,
       tenantId: this.getTenantId(),
       orgId: this.getOrgId(),
+      orgRecordId: this.orgRecordId ,
+      branchRecordId: this.branchRecordId,
       branchId: this.getBranchId(),
       branchCode: this.branchCode,
       branchName: this.branchName,
@@ -386,7 +396,7 @@ export class UserContext {
     // console.log("find invitation:",res)
     if(!res.uid){
       res.uid = this.getUid()
-      res.fullname = this.fullname
+      res.fullName = this.fullname
       res.active = true
       
       if(decision=='accept'){

package/templates/nest/src/simpleapp/generate/models/apievent.model.ts.eta

@@ -12,7 +12,7 @@ const schemasetting = {
           created: {type: String},  
           updated: {type: String},  
           duration:{type: Number},
-          createdby: {type: String},  
+          createdBy: {type: String},  
           path:{type:String},
           ip:{type:String},
           method:{type:String},

package/templates/nest/src/simpleapp/generate/processors/simpleapp.processor.ts.eta

@@ -166,7 +166,6 @@ export class SimpleAppService<T extends { _id?: string }> {
 
       Object.assign(filterobj, this.getIsolationFilter(appuser));
       let projections = {
-        id: `\$_id`,
         label: `\$${this.documentIdentityLabel}`,
         code: `\$${this.documentIdentityCode}`,
       };
@@ -215,7 +214,7 @@ export class SimpleAppService<T extends { _id?: string }> {
        
 
         Object.assign(pipeline[0]['$match'],isolationFilter);
-        console.log("final agg",pipeline)
+        //console.log("final agg",pipeline)
         return await this.doc.aggregate(pipeline)
       }catch(err){
         throw new InternalServerErrorException(err);  
@@ -330,12 +329,12 @@ export class SimpleAppService<T extends { _id?: string }> {
         }
       }else if(key == 'created'){
         data['created'] = (transtype == 'create'  || !data['created']) ? new Date() .toISOString() : data['created']
-      }else if(key == 'createdby'){
-        data['createdby'] = (transtype == 'create'  || !data['createdby']) ? appuser.getUid() : data['createdby']
+      }else if(key == 'createdBy'){
+        data['createdBy'] = (transtype == 'create'  || !data['createdBy']) ? appuser.getUid() : data['createdBy']
       }else if(key == 'updated'){
         data['updated'] = new Date() .toISOString()      
-      }else if(key == 'updatedby'){
-        data['updatedby'] = appuser.getUid()
+      }else if(key == 'updatedBy'){
+        data['updatedBy'] = appuser.getUid()
       }            
     }
 
@@ -422,7 +421,7 @@ export class SimpleAppService<T extends { _id?: string }> {
       await this.hook(appuser,HookType.beforeDelete, id);
       this.logger.debug('delete record',this.documentName, id);
       dependency = await this.getRelatedRecords(id);
-      console.log('dependency', dependency);
+      //console.log('dependency', dependency);
       if (!dependency) {
         let filterIsolation = this.getIsolationFilter(appuser);
         this.polishIsolationFilter(filterIsolation)        
@@ -440,7 +439,7 @@ export class SimpleAppService<T extends { _id?: string }> {
         //this.doc.findByIdAndDelete(id);
         return deleteresult;
       } else {
-        console.log("reject query",dependency)
+        //console.log("reject query",dependency)
         
         throw new ForbiddenException('Foreignkey constraint',dependency)
       }
@@ -609,7 +608,7 @@ export class SimpleAppService<T extends { _id?: string }> {
          }
          
          keystore[collectionname]= results   
-         console.log("keystorekeystore",keystore)
+         //console.log("keystorekeystore",keystore)
          let addfield={$addFields:{collection:collectionname}}        
          
          const stagefilter:PipelineStage =  {

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

@@ -9,7 +9,7 @@ export type ApiEvent = {
     created: string
     updated?:string
     duration: number
-    createdby: string
+    createdBy: string
     path: string
     ip: string
     method: string

package/templates/nest/src/simpleapp/profile/profile.service.ts.eta

@@ -146,7 +146,7 @@ export class ProfileService {
       orgId: orgResult.orgId,
       branchId: branchResult.branchId,
       uid: appuser.getUid(),
-      fullname: appuser.getFullname(),
+      fullName: appuser.getFullname(),
       email: appuser.getEmail(),
       active: true,
     };
@@ -176,13 +176,22 @@ export class ProfileService {
 
     this.logger.log(permResult, 'create Permission result');
 
-
     //tenant owner shall map to userId for that tenant
-    
-    const tenantUpdateData = await this.tenantsvc.findById(appuser,tenantResult._id)
-    this.logger.log(tenantUpdateData, `update tenant owner(${tenantResult._id})`);
-    tenantUpdateData.owner._id = userRecordId    
-    const updateTenantOwnerResult = await this.tenantsvc.findIdThenUpdate(appuser,tenantResult._id,tenantUpdateData)
+
+    const tenantUpdateData = await this.tenantsvc.findById(
+      appuser,
+      tenantResult._id,
+    );
+    this.logger.log(
+      tenantUpdateData,
+      `update tenant owner(${tenantResult._id})`,
+    );
+    tenantUpdateData.owner._id = userRecordId;
+    const updateTenantOwnerResult = await this.tenantsvc.findIdThenUpdate(
+      appuser,
+      tenantResult._id,
+      tenantUpdateData,
+    );
     if (!updateTenantOwnerResult) {
       throw new BadRequestException('Update tenant owner failed');
     }

package/templates/nest/src/simpleapp/services/autoinc.service.ts.eta

@@ -15,9 +15,7 @@ export { Autoincreament } from '../generate/types/autoinc.type';
 
 @Injectable()
 export class AutoincreamentService extends AutoincreamentProcessor {
-  constructor(
-    @InjectModel('Autoincreament') mydoc: Model<Autoincreament>,
-    ) {
+  constructor(@InjectModel('Autoincreament') mydoc: Model<Autoincreament>) {
     super(mydoc);
   }
 
@@ -69,18 +67,23 @@ export class AutoincreamentService extends AutoincreamentProcessor {
     if (res.length > 0) {
       // console.log("FOUND RESULT------")
       const tmp = res[0];
-      const nextno = tmp.nextno;
+      const nextno = tmp.nextNo;
       data = { collectionName: collection, fieldName: field, nextno: nextno };
       this.findIdThenUpdate(appuser, tmp._id, {
         collectionName: collection,
         fieldName: field,
-        nextno: tmp.nextno + 1,
+        nextNo: tmp.nextNo + 1,
       });
     } else {
       // console.log("CREATE ROW------")
-      this.data = { collectionName: collection, fieldName: field, nextno: 2 };
+      this.data = { collectionName: collection, fieldName: field, nextNo: 2 };
       const createResult = await this.create(appuser, this.data);
-      data = { _id:crypto.randomUUID(), collectionName: collection, fieldName: field, nextno: 1 };
+      data = {
+        _id: crypto.randomUUID(),
+        collectionName: collection,
+        fieldName: field,
+        nextno: 1,
+      };
     }
 
     return data;

package/templates/nest/src/simpleapp/services/branch.service.ts.eta

@@ -80,8 +80,8 @@ export class BranchService extends BranchProcessor {
       const pattern = `${doc.docType}-${branchCode}-[00000]`;
       const formatdata: Docnoformat = {
         _id: crypto.randomUUID(),
-        docNoFormatNo: doc.docType,
-        docNoFormatName: `Default ${doc.docType}`,
+        docNoFormatNo: `${doc.docType}-${branchCode}`,
+        docNoFormatName: `Default ${doc.docType} - ${branchCode}`,
         docNoType: doc.docType,
         docNoPattern: pattern,
         branch: { _id: recordId, branchId: branchId, label: branchName },

package/templates/nuxt/assets/css/style.css._eta

@@ -1,3 +1,35 @@
 .router-link-exact-active{
     @apply  bg-primary-100 block
+}
+
+
+[data-pc-group-section=pagebutton]{
+    @apply p-2 m-0 rounded-none border
+}
+[data-pc-section=pagebutton]{
+    @apply p-3 m-0 border
+}
+.btn {
+    @apply font-medium
+}
+
+.btn-primary {
+    @apply bg-primary-600 hover:bg-primary-400 text-white
+}
+.btn-secondary {
+    @apply bg-secondary-600 hover:bg-secondary-400 text-white
+}
+.btn-danger {
+    @apply bg-danger-600 hover:bg-danger-400 text-white
+}
+.btn-warn {
+    @apply bg-warning-600 hover:bg-warning-400 text-white
+}
+
+[disabled] ,[readonly]{
+    @apply bg-gray-300
+}
+
+[aria-selected=true]{
+    @apply bg-primary-100
 }

package/templates/nuxt/assets/primevue/passthrough.ts._eta

@@ -5,7 +5,7 @@ import Tailwind from "primevue/passthrough/tailwind";
 const CustomTailwind = usePassThrough(
     Tailwind,
     {
-        
+
         toast:{
             root:{ class:'w-1/3 '},
             message:{},
@@ -23,7 +23,14 @@ const CustomTailwind = usePassThrough(
             label:{class: 'text-sm'},
         },
         button:{root:{class: 'focus:outline-none transition duration-150 ease-in-out rounded px-8 py-2 m-1 border'}},
-        dialog:{root:{class:['border p-2']}},
+        dialog:{root:{class:['border p-2']}},        
+        autocomplete:{
+            input:{class:'m-0 font-sans text-gray-600 dark:text-white/80 bg-white dark:bg-gray-900 border border-gray-300 dark:border-blue-900/40  rounded-lg  rounded-tr-none rounded-br-none transition-colors duration-200 appearance-none hover:border-blue-500 focus:outline-none focus:outline-offset-0 focus:shadow-[0_0_0_0.2rem_rgba(191,219,254,1)] dark:focus:shadow-[0_0_0_0.2rem_rgba(147,197,253,0.5)] p-3 text-base flex-1'},
+            loadingIcon:{class:'animate-spin mt-4 -ml-6 mr-2'},
+            dropdownbutton: {
+                root:' bg-primary-600 hover:bg-primary-400 text-white rounded flex flex-row  p-3  -ml-6 rounded-tl-none rounded-bl-none '
+            }
+        },
         sidebar:{
             root:{class:'w-1/2 bg-white border p-2 h-full'}
         },