@simitgroup/simpleapp-generator 1.5.1-alpha → 1.6.0-alpha

package/templates/nuxt/pages/[xorg]/mobile/organization/{index.vue.eta → index.vue.aetaz}

@@ -1,44 +1,47 @@
 <template>
-  
   <div class="w-full flex-col flex">
     <title>{{ t("organization") }}</title>
     <MobileToolbar class="bg-gray-600">
-      <template #center><TextTitle class="text-white">{{ t("organization") }}</TextTitle></template>
+      <template #center
+        ><TextTitle class="text-white">{{
+          t("organization")
+        }}</TextTitle></template
+      >
       <template #end>
         <ButtonText @click="showEditOrg = true" class="text-white"
           ><i class="pi pi-pencil"></i
         ></ButtonText>
       </template>
     </MobileToolbar>
-    
-    <div class="w-full flex flex-row p-2 border-b border-gray-300 ">
+
+    <div class="w-full flex flex-row p-2 border-b border-gray-300">
       <div class="p-4">
         <div class="border w-12 h-12 md:w-24 md:h24"></div>
       </div>
-      <div class="flex flex-col flex-1 ">
+      <div class="flex flex-col flex-1">
         <TextTitle>{{ data.orgName }} / {{ data.orgCode }}</TextTitle>
         <TextSubtitle>
           {{ data.description }}
-        </TextSubtitle>        
+        </TextSubtitle>
       </div>
     </div>
 
-    <div class="w-full p-2 flex flex-col ">
-      
+    <div class="w-full p-2 flex flex-col">
       <div class="flex flex-row justify-end">
-        <TextTitle class="flex-1 p-2">{{ t('branches') }}</TextTitle>
+        <TextTitle class="flex-1 p-2">{{ t("branches") }}</TextTitle>
         <div>
           <ButtonPrimary @click="goBranch('new')">
             <i class="pi pi-plus"></i> <span>{{ t("addBranches") }}</span>
           </ButtonPrimary>
         </div>
       </div>
-      <ListView class="border rounded-lg border-gray-400 dark:border-gray-600"        
+      <ListView
+        class="border rounded-lg border-gray-400 dark:border-gray-600"
         :list="branchlist"
         title-field="branchName"
         sub-title-field="branchCode"
         :url="getDocumentUrl('organization', id)"
-        #default="{item}"
+        #default="{ item }"
       >
         <div class="flex flex-row">
           <div class="flex-col flex flex-1">
@@ -50,7 +53,6 @@
             <renderer-boolean v-model="item.active"></renderer-boolean>
           </div>
         </div>
-      
       </ListView>
     </div>
 
@@ -75,6 +77,7 @@
  * Author: Ks Tan
  */
 import { FormCrudEvent, SimpleAppInputType } from "~/types";
+import { Branch } from "~/simpleapp/generate/openapi";
 import ConfirmPopup from "primevue/confirmpopup";
 import { useConfirm } from "primevue/useconfirm";
 const confirm = useConfirm();
@@ -87,7 +90,7 @@ const orgId = computed(() => <string>getUserProfile()?.orgRecordId);
 const doc = $OrganizationDoc();
 const brancdoc = $BranchDoc();
 const data = doc.getReactiveData();
-const branchlist = ref([]);
+const branchlist = ref<Branch[]>([]);
 const isReadOnly = ref(true);
 const getCurrentOrg = async () => {
   await doc.getById(orgId.value);

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

@@ -1,44 +1,50 @@
 <template>
-  
   <div class="w-full flex-col flex">
     <title>{{ t("organization") }}</title>
     <MobileToolbar class="bg-gray-600">
-      <template #center><TextTitle class="text-white">{{ t("organization") }}</TextTitle></template>
+      <template #center
+        ><TextTitle class="text-white">{{
+          t("organization")
+        }}</TextTitle></template
+      >
       <template #end>
         <ButtonText @click="showEditOrg = true" class="text-white"
           ><i class="pi pi-pencil"></i
         ></ButtonText>
       </template>
     </MobileToolbar>
-    
-    <div class="w-full flex flex-row p-2 border-b border-gray-300 ">
-      <div class="p-4">
-        <div class="border w-12 h-12 md:w-24 md:h24"></div>
+
+    <div class="w-full flex flex-row p-2 border-b border-gray-300">
+      <div class="">
+        <!--  -->
+        <!-- <div class="border w-12 h-12 md:w-24 md:h24"> -->
+        <ImageOrganization :changable="!doc.isReadOnly()"></ImageOrganization>
+        <!-- </div> -->
       </div>
-      <div class="flex flex-col flex-1 ">
+      <div class="flex flex-col flex-1">
         <TextTitle>{{ data.orgName }} / {{ data.orgCode }}</TextTitle>
         <TextSubtitle>
           {{ data.description }}
-        </TextSubtitle>        
+        </TextSubtitle>
       </div>
     </div>
 
-    <div class="w-full p-2 flex flex-col ">
-      
+    <div class="w-full p-2 flex flex-col">
       <div class="flex flex-row justify-end">
-        <TextTitle class="flex-1 p-2">{{ t('branches') }}</TextTitle>
+        <TextTitle class="flex-1 p-2">{{ t("branches") }}</TextTitle>
         <div>
           <ButtonPrimary @click="goBranch('new')">
             <i class="pi pi-plus"></i> <span>{{ t("addBranches") }}</span>
           </ButtonPrimary>
         </div>
       </div>
-      <ListView class="border rounded-lg border-gray-400 dark:border-gray-600"        
+      <ListView
+        class="border rounded-lg border-gray-400 dark:border-gray-600"
         :list="branchlist"
         title-field="branchName"
         sub-title-field="branchCode"
         :url="getDocumentUrl('organization', id)"
-        #default="{item}"
+        #default="{ item }"
       >
         <div class="flex flex-row">
           <div class="flex-col flex flex-1">
@@ -50,7 +56,6 @@
             <renderer-boolean v-model="item.active"></renderer-boolean>
           </div>
         </div>
-      
       </ListView>
     </div>
 
@@ -75,6 +80,7 @@
  * Author: Ks Tan
  */
 import { FormCrudEvent, SimpleAppInputType } from "~/types";
+import { Branch } from "~/simpleapp/generate/openapi";
 import ConfirmPopup from "primevue/confirmpopup";
 import { useConfirm } from "primevue/useconfirm";
 const confirm = useConfirm();
@@ -87,7 +93,7 @@ const orgId = computed(() => <string>getUserProfile()?.orgRecordId);
 const doc = $OrganizationDoc();
 const brancdoc = $BranchDoc();
 const data = doc.getReactiveData();
-const branchlist = ref([]);
+const branchlist = ref<Branch[]>([]);
 const isReadOnly = ref(true);
 const getCurrentOrg = async () => {
   await doc.getById(orgId.value);

package/templates/nuxt/plugins/40.pusher.ts.eta

@@ -0,0 +1,18 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+import { defineNuxtPlugin } from "#app";
+import Pusher from 'pusher-js';
+export default defineNuxtPlugin( async(nuxtApp) => {
+    const pusherkey =  (useRuntimeConfig().app.PUSHER_KEY ?? '') as string
+    const pushercluster = (useRuntimeConfig().app.PUSHER_CLUSTER ?? '') as string    
+    const pusher = new Pusher(pusherkey, { cluster: pushercluster,});
+    return {        
+        provide: {
+            pusher:pusher
+        }
+    }    
+});

package/templates/nuxt/simpleapp/generate/clients/SimpleAppClient.ts.eta

@@ -22,7 +22,8 @@ type crudType = {
   runUpdate: Function;  
   runPatch: Function;  
   runDelete: Function;
-  runSearch: Function
+  runSearch: Function;
+  runDefault:Function;
 };
 export class SimpleAppClient<
   TData extends { _id?: string,created?:string },
@@ -77,6 +78,11 @@ export class SimpleAppClient<
     });
   }
 
+
+  async runDefault(){
+    const res = await this.docapi.runDefault() 
+    return res.data
+  }
   async create() {    
     const errors = this.validateFailed();
     const {$event} =useNuxtApp()

package/templates/nuxt/simpleapp/generate/commons/roles.ts.eta

@@ -8,11 +8,14 @@ type roletype = {resource:string, action:string}
 const allroles:roletype[] = [
 <% for(let i=0;i<it.modules.length; i++){ %>
         <% const m = it.modules[i] %>
+        {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.schema['x-simpleapp-config']['printFormats']){%>
+            {resource: '<%=m.docname%>', action:'print'},
+        <%}%>,
 
         <% if(m.api && m.api.length >0) {%>
 

package/templates/nuxt/types/schema.ts.eta

@@ -46,8 +46,15 @@ export type SchemaConfig = {
     documentType: string
     documentName: string
     collectionName?: string
-    foreignKeys?:MyForeignKey,
+    foreignKeys?:MyForeignKey
+    printFormats?: SchemaPrintFormat[]
   }
+
+export type SchemaPrintFormat = {
+  formatName: string
+  formatId: string
+  description?: string
+}
   export type MyForeignKey = {
     [collectionname:string]:string[]
   }

package/templates/nuxt/types/simpleappinput.ts.eta

@@ -58,13 +58,11 @@ export type FormActions = {
     [key:string]:string[]    
 }
 
-
 export type FormMenu = {
-    type:string
-    action:string    
-    label:string
+    type?:string
+    action?:string    
+    label?: string | ((...args: any) => string) | undefined
     command? : Function
     event?:FormCrudEvent
     [key:string] : any
 }
-

package/templates/printformats/template.jrxml._eta

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with simpleapp generator  -->
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="<%=it.formatName%>" pageWidth="595" pageHeight="420" orientation="Landscape" columnWidth="380" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="d0a16255-a928-4987-a618-d8b2c6a4728a">
+	<property name="com.jaspersoft.studio.report.description" value="<%=it.description%>"/>
+
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<detail><band splitType="Stretch"/></detail>
+	<noData>
+		<band height="380" splitType="Stretch">
+			<staticText>
+				<reportElement x="0" y="0" width="555" height="380" uuid="0fd432f8-6d4b-49cc-ac6c-1de5b660275b"/>
+				<box>
+					<pen lineWidth="0.75"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="29"/>
+				</textElement>
+				<text><![CDATA[this is <%=it.formatName%> (<%=it.formatId%>) printformat, please change it]]></text>
+			</staticText>
+		</band>
+	</noData>
+</jasperReport>

package/templates/project/groups/admin.json.eta

@@ -1,5 +1,6 @@
 {
     "Autoincreament": [
+      "access",
       "create",
       "update",
       "delete",
@@ -7,31 +8,35 @@
       "generateNextNo"
     ],
     "Branch": [
+      "access",
       "create",
       "update",
       "delete",
       "search"
     ],    
     "Organization": [
+      "access",
       "create",
       "update",
       "search",
       "delete"
     ],
     "Permission": [
-      "listUser",
+      "access",
       "search",
       "delete",
       "update",
       "create"
     ],
     "Tenant": [
+      "access",
       "create",
       "update",
       "delete",
       "search"
     ],
     "User": [
+      "access",
       "create",
       "update",
       "search",

package/templates/project/jsonschemas/branch.json._eta

@@ -0,0 +1,113 @@
+{
+  "type": "object",
+  "x-simpleapp-config": {
+    "isolationType": "org",
+    "documentType": "branch",
+    "documentName": "branch",
+    "uniqueKey": "branchCode",
+    "uniqueKeys": [
+      [
+        "branchId"
+      ]
+    ],
+    "documentTitle": "branchName",
+    "additionalAutoCompleteFields": [
+      "branchId"
+    ]
+  },
+  "properties": {
+    "_id": {
+      "type": "string"
+    },
+    "created": {
+      "type": "string"
+    },
+    "updated": {
+      "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
+    },
+    "organization": {
+      "type": "object",
+      "x-foreignkey": "organization",
+      "properties": {
+        "_id": {
+          "type": "string"
+        },
+        "code": {
+          "type": "string"
+        },
+        "label": {
+          "type": "string"
+        },
+        "orgId": {
+          "type": "integer"
+        }
+      }
+    },
+    "branchCode": {
+      "type": "string",
+      "minLength": 1
+    },
+    "branchName": {
+      "type": "string",
+      "minLength": 1
+    },
+    "street1": {
+      "type": "string"
+    },
+    "street2": {
+      "type": "string"
+    },
+    "street3": {
+      "type": "string"
+    },
+    "street4": {
+      "type": "string"
+    },
+    "city": {
+      "type": "string"
+    },
+    "region": {
+      "type": "string"
+    },
+    "postcode": {
+      "type": "string"
+    },
+    "country": {
+      "type": "string"
+    },
+    "tel": {
+      "type": "string"
+    },
+    "email": {
+      "type": "string"
+    },
+    "active": {
+      "type": "boolean",
+      "default": true
+    },
+    "description": {
+      "type": "string"
+    }
+  }
+}

package/templates/project/jsonschemas/invoice.json._eta

@@ -15,7 +15,11 @@
         "jsonPath": "$.invoiceTotal",
         "formula": "sharelibs.getTotal(data.details)"
       }
-    ]
+    ],
+    "printFormats":[
+      {"formatName":"invoice A4","formatId":"invoice-a4","description":""},
+      {"formatName":"invoice A5","formatId":"invoice-a5","description":""}
+    ],
   },
   "properties": {
     "_id": { "type": "string" },

package/templates/project/jsonschemas/organization.json._eta

@@ -0,0 +1,111 @@
+{
+  "type": "object",
+  "x-simpleapp-config": {
+    "isolationType": "tenant",
+    "documentType": "org",
+    "documentName": "organization",
+    "pageType": "crud",
+    "uniqueKey": "orgCode",
+    "uniqueKeys": [
+      [
+        "orgId"
+      ]
+    ],
+    "documentTitle": "orgName",
+    "additionalAutoCompleteFields": [
+      "orgId"
+    ],
+    "additionalApis":[{
+        "action":"getlogo",
+        "entryPoint":"logo",
+        "requiredRole":[],
+        "method":"get",
+        "schema":"string",
+        "responseType":"String",
+        "description":"obtain avatar base64 jpg image"
+      },{
+        "action":"uploadlogo",
+        "entryPoint":"logo",
+        "requiredRole":[],
+        "method":"post",
+        "schema":"KeyValue",
+        "responseType":"String",
+        "description":"post avatar in base64 jpg image"
+      }]
+  },
+  "required": [
+    "orgId",
+    "orgCode",
+    "orgName"
+  ],
+  "properties": {
+    "_id": {
+      "type": "string"
+    },
+    "created": {
+      "type": "string"
+    },
+    "updated": {
+      "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
+    },
+    "orgCode": {
+      "type": "string",
+      "minLength": 1
+    },
+    "orgName": {
+      "type": "string"
+    },
+    "registrationNo": {
+      "type": "string"
+    },
+    "active": {
+      "type": "boolean",
+      "default": true
+    },
+    "description": {
+      "type": "string",
+      "format": "text"
+    },
+    "timeZone": {
+      "type": "string",
+      "examples": [
+        "Asia/Kuala_Lumpur"
+      ]
+    },
+    "offsetMinute": {
+      "type": "number",
+      "default": 0
+    },
+    "currency": {
+      "type": "string",
+      "minimum": 3,
+      "maximum": 3
+    },
+    "country": {
+      "type": "string",
+      "minimum": 2,
+      "maximum": 2
+    }
+  }
+}