@simitgroup/simpleapp-generator 1.0.63 → 1.0.64

package/src/buildinschemas/docnoformat.ts

@@ -3,7 +3,7 @@ import {SchemaType,RESTMethods,IsolationType} from '../type'
 export const docnoformat:SchemaType ={
         type: "object",
         "x-simpleapp-config":{
-            isolationType:IsolationType.tenant,
+            isolationType:IsolationType.org,
             documentType:'docno',
             documentName:'docnoformat',
             pageType:"crud", 
@@ -12,8 +12,8 @@ export const docnoformat:SchemaType ={
             additionalAutoCompleteFields: ['default'],
             additionalApis:[{
                 "action":"listDocFormats",
-                "entrypoint":"/listdocformats/:doctype",
-                "requiredrole":["User"],
+                "entryPoint":"/listdocformats/:doctype",
+                "requiredRole":["User"],
                 "method":RESTMethods.get, 
                 "execute":"listDocFormats",
                 "description":"get list of document format for 1 doctype"
@@ -23,8 +23,8 @@ export const docnoformat:SchemaType ={
             _id:{type:'string'},
             created:{type:'string'},
             updated:{type:'string'},
-            createdby:{type:'string'},
-            updatedby:{type:'string'},
+            createdBy:{type:'string'},
+            updatedBy:{type:'string'},
             tenantId: {type:'integer',default:1,minimum:1 },
             orgId: {type:'integer',default:1,minimum:1 },
             branchId: {type:'integer',default:1,minimum:1 },

package/src/buildinschemas/organization.ts

@@ -17,8 +17,8 @@ export const organization:SchemaType ={
         _id:{type:'string'},
         created:{type:'string'},
         updated:{type:'string'},
-        createdby:{type:'string'},
-        updatedby:{type:'string'},
+        createdBy:{type:'string'},
+        updatedBy:{type:'string'},
         tenantId: {type:'integer',default:1,minimum:1 },
         orgId: {type:'integer',default:1,minimum:1 },
         branchId: {type:'integer',default:1,minimum:0 },
@@ -26,7 +26,7 @@ export const organization:SchemaType ={
         orgName: {type: "string",},
         active: {type: "boolean","default":true,},
         description: {type: "string",format:"text",},
-        timezone: {"type": "string","examples": ["Asia/Kuala_Lumpur"]
+        timeZone: {"type": "string","examples": ["Asia/Kuala_Lumpur"]
         }    
     }
   }

package/src/buildinschemas/permission.ts

@@ -5,11 +5,11 @@ export const permission:SchemaType ={
     "x-simpleapp-config":{
         documentType:'perm',
         documentName:'permission',        
-        isolationType:IsolationType.tenant,
+        isolationType:IsolationType.org,
         additionalApis:[{
             action:"listUser",
-            entrypoint:"listuser",
-            requiredrole:["SuperAdmin"],
+            entryPoint:"listuser",
+            requiredRole:["SuperAdmin"],
             method:RESTMethods.get,
             execute:"listUser",
             description:"Get current permissionlist lookup user info"
@@ -19,8 +19,8 @@ export const permission:SchemaType ={
         _id:{type:'string'},
         created:{type:'string'},
         updated:{type:'string'},
-        createdby:{type:'string'},
-        updatedby:{type:'string'},
+        createdBy:{type:'string'},
+        updatedBy:{type:'string'},
         tenantId: {type:'integer',default:1,minimum:0},
         orgId: {type:'integer',default:1,minimum:0 },
         branchId: {type:'integer',default:1,minimum:0 },

package/src/buildinschemas/tenant.ts

@@ -16,8 +16,8 @@ export const tenant:SchemaType ={
         _id:{type:'string'},
         created:{type:'string'},
         updated:{type:'string'},
-        createdby:{type:'string'},
-        updatedby:{type:'string'},
+        createdBy:{type:'string'},
+        updatedBy:{type:'string'},
         tenantId: {type:'integer',default:1,minimum:0 },
         orgId: {type:'integer',default:1,minimum:0 },
         branchId: {type:'integer',default:1,minimum:0 },

package/src/buildinschemas/user.ts

@@ -17,13 +17,13 @@ export const user:SchemaType ={
         _id:{type:'string'},
         created:{type:'string'},
         updated:{type:'string'},
-        createdby:{type:'string'},
-        updatedby:{type:'string'},
+        createdBy:{type:'string'},
+        updatedBy:{type:'string'},
         tenantId: {type:'integer',default:1,minimum:0 },
         orgId: {type:'integer',default:1,minimum:0 },
         branchId: {type:'integer',default:1,minimum:0 },
         uid: {type: "string",},
-        fullname: {type: "string",minLength:3},
+        fullName: {type: "string",minLength:3},
         email: {type: "string",minLength:10,format: "email"},
         active: {type: "boolean",default:true},
         description: {type:"string"},

package/src/generate.ts

@@ -255,9 +255,9 @@ const generateSchema = ( docname: string,
             }
           }
           const mapfiles = {
-            'pages.crud.vue.eta': { 
+            'pages.new.vue.eta': { 
               to:`pages/[xorg]/${docname}`, 
-              as:'crud.vue',
+              as:'new.vue',
               validate: validateWritePage
             },
             'pages.[id].vue.eta': { 

package/src/processors/jsonschemabuilder.ts

@@ -15,9 +15,7 @@ import {
   ChildModels,
   SchemaModel,
   TypeForeignKey,
-  TypeForeignKeyCatalogue,
-  DocSetting,
-  
+  TypeForeignKeyCatalogue,  
 } from '../type';
 const log: Logger<ILogObj> = new Logger();
 const configname =  "x-simpleapp-config"
@@ -25,8 +23,8 @@ const FOREIGNKEY_PROPERTY = 'x-foreignkey'
 const COMPULSORYFIELDS={  _id:{type:'string'},
   created:{type:'string'},
   updated:{type:'string'},
-  createdby:{type:'string'},
-  updatedby:{type:'string'},
+  createdBy:{type:'string'},
+  updatedBy:{type:'string'},
   tenantId: {type:'integer',default:1,minimum:1 },
   orgId: {type:'integer',default:1,minimum:1 },
   branchId: {type:'integer',default:1,minimum:1 },
@@ -212,11 +210,11 @@ const genSchema = async (
         if(!childprops['updated']){
           childprops['updated']={type:'string',description:'iso8601 or empty'}
         }
-        if(!childprops['createdby']){
-          childprops['createdby']={type:'string'}
+        if(!childprops['createdBy']){
+          childprops['createdBy']={type:'string'}
         }
-        if(!childprops['updatedby']){
-          childprops['updatedby']={type:'string'}
+        if(!childprops['updatedBy']){
+          childprops['updatedBy']={type:'string'}
         }
         if(!childprops['_id']){
           childprops['_id']={type:'string'}

package/src/processors/jsonschemabuilder.ts-old

@@ -119,8 +119,8 @@ const processObject =  (doctype: string,
     jsondata.properties['doctype'] = {type: 'string', default:doctype, examples: [doctype],description: 'Control value, dont edit it',};
     jsondata.properties['created'] = {type: 'string',description: 'Control value, dont edit it',};
     jsondata.properties['updated'] = {type: 'string',description: 'Control value, dont edit it',};
-    jsondata.properties['createdby'] = {type: 'string',description: 'Control value, dont edit it',};
-    jsondata.properties['updatedby'] = {type: 'string',description: 'Control value, dont edit it',};
+    jsondata.properties['createdBy'] = {type: 'string',description: 'Control value, dont edit it',};
+    jsondata.properties['updatedBy'] = {type: 'string',description: 'Control value, dont edit it',};
 
     if(doctype !='tenant'){
       jsondata.properties['tenantId'] = {type: 'number',description: 'Control value, dont edit it',};
@@ -306,11 +306,11 @@ const genSchema = (docname: string,schematype: string,jsondata: JsonSchemaProper
       if(!childprops['updated']){
         childprops['updated']={type:'string',description:'iso8601 or empty'}
       }
-      if(!childprops['createdby']){
+      if(!childprops['createdBy']){
         childprops['createdby']={type:'string'}
       }
-      if(!childprops['updatedby']){
-        childprops['updatedby']={type:'string'}
+      if(!childprops['updatedBy']){
+        childprops['updatedBy']={type:'string'}
       }
       if(!childprops['_id']){
         childprops['_id']={type:'string'}

package/src/type.ts

@@ -93,19 +93,19 @@ foreignkeys: MyForeignKey
 
 }
 
-export type DocSetting = {
-  docName:string,
-  docType:string,
-  colDocNo:string,
-  colDocLabel:string,
-  collectionName:string,
-  autocompleteFields:string[],
-  docStatusSettings:DocumentStatus[],
-  apiSettings:DocumentApi[],
-  // requireautocomplete:boolean
-  isolationtype:string
-  foreignkeys: MyForeignKey
-}
+// export type DocSetting = {
+//   docName:string,
+//   docType:string,
+//   colDocNo:string,
+//   colDocLabel:string,
+//   collectionName:string,
+//   autoCompleteFields:string[],
+//   docStatusSettings:DocumentStatus[],
+//   apiSettings:DocumentApi[],
+//   // requireautocomplete:boolean
+//   isolationType:string
+//   foreignKeys: MyForeignKey
+// }
 
 export type DocumentStatus = {
   status:string  //'CO', 'V', 'CL', 'D' and etc
@@ -116,9 +116,9 @@ export type DocumentStatus = {
 export enum RESTMethods {'post'='post','get'='get', 'delete'='delete','put'='put', 'patch'='patch'}
 export type DocumentApi = {
   action:string   //api action name
-  entrypoint:string   //api entry point example:':id', ':id/confirm'
-  querypara?:string[]   //what query parameter wish to accept, example:  ['description','date']
-  requiredrole?: string[]   // what special user role wish to allow for this api, example: ['SuperUser']
+  entryPoint:string   //api entry point example:':id', ':id/confirm'
+  queryPara?:string[]   //what query parameter wish to accept, example:  ['description','date']
+  requiredRole?: string[]   // what special user role wish to allow for this api, example: ['SuperUser']
   method:RESTMethods
   execute:string,   //what service class method name to execute, example: 'ping','getDocumentName'
   description:string //description of api
@@ -126,8 +126,8 @@ export type DocumentApi = {
 export enum IsolationType {"none"="none" , "tenant"="tenant","org"="org", "branch"="branch"}
 // export type ImportLibs = {"lib":string,"as":string}
 export type Formula =  {
-  "jsonpath":string  //example: "$.subtotal","$.details[*]"
-  "formula":string  //example "jslib.getDocumentSubTotal(@F{$.details})"
+  jsonPath:string  //example: "$.subtotal","$.details[*]"
+  formula:string  //example "jslib.getDocumentSubTotal(@F{$.details})"
 } 
 
 export type SchemaConfig = {
@@ -158,8 +158,8 @@ export type SchemaFields = {
   branchId: SimpleAppJSONSchema7
   created: SimpleAppJSONSchema7 
   updated: SimpleAppJSONSchema7 
-  createdby: SimpleAppJSONSchema7 
-  updatedby: SimpleAppJSONSchema7 
+  createdBy: SimpleAppJSONSchema7 
+  updatedBy: SimpleAppJSONSchema7 
   [key:string]:SimpleAppJSONSchema7 | SimpleAppJSONSchema7[] | undefined
 
 }

package/templates/basic/nest/controller.ts.eta

@@ -126,17 +126,17 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
 
 <% for(let i=0;i<it.apiSettings.length;i++){%>
 <% let api = it.apiSettings[i] %>
-<%~ `@${capitalizeFirstLetter(api.method)}('${api.entrypoint}')`%>
+<%~ `@${capitalizeFirstLetter(api.method)}('${api.entryPoint}')`%>
   <%if(superadmindoctype.includes(it.doctype)){%>
   @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_${api.action}`%>,
-    <%if(api.requiredrole && api.requiredrole.length>0) { %>
-        <% for(let r=0;r<api.requiredrole.length;r++){%>Role.<%=api.requiredrole[r]%>,<%}%>
+    <%if(api.requiredRole && api.requiredRole.length>0) { %>
+        <% for(let r=0;r<api.requiredRole.length;r++){%>Role.<%=api.requiredRole[r]%>,<%}%>
       <%}%>
   )
   <%}else{%>
   @Roles(Role.SuperAdmin,Role.SuperUser,Role.<%= `${it.typename}_${api.action}`%>,
-      <%if(api.requiredrole && api.requiredrole.length>0) { %>
-        <% for(let r=0;r<api.requiredrole.length;r++){%>Role.<%=api.requiredrole[r]%>,<%}%>
+      <%if(api.requiredRole && api.requiredRole.length>0) { %>
+        <% for(let r=0;r<api.requiredRole.length;r++){%>Role.<%=api.requiredRole[r]%>,<%}%>
       <%}%>
       )
   <%}%>
@@ -144,13 +144,13 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   @ApiResponse({status: 200,description: '<%=api.description%>' ,type: Object  })
   @ApiResponse({status: 418,description: 'undefine bpmn,setDocumentStatus or bpmn'})
   @ApiOperation({ operationId: '<%=api.execute ??api.action%>' })
-  <% if(api.querypara && api.querypara.length>0) {%>
-      <%for(let q=0;q<api.querypara.length; q++){%>
-        @ApiQuery({name: "<%=api['querypara'][q]%>",required: false,type: String})
+  <% if(api.queryPara && api.queryPara.length>0) {%>
+      <%for(let q=0;q<api.queryPara.length; q++){%>
+        @ApiQuery({name: "<%=api['queryPara'][q]%>",required: false,type: String})
       <%}%>
   <%}%>  
-  async <%=api.execute??api.action %>(@AppUser() appuser: UserContext,@Res() res:Response,<% if(api.entrypoint && api.entrypoint.includes(':')) {%>
-          <%let subpath = api.entrypoint.split('/')%>
+  async <%=api.execute??api.action %>(@AppUser() appuser: UserContext,@Res() res:Response,<% 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(':')){%>
@@ -159,16 +159,16 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
             <%}%>    
           <%}%>  
         <%}%>
-        <% if(api.querypara && api.querypara.length>0) {%>
-            <%for(let q=0;q<api.querypara.length; q++){%>
-              <% const qp = api['querypara'][q] %>
+        <% if(api.queryPara && api.queryPara.length>0) {%>
+            <%for(let q=0;q<api.queryPara.length; q++){%>
+              <% const qp = api['queryPara'][q] %>
               @Query('<%=qp%>') <%=qp%>: string,
             <%}%>
         <%}%>
          ){
     <%if(api.execute){%>
-      const result =  await this.service.<%=api.execute%>(appuser,<% if(api.entrypoint && api.entrypoint.includes(':')) {%>
-          <%let subpath = api.entrypoint.split('/')%>
+      const result =  await this.service.<%=api.execute%>(appuser,<% 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(':')){%>
@@ -177,9 +177,9 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
             <%}%>    
           <%}%>  
         <%}%>
-        <% if(api.querypara && api.querypara.length>0) {%>
-            <%for(let q=0;q<api.querypara.length; q++){%>
-              <%= api['querypara'][q] %>,              
+        <% if(api.queryPara && api.queryPara.length>0) {%>
+            <%for(let q=0;q<api.queryPara.length; q++){%>
+              <%= api['queryPara'][q] %>,              
             <%}%>
         <%}%>
         )

package/templates/basic/nest/processor.ts.eta

@@ -59,7 +59,7 @@ export class <%= it.typename %>Processor extends SimpleAppService<<%= it.typenam
           // <%~ JSON.stringify(fml) %>
           //const tmp = jsopbj.query(vdata,fieldpath).filter((item:string)=>item!='')
           
-          jsopbj.apply(data, '<%~ fml.jsonpath %>', function(value:any) { return <%~fml.formula %> });
+          jsopbj.apply(data, '<%~ fml.jsonPath %>', function(value:any) { return <%~fml.formula %> });
 
         <%}) %>
       <%} %>

package/templates/basic/nuxt/pages.[id].vue.eta

@@ -6,7 +6,7 @@
  * last change 2023-09-09
  * author: Ks Tan
  */
-import Crud from './crud.vue'
+import Crud from './new.vue'
 </script>
 <template>
     <Crud/>

package/templates/basic/nuxt/pages.landing.vue.eta

@@ -6,14 +6,9 @@
  * last change 2023-09-09
  * author: Ks Tan
  */
-<% const skipcolumns = ['_id','createdby','created','updatedby','updated','orgId','branchId','tenantId','doctype'] %>  
-  //import {InputTableColumnType,InputTableColumn} from "~/components/type";
-  import Column from "primevue/column";
-  import MultiTextRender from '~/components/renderers/MultiTextRender.vue'
-    import BooleanRender from '~/components/renderers/BooleanRender.vue'
-    import DateRender from '~/components/renderers/DateRender.vue'
-    import ForeignKeyRender from '~/components/renderers/ForeignKeyRender.vue'
-
+<% const skipcolumns = ['_id','createdBy','created','updatedBy','updated','orgId','branchId','tenantId','doctype'] %>  
+  
+  import { CellSetting } from "~/types";
   const {$<%= it.typename %>Doc } = useNuxtApp();
   const doc = $<%= it.typename %>Doc()
   const data = doc.getReactiveData();
@@ -29,13 +24,13 @@ definePageMeta({
         <%} else if(['string','number','integer'].indexOf(obj.type)>=0){%>'<%=key%>',
         <%} else if(obj.type =='object' && obj['x-foreignkey'] ){%>
             { 
-              title:'<%=capitalizeFirstLetter(key)%>', 
+              title:t('<%=key%>'), 
               field:'<%=key%>',
-              component:ForeignKeyRender,
-              componentSetting:{collection:'<%=key%>' }
+              rendererName:'RendererForeignKey',
+              rendererSetting:{collection:'<%=obj["x-foreignkey"]%>' }
             },
         <%}%>
-    <%})%>],
+    <%})%>]  as CellSetting[],
   sorts:[
     <%if(it.jsonschema['x-simpleapp-config'] && it.jsonschema['x-simpleapp-config']['uniqueKey']){%>
         ['<%=it.jsonschema['x-simpleapp-config']['uniqueKey']%>','asc'],
@@ -57,19 +52,19 @@ const exitRecord = ()=>{
     }
 
 watch(()=> useRoute().fullPath ,(newvalue,oldvalue)=>{
-  visible.value =  useRoute().params.id ? true : false
+  visible.value = useRoute().params.id || useRoute().fullPath.includes("/new") ? true : false;
 })
 
 onNuxtReady(()=>{
-  visible.value = useRoute().params.id ? true : false;
+  visible.value = useRoute().params.id ||  useRoute().fullPath.includes('/new') ? true : false;  
 })
 </script>
 <template>
    <div>
     <Button class="bg-primary-600 hover:bg-primary-400 text-white"  v-if="canPerform(String(useRoute().meta.name),'create')" @click="newData">New</Button>    
     <Dialog v-model:visible="visible"
-                :pt="{root:{class:'w-full h-full bg-white'}}"  
-                modal :header="doc.getDocName()" 
+                :pt="{ root: { class: 'w-full h-full bg-white' } , headertitle:{class:'m-2 ml-6 text-2xl font-bold'}}"
+                modal :header="t(doc.getDocName())" 
                 :autoZIndex="false" 
                 @update:visible="exitRecord"                
                 >                 

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

@@ -1,4 +1,4 @@
-<% const skipcolumns = ['_id','createdby','created','updatedby','updated','orgId','branchId','tenantId','doctype'] %>  
+<% const skipcolumns = ['_id','createdBy','created','updatedBy','updated','orgId','branchId','tenantId','doctype'] %>  
 <script setup lang="ts">
 /**
  * This file was automatically generated by simpleapp everytime regenerate code.
@@ -10,7 +10,7 @@
  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();
@@ -18,10 +18,10 @@
 const fetchRecord = async (id:string) =>{
   await doc.getById(id)
 }
-onMounted(()=>{
-  const id = String(useRoute().params.id);
-  fetchRecord(id);
-})
+
+const id = String(useRoute().params.id);
+  
+
 const disabled = computed(()=>{
   return false
 })
@@ -73,10 +73,20 @@ const newData = ()=>{
 const refresh = ()=>{
   $event('RefreshDocumentList',{documentName:doc.getDocName()})
 }
+
+if(id){
+    fetchRecord(id);
+}
+
 </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="bg-primary-600 hover:bg-primary-400" @click="isReadOnly=false"
+                type="button" >Edit</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>
@@ -86,6 +96,7 @@ const refresh = ()=>{
               <ProgressSpinner v-if="disabled==true" style="width: 2rem; height: 2rem" ></ProgressSpinner>
               <ConfirmPopup></ConfirmPopup>              
             </div>
+        <div class="grid grid-cols-4 gap-4">
      <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
       
         <% let obj=it.jsonschema.properties[key] %>
@@ -221,5 +232,7 @@ const refresh = ()=>{
             <!--  <%~ 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},