@simitgroup/simpleapp-generator 2.0.0-d-alpha → 2.0.0-f-alpha

package/templates/nest/src/simple-app/.core/features/webhook/schemas/webhook.schema.ts.eta

@@ -9,132 +9,132 @@ import { Field, ObjectType, ID } from '@nestjs/graphql';
 import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json';
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 
-@ObjectType()
+// @ObjectType()
 @Schema({ collection: 'webhook' })
 export class WebhookBasicAuth {
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   user: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   password: string;
 }
 
-@ObjectType()
+// @ObjectType()
 @Schema()
 export class WebhookHeaders {
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   name: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   value: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, description: 'iso8601 dataempty mean new record', default: '' })
   created: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, description: 'iso8601 or empty', default: '' })
   updated: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   createdBy: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   updatedBy: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   _id: string;
 }
 
-@ObjectType()
+// @ObjectType()
 @Schema()
 export class Webhook {
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, format: 'uuid', default: '' })
   _id?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   created?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   updated?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   createdBy?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   updatedBy?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'number', required: false, default: 1 })
   tenantId?: number;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'number', required: false, default: 1 })
   orgId?: number;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'number', required: false, default: 1 })
   branchId?: number;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: true, default: '' })
   title: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: true, format: 'uri', default: '' })
   url: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   requestMethod: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, description: 'apikey authentication use none + headers props', default: '' })
   authentication?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, format: 'text', default: '' })
   description?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, description: 'POST,PUT body template', format: 'text', default: '*' })
   body: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'boolean', required: false, default: true })
   active: boolean;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   resourceName: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   eventType: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, description: 'temporary support realtime and roll-back-when-failed, 2nd way way throw error and roll back data if webhook failed.)', default: '' })
   jobType: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'number', required: false, description: 'retries how many time when webhook failed', default: 0 })
   retryAttemps: number;
-  @Field()
+  // @Field()
   @ApiProperty({ type: () => WebhookBasicAuth, required: false })
   basicAuth?: WebhookBasicAuth;
   @Prop()
@@ -144,21 +144,21 @@ export class Webhook {
 }
 
 /***************************************** Start Auto Complete *****************************************/
-@ObjectType()
+// @ObjectType()
 @Schema()
 export class WebhookAutoComplete {
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: true, default: '' })
   _id: string;
 
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: true, default: '' })
   code: string;
 
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: true, default: '' })
   label: string;
 }

package/templates/nest/src/simple-app/.core/framework/base/simple-app.service.ts.eta

@@ -19,7 +19,7 @@ import { foreignkeys } from '../../features/foreign-key/foreignkeys.dict';
 import { CustomException } from '../custom-exception';
 
 import { camelToKebab } from 'src/simple-app/.core/utils/string-utils';
-import { DocumentNoFormatService } from '../../features/document-no-format/document-no-format.service';
+import { SimpleAppDocumentNoFormatService } from '../../features/document-no-format/document-no-format.service';
 import { UserContext } from '../../features/user-context/user.context';
 import { RunWebhookService } from '../../features/webhook/run-webhook.service';
 import { UniqueKeyExistResponse, DeleteResultType, IsolationType, MoreProjectionType, SchemaFields, TextSearchBody, PatchManyRequest } from '../schemas';
@@ -38,7 +38,7 @@ export class SimpleAppService<T extends SchemaFields> {
   // @Inject(AuditTrail)
   // protected audittrail: AuditTrail;
   // @Inject(DocNumberFormatGenerator)
-  protected docnogenerator: DocumentNoFormatService;
+  protected docnogenerator: SimpleAppDocumentNoFormatService;
   protected logger = new Logger();
   protected strictIsolation = true;
   protected jsonschema: any = {
@@ -65,7 +65,7 @@ export class SimpleAppService<T extends SchemaFields> {
   private logSvc:SimpleAppLogService;
   // protected userprovider = new UserContext() ;
 
-  constructor(doctype: string, docname: string, newdoc: Model<T>, isolationtype: IsolationType = IsolationType.org, eventEmitter: EventEmitter2, docnogenerator: DocumentNoFormatService,logSvc: SimpleAppLogService,runWebHook: RunWebhookService) {
+  constructor(doctype: string, docname: string, newdoc: Model<T>, isolationtype: IsolationType = IsolationType.org, eventEmitter: EventEmitter2, docnogenerator: SimpleAppDocumentNoFormatService,logSvc: SimpleAppLogService,runWebHook: RunWebhookService) {
     // console.log("-------init simpleapp service abstract class -------userprovider=",typeof this.userprovider)
     this.eventEmitter = eventEmitter;
     this.documentType = doctype.toUpperCase();

package/templates/nest/src/simple-app/.core/framework/json-schemas.dict.ts.eta

@@ -0,0 +1,11 @@
+<%
+for(let i=0; i<it.modules.length;i++){ 
+   const m= it.modules[i] 
+   if(getSystemResources().includes(m.docname.toLowerCase())){
+%> 
+export * from 'src/simple-app/.core/resources/<%=camelToKebab(m.typename)%>/<%=camelToKebab(m.typename)%>.jsonschema' 
+<%}else{%>      
+export * from 'src/simple-app/.resources/<%=camelToKebab(m.typename)%>/<%=camelToKebab(m.typename)%>.jsonschema' 
+  <%}%>
+<%}%>      
+

package/templates/nest/src/simple-app/mini-apps/mini-apps.module.ts._eta

@@ -0,0 +1,14 @@
+/**
+ * This file was automatically generated by simpleapp generator.
+ * --remove-this-line-to-prevent-override--
+ * last change 2025-09-01
+ * Author: Ks Tan
+ */
+import { Module } from '@nestjs/common';
+@Module({
+  // QueueTuitionClassModule
+  imports: [],
+  providers: [],
+  exports: [],
+})
+export class SimpleAppMiniAppsModule {}

package/templates/nest/src/simple-app/simple-app.module.ts.eta

@@ -11,7 +11,7 @@ import {SimpleAppEventsModule} from './events/events.module'
 import {SimpleAppFeaturesModule} from './features/features.module'
 
 import { SimpleAppResourceApiModule } from './apis/resource-api.module';
-
+import { SimpleAppMiniAppsModule } from './mini-apps/mini-apps.module';
 
 @Module({
   imports: [
@@ -19,6 +19,8 @@ import { SimpleAppResourceApiModule } from './apis/resource-api.module';
     SimpleAppResourcesModule,
     SimpleAppEventsModule,
     SimpleAppResourceApiModule,
+    SimpleAppFeaturesModule,
+    SimpleAppMiniAppsModule
   ],
   controllers: [],
   providers: [],
@@ -27,6 +29,8 @@ import { SimpleAppResourceApiModule } from './apis/resource-api.module';
     SimpleAppResourcesModule,
     SimpleAppEventsModule,
     SimpleAppResourceApiModule,
+    SimpleAppFeaturesModule,
+    SimpleAppMiniAppsModule
   ]
 })
 export class SimpleAppModule {}

package/templates/nuxt/components/form/FormDocnoformat.vue._eta

@@ -7,9 +7,7 @@
         :document="doc"
         @on="actionListener"
       ></SimpleAppFormToolBar>
-      <div
-        class="grid grid-cols-1 lg:grid-cols-2 gap-4 p-2"
-      >
+      <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 p-2">
         <SimpleAppInput
           :input-type="SimpleAppInputType.autocomplete"
           :setting="o.getField('#/properties/branch')"
@@ -19,11 +17,15 @@
           :readonly="!doc.isNew()"
           :input-type="SimpleAppInputType.select"
           :setting="o.getField('#/properties/docNoType')"
-          :options="getAllDocFormats().map((item) => item.docType)"
+          :options="
+            getAllDocFormats().map((item) => ({
+              label: docNoTypeMapping[item.docType] || item.docType,
+              value: item.docType,
+            }))
+          "
           v-model="data.docNoType"
         />
 
-
         <SimpleAppInput
           :input-type="SimpleAppInputType.text"
           :setting="o.getField('#/properties/docNoFormatNo')"
@@ -47,7 +49,6 @@
           v-model="data.default"
         />
 
-        
         <SimpleAppInput
           :input-type="SimpleAppInputType.text"
           :setting="o.getField('#/properties/docNoPattern')"
@@ -65,27 +66,43 @@
       </div>
     </SimpleAppForm>
     <DebugDocumentData v-model="data" :label="doc.getDocName()" />
+    <DataTable
+      :value="formatParams"
+      class="p-datatable-sm mt-6"
+      stripedRows
+      responsiveLayout="scroll"
+    >
+      <template #header>
+        <div class="text-sm font-semibold">Format Parameters</div>
+      </template>
+      <Column
+        field="placeholder"
+        header="Placeholder"
+        style="width: 30%"
+        class="text-xs"
+      />
+      <Column field="description" header="Description" class="text-xs" />
+    </DataTable>
   </div>
 </template>
 
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator during initialization. It is changable.
- * --remove-this-line-to-prevent-override--
+ * This file was automatically generated by simpleapp generator.
  * last change 2024-02-16
  * Author: Ks Tan
  */
 import { SimpleAppInputType, FormCrudEvent } from "~/types";
-import { Docnoformat } from "~/simpleapp/generate/types";
-import { DocnoformatDoc } from "~/simpleapp/docs/DocnoformatDoc";
+import { DocumentNoFormat  } from "~/simpleapp/generate/openapi";
+import { DocumentnoformatDoc } from "~/simpleapp/docs/DocumentnoformatDoc";
 
 const props = defineProps<{
   _id?: string;
-  doc?: DocnoformatDoc;
-  paras?: Docnoformat;
+  doc?: DocumentnoformatDoc;
+  paras?: Partial<DocumentNoFormat>;
 }>();
 
-const doc = props.doc ?? useNuxtApp().$DocnoformatDoc();
+const doc = props.doc ?? useNuxtApp().$DocumentnoformatDoc()
 const data = doc.getReactiveData();
 const sample = ref("");
 const emits = defineEmits(["after"]);
@@ -94,9 +111,41 @@ const id = computed(() => props._id ?? "");
 /************ start default methods ****************/
 
 const newData = () => {
-  doc.setNew()
-  delete data.value.branch
-}
+  doc.setNew();
+  delete data.value.branch;
+};
+
+const formatParams = [
+  {
+    placeholder: "[0000]",
+    description: "0001 displays the transaction numbering.",
+  },
+  {
+    placeholder: "{YYYY}",
+    description: "Displays 4-digit current year (e.g., 2025-9999).",
+  },
+  {
+    placeholder: "{YY}",
+    description: "Displays 2-digit current year (e.g., 25).",
+  },
+  {
+    placeholder: "{MM}",
+    description: "Displays 2-digit current month (e.g., 01-12).",
+  },
+  { placeholder: "{ddd}", description: "Displays current day (e.g., Tue)." },
+  {
+    placeholder: "{DD}",
+    description: "Displays 2-digit day of the month (e.g., 01-31).",
+  },
+  {
+    placeholder: "{YYMM}",
+    description: "Displays 2-digit year and 2-digit month (e.g., 2504).",
+  },
+  {
+    placeholder: "{YYYYMM}",
+    description: "Displays 4-digit year and 2-digit month (e.g., 202504).",
+  },
+];
 
 const getRecord = async () => {
   if (id.value && id.value != "new") {
@@ -106,6 +155,18 @@ const getRecord = async () => {
   }
 };
 
+const docNoTypeMapping: Record<string, string> = {
+  CN: "Credit Note",
+  ANNOUNCEMENT: "Announcement",
+  ENROLL: "Enrolment",
+  INV: "Invoice",
+  PAY: "Payment",
+  REFUND: "Refund",
+  STU: "Student",
+  TEACHER: "Teacher",
+  TUITION: "Tuition Class",
+};
+
 getRecord();
 watch(id, async () => await getRecord());
 /************ end default methods ****************/
@@ -134,7 +195,7 @@ onMounted(async () => {
 // };
 /************ end api methods ****************/
 const updateSample = () => {
-  sample.value = "Example: " + previewDocNo();
+  sample.value = "Format Sample: " + previewDocNo();
 };
 
 const previewDocNo = (): string => {

package/templates/nuxt/components/image/ImageAvatar.vue._eta

@@ -1,32 +1,29 @@
 <template>
-  <div>
+  <div class="flex flex-row">
     <ImageToBase64Uploader
       v-if="changable"
+      @image-uploaded="handleBase64"
       #default
-      :style="`width:${size}px; height:${size} px`"
       :class="`place-content-center `"
-      @image-uploaded="handleBase64"
-      :imagePath="imagepath"
     >
+      <div v-if="uploading" class="w-full h-full rounded-lg">
+        <ProgressSpinner class="w-full h-full rounded-lg min-w-32" />
+      </div>
       <NuxtImg
-        v-if="uid"
-        class="w-full h-full border-4 rounded-full"
-        :src="imagepath"
+        v-else
+        class="h-full rounded-lg"
+        :src="`${server}/users/${uid}/${size}`"
+        placeholder="/images/student.png"
         :key="imageKey"
-        provider="cloudflare"
-      />
+      />      
     </ImageToBase64Uploader>
-    <div
-      v-else
-      class="inline-block text-black"
-      :style="`width:${size}px; height:${size} px`"
-    >
+    <div v-else class="inline-block text-black">
       <NuxtImg
         v-if="uid"
-        class="w-full h-full border rounded-full"
-        :key="refreshkey"
-        :src="imagepath"
-        provider="cloudflare"
+        class="h-full border rounded-full"
+        :src="`${server}/users/${uid}/${size}`"
+        placeholder="/images/student.png"
+        :key="imageKey"
       />
     </div>
   </div>
@@ -34,30 +31,41 @@
 <script lang="ts" setup>
 import { updateAvatarVersion } from "~/composables/stringHelper.generate";
 import { PHOTOSIZE } from "~/types";
-
+const server = useRuntimeConfig().public.avatarUrl;
+const emits = defineEmits(["upload"]);
+const imageUrl = defineModel<string>();
+const uploading = ref(false);
+const imageKey = ref(0);
 // import {KeyValue} from ''
 const props = defineProps<{
   changable?: boolean;
   size?: PHOTOSIZE;
-  uid?: string;
+  uid: string;
   refreshkey?: number;
 }>();
 const size = computed(() => props.size ?? PHOTOSIZE.S64);
-const imageKey = ref(0);
-const uid = computed(() => props.uid ?? getUserProfile()?.uid);
 // const xorgpath = getCurrentXorg() ? `${getCurrentXorg()}/` : "MC0wLTA/";
 
-const imagepath = computed(() => useUserInfo().getAvatarByUid(uid.value,size.value)); //`${xorgpath}images/organization/${orgRecordId.value}`;
+useNuxtApp().$listen("RefreshPhoto", (resource: string[]) => {
+  if (resource[0] == "user" && resource[1] == props.uid) {
+    imageKey.value = new Date().getTime();
+  }
+});
 
 const handleBase64 = async (data: string) => {
-  await fetch(`/api/profile/avatar`, {
-    method: "POST",
-    body: data.split("base64,")[1],
-  }).then(async (res) => {
-    await fetch(imagepath.value, { cache: "reload", credentials: "include" });
-    imageKey.value++;
-    updateAvatarVersion();
-    // useNuxtApp().$event('RefreshUser',uid.value)
-  });
+  uploading.value = true;
+  const keyvalue = {
+    key: `--`,
+    value: data,
+  };
+  const uploadok = await getProfileApi().uploadPhoto(keyvalue);
+  if (uploadok) {
+    imageKey.value = new Date().getTime();
+    uploading.value = false;
+    setTimeout(() => {
+      useNuxtApp().$event("RefreshPhoto", ["user", props.uid]);
+    }, 1500);
+  }
+  uploading.value = false;
 };
 </script>

package/templates/nuxt/components/image/ImageToBase64Uploader.vue.eta

@@ -6,8 +6,7 @@
   >
     <ClientOnly>
       <slot name="default">
-        <Image v-if="selectedBase64Img" :src="selectedBase64Img" />
-        <i v-else class="pi pi-upload text-3xl"></i>
+        <div class="text-red-600">add NuxtImg component</div>
       </slot>
 
       <Dialog