@simitgroup/simpleapp-generator 1.2.6 → 1.2.7

package/README.md

@@ -34,6 +34,12 @@ SimpleApp generator is a typescript code generator for convert jsonschemas becom
 4. [End to End test](./docs/test.md)
 5. [BPMN walk through](./docs/bpmn.md)
 6. [Language](./doc/language.md)
+7. Viewer, with add, update. using event after and properties `paras`
+8. Document Status
+9. Additional Api & define api schema
+10.SimpleAppInputs
+11.Role Base Access Control
+
 
 # Quick start
 1. Simpleapp implement database transaction, and require mongodb cluster, below setup 3 nodes

package/dist/buildinschemas/organization.js

@@ -28,8 +28,8 @@ exports.organization = {
         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"] },
+        currency: { "type": "string", minimum: 3, maximum: 3 }
     }
 };
 //# sourceMappingURL=organization.js.map

package/dist/buildinschemas/organization.js.map

@@ -1 +1 @@
-{"version":3,"file":"organization.js","sourceRoot":"","sources":["../../src/buildinschemas/organization.ts"],"names":[],"mappings":";;;AAAA,kCAA4D;AAE/C,QAAA,YAAY,GAAa;IAClC,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAC;QACjB,aAAa,EAAC,oBAAa,CAAC,MAAM;QAClC,YAAY,EAAC,KAAK;QAClB,YAAY,EAAC,cAAc;QAC3B,QAAQ,EAAC,MAAM;QACf,SAAS,EAAC,SAAS;QACnB,UAAU,EAAC,CAAE,CAAC,OAAO,CAAC,CAAE;QACxB,aAAa,EAAC,SAAS;QACvB,4BAA4B,EAAE,CAAC,OAAO,CAAC;KAC1C;IACD,QAAQ,EAAC,CAAC,OAAO,EAAC,SAAS,EAAC,SAAS,CAAC;IACtC,YAAY,EAAE;QACV,GAAG,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACnB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,KAAK,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC5C,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,OAAO,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAG,WAAW,EAAC,CAAC,GAAE;QAC5C,OAAO,EAAE,EAAC,IAAI,EAAE,QAAQ,GAAE;QAC1B,MAAM,EAAE,EAAC,IAAI,EAAE,SAAS,EAAC,SAAS,EAAC,IAAI,GAAE;QACzC,WAAW,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,MAAM,EAAC,MAAM,GAAE;QAC5C,QAAQ,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,UAAU,EAAE,CAAC,mBAAmB,CAAC;SAC5D;KACJ;CACF,CAAA"}
+{"version":3,"file":"organization.js","sourceRoot":"","sources":["../../src/buildinschemas/organization.ts"],"names":[],"mappings":";;;AAAA,kCAA4D;AAE/C,QAAA,YAAY,GAAa;IAClC,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAC;QACjB,aAAa,EAAC,oBAAa,CAAC,MAAM;QAClC,YAAY,EAAC,KAAK;QAClB,YAAY,EAAC,cAAc;QAC3B,QAAQ,EAAC,MAAM;QACf,SAAS,EAAC,SAAS;QACnB,UAAU,EAAC,CAAE,CAAC,OAAO,CAAC,CAAE;QACxB,aAAa,EAAC,SAAS;QACvB,4BAA4B,EAAE,CAAC,OAAO,CAAC;KAC1C;IACD,QAAQ,EAAC,CAAC,OAAO,EAAC,SAAS,EAAC,SAAS,CAAC;IACtC,YAAY,EAAE;QACV,GAAG,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACnB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,KAAK,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC5C,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,OAAO,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAG,WAAW,EAAC,CAAC,GAAE;QAC5C,OAAO,EAAE,EAAC,IAAI,EAAE,QAAQ,GAAE;QAC1B,MAAM,EAAE,EAAC,IAAI,EAAE,SAAS,EAAC,SAAS,EAAC,IAAI,GAAE;QACzC,WAAW,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,MAAM,EAAC,MAAM,GAAE;QAC5C,QAAQ,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,UAAU,EAAE,CAAC,mBAAmB,CAAC,EAAC;QAC9D,QAAQ,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAC;KACjD;CACF,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

package/src/buildinschemas/organization.ts

@@ -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"]},
+        currency:{"type":"string",minimum:3,maximum:3}
     }
   }

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

@@ -24,10 +24,10 @@ import {
 } from '@nestjs/common';
 import { SimpleAppAbstractController } from './simpleapp.controller';
 import { <%= it.typename %>Service } from '../../services/<%= it.doctype %>.service';
-import * as <%= it.doctype %>type from '../types/<%= it.doctype %>.type';
-import {SearchBody} from '../types';
-import {ApiSearchBody} from '../apischemas';
-import * as <%= it.doctype %>apischema from '../apischemas/<%= it.doctype %>.apischema';
+// import * as <%= it.doctype %>type from '../types/<%= it.doctype %>.type';
+import * as types from '../types';
+import * as schemas from '../apischemas';
+//import * as <%= it.doctype %>apischema from '../apischemas/<%= it.doctype %>.apischema';
 import { ApiTags, ApiBody, ApiResponse,ApiOperation,ApiQuery } from '@nestjs/swagger';
 import {Roles} from '../commons/roles/roles.decorator'
 import {Role} from '../commons/roles/roles.enum'
@@ -40,9 +40,9 @@ const doctype = '<%= it.doctype %>'.toUpperCase();
 @ApiTags(doctype)
 @Controller(doctype.toLowerCase())
 export class <%= it.typename %>Controller extends SimpleAppAbstractController<
-  <%= it.typename %>Service,
-  <%= it.doctype %>apischema.<%= it.typename %>,
-  <%= it.doctype %>type.<%= it.typename %>
+  <%= it.typename %>Service,  
+  schemas.<%= it.typename%>,
+  types.<%= it.typename %>
 > {
   constructor(service: <%= it.typename %>Service) {
     super(service);
@@ -57,7 +57,7 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   @ApiResponse({
     status: 200,
     description: 'Found',
-    type: String //[<%= it.fullApiSchemaName%>]
+    type: String 
   })
   @ApiResponse({ status: 500, description: 'Internal error' })
   @ApiOperation({ operationId: 'runHello', description:"Say hello only" })
@@ -93,13 +93,13 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   @ApiResponse({
     status: 201,
     description: 'success',
-    type: <%= it.fullApiSchemaName%>
+    type: schemas.<%= it.typename%>
   })
   @ApiResponse({ status: 400, description: 'bad request' })
   @ApiResponse({ status: 500, description: 'internal error' })
-  @ApiBody({ description: 'Data',type:<%= it.fullApiSchemaName%> })
+  @ApiBody({ description: 'Data',type:schemas.<%= it.typename%> })
   @ApiOperation({ operationId: 'runCreate' })
-  async create(@AppUser() appuser: UserContext,@Body() data: <%= it.fullApiSchemaName%>) {    
+  async create(@AppUser() appuser: UserContext,@Body() data: schemas.<%= it.typename%>) {    
     return await this._create(appuser,data)
   }
 
@@ -113,13 +113,13 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   @ApiResponse({
     status: 200,
     description: 'success',
-    type: [<%= it.fullApiSchemaName%>]
+    type: [schemas.<%= it.typename%>]
   })
   @ApiResponse({ status: 400, description: 'bad request' })
   @ApiResponse({ status: 500, description: 'internal error' })
-  @ApiBody({ description: 'Data', type: ApiSearchBody })
+  @ApiBody({ description: 'Data', type: schemas.ApiSearchBody })
   @ApiOperation({ operationId: 'runSearch' })
-  async search(@AppUser() appuser: UserContext,@Body() data: SearchBody) {
+  async search(@AppUser() appuser: UserContext,@Body() data: types.SearchBody) {
     return await this._search(appuser,data)
   }
 
@@ -143,9 +143,12 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
       )
   <%}%>
   <% if(['post','put','patch'].includes(api.method)){ %>
-    @ApiBody({ description: 'Data', type: Object })
+    @ApiBody({ description: 'Request Body', type: <%= api.schema? 'schemas.'+api.schema : 'Object'%> })
   <%}%>  
-  @ApiResponse({status: 200,description: '<%=api.description%>' ,type: Object  })  
+  @ApiResponse({status: 200,description: '<%=api.description%>' 
+      ,type: <%= api.responseType
+          ?  (api.responseType.includes('[') ?  '[schemas.'+api.responseType.replace('[','').replace(']','') + ']' : 'schemas.'+api.responseType  )
+          : 'Object'%>  })  
   @ApiOperation({ operationId: 'run<%=capitalizeFirstLetter(api.action)%>' })
   <% if(api.queryPara && api.queryPara.length>0) {%>
       <%for(let q=0;q<api.queryPara.length; q++){%>
@@ -155,7 +158,8 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   async <%=capitalizeFirstLetter(api.action) %>(
     @AppUser() appuser: UserContext,
     <%if(['post','put','patch'].includes(api.method.toLowerCase())){%>
-      @Body() data:any,
+      @Body() data:<%= api.schema? 'types.'+api.schema : 'Object'%>,
+      //@Body() data:any,
     <%}%>
     <% if(api.entryPoint && api.entryPoint.includes(':')) {%>
           <%let subpath = api.entryPoint.split('/')%>
@@ -222,7 +226,7 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   @ApiResponse({
     status: 200,
     description: 'Founds',
-    type: <%= it.fullApiSchemaName%>
+    type: schemas.<%= it.typename%>
   })
   @ApiResponse({ status: 404, description: 'Document not found' })
   @ApiResponse({ status: 500, description: 'Internal error' })
@@ -249,9 +253,9 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   <%}%>  
   @ApiResponse({ status: 404, description: 'Document not found' })
   @ApiResponse({ status: 500, description: 'Internal error' })
-  @ApiBody({ description: 'Data',type: <%= it.fullApiSchemaName%> })
+  @ApiBody({ description: 'Data',type: schemas.<%= it.typename%> })
   @ApiOperation({ operationId: 'runUpdate' })
-  async update(@AppUser() appuser: UserContext,@Param('id') id: string, @Body() data: <%= it.fullApiSchemaName%>) {    
+  async update(@AppUser() appuser: UserContext,@Param('id') id: string, @Body() data: schemas.<%= it.typename%>) {    
     return await this._update(appuser,id, data) ;
   }
 
@@ -264,7 +268,7 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   @ApiResponse({
     status: 200,
     description: 'success',
-    type: <%= it.fullApiSchemaName%>
+    type: schemas.<%= it.typename%>
   })
   @ApiResponse({ status: 404, description: 'Document not found' })
   @ApiResponse({ status: 500, description: 'Internal error' })

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

@@ -9,8 +9,8 @@ import { Model } from 'mongoose';
 import { Injectable } from '@nestjs/common';
 import { UserContext } from '../generate/commons/user.context';
 import { <%= it.typename %>Processor } from '../generate/processors/<%= it.doctype %>.processor';
-import { <%= it.typename %>,<%= it.typename %>Hooks} from '../generate/types';
-
+//import { <%= it.typename %>,<%= it.typename %>Hooks} from '../generate/types';
+import * as types from '../generate/types';
 export { <%= it.typename %>} from '../generate/types';
 
 
@@ -19,9 +19,9 @@ export class <%= it.typename %>Service extends <%= it.typename %>Processor {
   <% const config = it.jsonschema['x-simpleapp-config']%>   
   <%if(config['loseDataIsolation']){%>protected strictIsolation = false;<%}%> 
       
-  public hooks: <%= it.typename %>Hooks = {}
+  public hooks: types.<%= it.typename %>Hooks = {}
     constructor(
-        @InjectModel('<%= it.typename %>')  mydoc: Model<<%= it.typename %>>
+        @InjectModel('<%= it.typename %>')  mydoc: Model<types.<%= it.typename %>>
         ){
         super(mydoc)
     }
@@ -48,7 +48,7 @@ export class <%= it.typename %>Service extends <%= it.typename %>Processor {
             <%}%>
         <%}%>
         <%if(['post','put','patch'].includes(api.method.toLowerCase())){%>
-            data:any,
+            data:<%= api.schema? 'types.'+api.schema: 'any'%>,
         <%}%>
          ){
     <%if (api.workflowSetting && api.workflowSetting.bpmn){ %>      

package/templates/basic/nuxt/default.ts.eta

@@ -32,7 +32,7 @@ export const Default<%=modelname%> = (uuid:string)=>{
             <%} else if(Array.isArray(field) && ['string','integer','number','boolean'].includes(field[0])) {%>
               <%=key%> : <<%=field[0]%>[]>[],  //typeof field == array     <%~JSON.stringify(field)%>    
             <%} else if(Array.isArray(field)) {%>
-              <%=key%> : [Default<%=field[0]%>(crypto.randomUUID())],  //typeof field == array     <%~JSON.stringify(field)%>    
+              <%=key%> : [Default<%=field[0]%>(randomUUID())],  //typeof field == array     <%~JSON.stringify(field)%>    
             <%} else {%>
               <%=key%> : <%=field.default%>,  //else <%= typeof field %>
           <%}%>

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

@@ -15,7 +15,7 @@
         <%}%> 
                 
         <SimpleAppFormToolBar  :document="doc" @on="actionListener"></SimpleAppFormToolBar>        
-        <div class="grid grid-cols-4 gap-4">
+        <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4">
     <% let isautofocus='' %>
      <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
       
@@ -147,8 +147,8 @@
  * author: Ks Tan
  */
  import { SimpleAppInputType } from "~/types";
- 
- const props = defineProps<{ _id?: string}>();
+ import { <%= it.typename %> } from "~/simpleapp/generate/types";
+ const props = defineProps<{ _id?: string,paras?:<%= it.typename %>}>();
  const doc = useNuxtApp().$<%= it.typename %>Doc()
  const data = doc.getReactiveData(); 
  const emits = defineEmits(["after"]);
@@ -159,7 +159,7 @@
 const newData = () =>  doc.setNew()
 const createData = async () => await doc.create()
 const updateData = async () => await doc.update()
-const deleteData = async () => await doc.delete(data.value._id ?? "")
+const deleteData = async () => await doc.delete()
 
 const getRecord = async () => {
   if(id.value && id.value != 'new'){

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

@@ -30,7 +30,16 @@
 
   const columns:CellSetting[] = [<%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
         <%let obj=it.jsonschema.properties[key] %>
+        <%let config=it.jsonschema['x-simpleapp-config'] %>
         <%if(skipcolumns.indexOf(key)>=0){%>/* skip system columns <%=key%>*/
+        <%} else if(config['uniqueKey'] && (config['uniqueKey']==key || config['documentTitle']==key)  ){%>
+          {
+            title: '<%=key%>',
+            field: '*',
+            moreFields:['<%=key%>'],
+            rendererName: "RendererLink",
+            rendererSetting: { path: "<%=config['documentName']%>" },
+          },
         <%} else if(['string','number','integer'].indexOf(obj.type)>=0){%>'<%=key%>',
         <%} else if(obj.type =='object' && obj['x-foreignkey'] ){%>
             { 

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

@@ -1,5 +1,5 @@
 <template>
-    <Crud :_id="_id" @after="after"/>
+    <Crud :_id="_id" @after="after" :paras="paras"/>
 </template>
 <script setup lang="ts">
 /**
@@ -11,8 +11,8 @@
  */
 import Crud from './form.vue'
 import {<%= it.typename %>} from '~/simpleapp/generate/types'
-const props = defineProps<{_id:string}>();
-const emits = defineEmits(["afterCreate"]);
+const props = defineProps<{_id:string,paras?:<%= it.typename %>}>();
+const emits = defineEmits(["afterCreate","after"]);
 
 const after = (actionName: string, data: <%= it.typename %>, result: any) => {
   switch (actionName) {
@@ -26,5 +26,6 @@ const after = (actionName: string, data: <%= it.typename %>, result: any) => {
     case "delete":
       break;
   }
+  emits("after",actionName,data,result)
 };
 </script>

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

@@ -21,18 +21,7 @@ import {AxiosResponse} from 'axios'
   <%}%>
 <%}%>
 // import { JSONSchema7 } from 'json-schema';
-import { Configuration,
-      <%= it.doctype.toUpperCase()%>Api, 
-      <%= it.typename%> ,      
-      <%Object.keys(it.schema).forEach(function(key){%>                   
-          <% if(typeof it.schema[key]=='string' || (Array.isArray(it.schema[key]) && typeof it.schema[key][0]=='string' && it.schema[key][0]!='string')){%>
-            <%= it.schema[key]  %>,
-          <%} else {%>
-            /*<%~ key + JSON.stringify(it.schema[key])  %>,*/
-          <%} %>
-      <%})%>
-
-    } from '../openapi';
+import * as openapi from '../openapi';
 
 export type {
       <%= it.typename%> ,
@@ -46,7 +35,7 @@ export type {
 
     } from '../openapi'
 
-export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<%= it.doctype.toUpperCase()%>Api>{
+export class <%= it.typename%>Client extends SimpleAppClient<openapi.<%= it.typename%>,openapi.<%= it.doctype.toUpperCase()%>Api>{
   public readonly schema= <%~ JSON.stringify(it.jsonschema) %> as SchemaType;
   protected documentIdentityCode='<%~ it.autocompletecode %>'
   protected documentIdentityName='<%~ it.autocompletename %>'  
@@ -82,7 +71,7 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
 
   }
   setNew = ()=>{         
-      const newdata = Default<%= it.typename%>(crypto.randomUUID())
+      const newdata = Default<%= it.typename%>(randomUUID())
       this.setData(newdata)
       return true
     }
@@ -107,7 +96,7 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
         <%let tablefields = Object.keys(obj.items.properties) %>
        public add<%=key%> = () => {
         
-        this.getReactiveData().value.<%= key %>.push(Default<%= it.typename%><%=capitalizeFirstLetter(key)%>(crypto.randomUUID()))
+        this.getReactiveData().value.<%= key %>.push(Default<%= it.typename%><%=capitalizeFirstLetter(key)%>(randomUUID()))
         return this.getReactiveData().value.<%= key %>.length -1
        }
         
@@ -156,7 +145,7 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
     <%}%>
      
 
-         <% if(['post','put','patch'].includes(api.method)){ %>data:any<%}%>  
+         <% if(['post','put','patch'].includes(api.method)){ %>data:<%=api.schema ? 'openapi.'+api.schema :'any'%><%}%>  
         ){
     //const recordid: string = this.data.value._id ?? '';
     return await this.docapi.run<%=capitalizeFirstLetter(api.action)%>(
@@ -276,7 +265,7 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
   /***************************** begin document status code*****************************************/
   <%for(let i=0;i<it.docStatusSettings.length;i++){%>
     <% let setting = it.docStatusSettings[i] %> 
-    async setStatus<%=capitalizeFirstLetter(setting.status)%>(id?:string,data:<%= it.typename%>,runValidate:boolean=false) {
+    async setStatus<%=capitalizeFirstLetter(setting.status)%>(id:string='',data:<%= it.typename%>,runValidate:boolean=false) {
       const {$event} =useNuxtApp()
       if(runValidate){
         const errors = this.validateFailed();

package/templates/nest/src/simpleapp/apischemas/index.ts._eta

@@ -0,0 +1,10 @@
+//put customize schemas in this folder
+import { ApiProperty } from '@nestjs/swagger';
+export class ForeignKey {
+    @ApiProperty({ type: 'string', required: false, format: 'uuid', default: '' })
+    _id: string;
+    @ApiProperty({ type: 'string', required: false,  default: '' })
+    code: string;
+    @ApiProperty({ type: 'string', required: false,  default: '' })
+    label: string;
+}

package/templates/nest/src/simpleapp/generate/apischemas/index.ts.eta

@@ -1,20 +1,8 @@
-/**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
- * Author: Ks Tan
- */
+<%for(let i=0; i<it.modules.length;i++){ %>
+<% const d = it.modules[i] %>      
+export * from './<%= d['doctype']%>.apischema'      
+<%}%>
 
-import { ApiProperty } from '@nestjs/swagger';
-export class ApiKeyValuePair {
-    @ApiProperty({"type":Object,"required":false,"examples":['{"field1":"1"}'],"default":""} )
-    field1: any
-}
-export class ApiSearchBody{            
-    @ApiProperty({ "type":Object, "required":false, "examples":['{"field1":"1"}'] ,"default":{"field1":"ok","field2":true,}} )
-    filter:  Object;
-    @ApiProperty({"type":[Object],"required":true,"examples":['["field1","field2"]'],"default":["field1","field2"]} )
-    fields:  [Object];
-    @ApiProperty({"type":()=>[Object],"required":true,"examples":['[[ "field1", "asc" ]]'],"default":[[ 'field1', 'asc' ]]} )
-    sorts:  [Object];
-}
+export * from './simpleapp.apischema'
+
+export * from '../../apischemas'

package/templates/nest/src/simpleapp/generate/apischemas/simpleapp.apischema.ts.eta

@@ -0,0 +1,20 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-01
+ * Author: Ks Tan
+ */
+
+import { ApiProperty } from '@nestjs/swagger';
+export class ApiKeyValuePair {
+    @ApiProperty({"type":Object,"required":false,"examples":['{"field1":"1"}'],"default":""} )
+    field1: any
+}
+export class ApiSearchBody{            
+    @ApiProperty({ "type":Object, "required":false, "examples":['{"field1":"1"}'] ,"default":{"field1":"ok","field2":true,}} )
+    filter:  Object;
+    @ApiProperty({"type":[Object],"required":true,"examples":['["field1","field2"]'],"default":["field1","field2"]} )
+    fields:  [Object];
+    @ApiProperty({"type":()=>[Object],"required":true,"examples":['[[ "field1", "asc" ]]'],"default":[[ 'field1', 'asc' ]]} )
+    sorts:  [Object];
+}

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

@@ -55,7 +55,8 @@ export class UserContext {
   protected branchName: string = '';
   protected orgCode: string = '';
   protected orgName: string = '';
-  protected timeZone:string=''
+  protected timeZone: string = '';
+  protected currency: string = '';
   protected branches: any[] = [];
   protected lastActivity: string = new Date().toISOString();
   protected invites: any[] = []; //User + field tenant:Tenant[]
@@ -88,6 +89,7 @@ export class UserContext {
   getEmail = () => this.email;
   getTimeZone = () => this.timeZone;
   getGroup = () => this.group;
+  getCurrency = () => this.currency;
   getMoreProps = () => this.moreProps;
   getRoles = () => this.roles;
   getModifieds = () => this.modifiedRecords;
@@ -209,6 +211,7 @@ export class UserContext {
           userinfo.orgCode = myperm.currentorg[0].orgCode;
           userinfo.orgName = myperm.currentorg[0].orgName;
           userinfo.timeZone = myperm.currentorg[0].timeZone;
+          userinfo.currency = myperm.currentorg[0].currency;
         }
       } else {
         userinfo.group = '';
@@ -258,7 +261,8 @@ export class UserContext {
       this.branchName = userinfo['branchName'] ?? '';
       this.orgCode = userinfo['orgCode'] ?? '';
       this.orgName = userinfo['orgName'] ?? '';
-      this.timeZone = userinfo['timeZone']?? '';
+      this.timeZone = userinfo['timeZone'] ?? '';
+      this.currency= userinfo['currency'] ?? '';
       this.orgRecordId = userinfo['orgRecordId'] ?? '';
       this.branchRecordId = userinfo['branchRecordId'] ?? '';
       this.group = userinfo['group'] ?? '';
@@ -379,6 +383,7 @@ export class UserContext {
       orgCode: this.orgCode,
       orgName: this.orgName,
       timeZone: this.getTimeZone(),
+      currency: this.getCurrency(),
       email: this.getEmail(),
       uid: this.getUid(),
       fullName: this.getFullname(),
@@ -675,8 +680,9 @@ export class UserContext {
       'orgId',
       'orgName',
       'timeZone',
+      'currency',
       'tenantId',
-      'lastActivity',
+      'lastActivity',      
       'group',
       '__v',
       'uid',

package/templates/nest/src/simpleapp/generate/types/index.ts.eta

@@ -1,7 +1,7 @@
-
-
 <%for(let i=0; i<it.modules.length;i++){ %>
 <% const d = it.modules[i] %>      
 export * from './<%= d['doctype']%>.type'      
 <%}%>
-export * from './simpleapp.type'
+export * from './simpleapp.type'
+
+export * from '../../types';

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

@@ -5,10 +5,7 @@
  * Author: Ks Tan
  */
 import { UserContext } from 'src/simpleapp/generate/commons/user.context';
-export type ForeignKey = {
-  _id: string;
-  label: string;
-};
+
 export type ModifiedCollection = {
   [key: string]: string[];
 };

package/templates/nest/src/simpleapp/types/index.ts._eta

@@ -0,0 +1,7 @@
+//put additional customize types in this folder
+export type ForeignKey = {
+    _id: string
+    code?:string
+    label: string
+    [key:string]:any
+  };

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

@@ -0,0 +1,37 @@
+
+/* calendar */
+
+#monthviewcal .vuecal__cell--current,
+#monthviewcal .vuecal__cell--today {
+  background-color: lightblue;
+}
+#monthviewcal .vuecal__cell--selected {
+  background-color: lightgreen;
+}
+
+#monthviewcal .vuecal__cell {
+  height: 3rem;
+}
+
+#resourceviewcal .vuecal__event {
+border-radius: 0.5rem;
+}
+#resourceviewcal .vuecal__split-days-headers {
+min-height: 6rem;
+}
+
+#resourceviewcal .vuecal__event {
+border: solid 1px #ccc !important;
+}
+
+#resourceviewcal .normalevent{
+    background-color: aqua;
+}
+
+#resourceviewcal .urgentevent{
+    background-color: lightcoral;
+}
+
+#resourceviewcal .seminal{
+    background-color: lightblue;
+}

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

@@ -15,7 +15,7 @@
 }
 
 body {
-    @apply bg-gray-50  dark:bg-gray-800
+    @apply bg-gray-50  dark:bg-gray-800  h-screen w-screen overflow-y-scroll 
 }
 
 input {
@@ -59,4 +59,5 @@ input {
 
 .simpleapp-input-label{
     @apply  text-left
-}
+}
+

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

@@ -24,15 +24,22 @@ const CustomTailwind = usePassThrough(
         selectbutton:{
             root:{class:'flex flex-row gap-1'},
             button: ({ context }) => ({
-                
-                class: ['text-center border text-gray-300 dark:border-gray-700  dark:text-gray-300 rounded-lg  p-2 cursor-pointer  hover:bg-primary-400 dark:hover:bg-primary-800 hover:text-white', context.active ? 'bg-primary-600  dark:bg-primary-700 text-white' : '']
+                class: ` focus:outline-none transition duration-150 ease-in-out rounded p-2 m-1 border dark:border-gray-600   ${context.active ? 'bg-primary-600 border-primary-400 text-white' : undefined}`
             }),
+            // button: ( context)  => ({
+                
+            //     class: ['text-center border text-gray-400 dark:border-gray-700  dark:text-gray-300 rounded-lg  p-2 cursor-pointer  hover:bg-primary-400 dark:hover:bg-primary-800 hover:text-white', context.active ? 'bg-primary-600  dark:bg-primary-700 text-white' : '']
+            // }),
             label:{class: 'text-sm'},
         },
         button:{root:{class: 'focus:outline-none transition duration-150 ease-in-out rounded p-2 m-1 border dark:border-gray-600'}},
-        dialog:{root:{class:['border p-2  h-4/5']}},        
+        dialog:{root:{class:['border p-2 w-full max-h-full max-w-full md:h-3/4 lg:h-1/2']},},        
+        calendar:{
+            root:{class:'border border-gray-400 dark:!border-blue-900/40  rounded-lg flex flex-row p-1'},
+            input:{class:'w-full p-2 font-sans  rounded-lg 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)]  text-base'},
+        },
         autocomplete:{
-            root:{class:'border border-gray-300 dark:!border-blue-900/40  rounded-lg flex flex-row'},
+            root:{class:'border border-gray-400 dark:!border-blue-900/40  rounded-lg flex flex-row'},
             input:{class:'w-full p-2 font-sans  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)]  text-base'},
             loadingIcon:{class:'hidden'},
             dropdownbutton: {
@@ -42,7 +49,7 @@ const CustomTailwind = usePassThrough(
         sidebar:{
             root:{class:'w-full md:w-1/2 xl:w-1/4   bg-white dark:bg-gray-800 border p-0 h-full'},
             content:{class:'p-0 pt-0 h-full w-full grow overflow-y-auto'}
-        },
+        },        
         panel: {
             root:{class:['border']},
             title: {class: ['leading-none font-light text-2xl']},
@@ -51,6 +58,10 @@ const CustomTailwind = usePassThrough(
         },
         breadcrumb:{
             root:{class:''}
+        },
+        inputnumber:{
+            // root:{class:''},
+            input:{class:'bg-white dark:bg-white text-black dark-text-black'}
         }
     },
 );

package/templates/nuxt/components/button/ButtonDanger.vue._eta

@@ -0,0 +1,6 @@
+<template>
+    <!-- this component allow modify -->
+    <Button class="btn-danger">
+        <slot></slot>
+    </Button>
+</template>

package/templates/nuxt/components/button/ButtonDefault.vue._eta

@@ -0,0 +1,6 @@
+<template>
+    <!-- this component allow modify -->
+    <Button>
+        <slot></slot>
+    </Button>
+</template>

package/templates/nuxt/components/button/ButtonPrimary.vue._eta

@@ -0,0 +1,6 @@
+<template>
+    <!-- this component allow modify -->
+    <Button class="btn-primary">
+        <slot></slot>
+    </Button>
+</template>

package/templates/nuxt/components/button/ButtonWarning.vue._eta

@@ -0,0 +1,6 @@
+<template>
+    <!-- this component allow modify -->
+    <Button class="btn-warn">
+        <slot></slot>
+    </Button>
+</template>