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

package/templates/nuxt/components/simpleApp/SimpleAppFormToolBar.vue._eta

@@ -32,7 +32,7 @@
         </slot>
         <ContextMenu ref="menu" :model="menus as MenuItem[]" />
       </template>
-    </MobileToolbar>    
+    </MobileToolbar>
     <ConfirmDialog></ConfirmDialog>
   </div>
   <div v-else class="simpleapp-tool-bar">
@@ -65,14 +65,48 @@
     </Toolbar>
     <ConfirmPopup></ConfirmPopup>
   </div>
+  <Dialog v-model:visible="visiblePrintFormats" :header="t('printFormats')">
+    <div>
+      <ListView
+        :list="printformats"
+        #default="{ item, index }"
+        @click="printPdf"
+      >
+        <div class="flex flex-col">
+          <TextBold>{{ item.formatName }}</TextBold>
+          <TextSubtitle>{{ item.description }}</TextSubtitle>
+        </div>
+      </ListView>
+    </div>
+  </Dialog>
+  <Sidebar
+    v-model:visible="visiblePrintPreview"
+    :header="t('printPreview')"
+    position="bottom"
+  >
+    <TextDanger v-if="printservererror || !printstr">
+      {{ t("printServerError") }}
+    </TextDanger>
+    <vue-pdf-embed
+      class="w-11/12"
+      v-else-if="isMobile()"
+      :source="printstr"
+      :disableTextLayer="true"
+    />
+    <iframe v-else width="100%" height="100%" :src="printstr"></iframe>
+  </Sidebar>
 </template>
 <script setup lang="ts">
 /**
  * This file was automatically generated by simpleapp generator during initialization. It is changable.
- * --remove-this-line-to-prevent-override--
- * last change 2024-02-22
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-04-02
  * author: Ks Tan
  */
+import VuePdfEmbed from "vue-pdf-embed";
+
+// import VuePdfKit from 'vue-pdf-kit'
+// import 'vue-pdf-kit/dist/style.css'
 
 import { SimpleAppClient } from "~/simpleapp/generate/clients/SimpleAppClient";
 import { useConfirm } from "primevue/useconfirm";
@@ -81,10 +115,15 @@ import { MenuItem } from "primevue/menuitem";
 import { MenuItemCommandEvent } from "primevue/menuitem";
 const confirm = useConfirm();
 const emits = defineEmits(["on", "close"]);
+const visiblePrintFormats = ref(false);
+const visiblePrintPreview = ref(false);
+const printstr = ref();
+const printservererror = ref(false);
 const props = defineProps<{
   document: SimpleAppClient<any, any>;
   disableaction?: string[];
 }>();
+
 const createData = async () => {
   try {
     return await doc.create();
@@ -111,13 +150,13 @@ const doc = props.document;
 const data = doc.getReactiveData();
 type Datatype = keyof typeof data.value;
 const config = doc.getSchema()["x-simpleapp-config"];
-const titlefield = (config.uniqueKey ?? config.documentTitle) as Datatype;
+const titlefield = (config.documentTitle ?? config.uniqueKey) as Datatype;
 const title = computed(() =>
   data.value[titlefield as Datatype]
     ? data.value[titlefield as Datatype]
     : t(doc.getDocName()),
 );
-
+const printformats = doc.getSchema()["x-simpleapp-config"]?.printFormats;
 const menu = ref();
 const menus = computed(() =>
   [...getActions(), ...getDocActions()].filter((item) => showMenuButton(item)),
@@ -142,8 +181,25 @@ const emitMobileEvent = (itemevent: MenuItemCommandEvent) => {
   emitEvent(itemevent.item, event);
 };
 
+const printPdf = async (index: number, format: any) => {
+  printservererror.value = false;
+  const formatid: string = format.formatId;
+  visiblePrintPreview.value = true;
+  // console.log("formatidformatid", format);
+  try {
+    const tmp: any = await doc
+      .getApi()
+      .runPrint(data.value._id ?? "", formatid);
+    printstr.value = "data:application/pdf;base64," + tmp.data;
+  } catch (e) {
+    printservererror.value = true;
+    printstr.value = "";
+    console.error("error from print server", e);
+  }
+};
 const getActions = () => {
   const actions = doc.getActions();
+  const printformats = doc.getSchema()["x-simpleapp-config"]?.printFormats;
   const crudmenus: any[] = [];
 
   // Object.keys(actions).forEach((key)=>{ //crud, api, docstatus
@@ -160,11 +216,26 @@ const getActions = () => {
       });
     }
   });
+  if (printformats && printformats.length > 0) {
+    crudmenus.push({
+      action: "print",
+      label: t("print"),
+      type: "crud",
+      icon: "pi pi-print",
+      command: showPrintFormats,
+    });
+  }
+  console.log("crudmenus", crudmenus);
+
   // })
   return crudmenus;
 };
 
-const emitEvent = async (menu: FormMenu, clickEvent: MouseEvent) => {
+const showPrintFormats = () => {
+  visiblePrintFormats.value = true;
+  // console.log("showPrintFormatContext",itemEvent)
+};
+const emitEvent = async (menu: FormMenu, clickEvent: Event | MouseEvent) => {
   if (menu.action == "delete") {
     confirm.require({
       target: clickEvent.target as HTMLElement,
@@ -172,13 +243,15 @@ const emitEvent = async (menu: FormMenu, clickEvent: MouseEvent) => {
       message: `${t("deleteThisRecord?")}`,
 
       // icon: "pi pi-exclamation-triangle gap-4",
-      acceptClass: "p-button-danger",
+      acceptClass: "bg-danger-600 text-white",
       accept: async () => {
         if (await deleteData()) emits("on", FormCrudEvent.delete);
       },
     });
   } else {
-    if (menu.action == "create") {
+    if (menu.action == "print") {
+      showPrintFormats();
+    } else if (menu.action == "create") {
       if (await createData()) emits("on", FormCrudEvent.create);
     } else if (menu.action == "update") {
       if (await updateData()) emits("on", FormCrudEvent.update);
@@ -214,6 +287,7 @@ const getDocActions = () => {
 const showMenuButton = (menu: FormMenu) => {
   if (menu.separator) return true;
 
+  if (menu.action == "print") return true;
   //all document status cannot direct apply regardless new or draft
   if (menu.type == "docstatus") return true;
 
@@ -262,3 +336,13 @@ const getActionIcon = (actionName: string) => {
   return `pi ${icon}`;
 };
 </script>
+<style>
+.vue-pdf-embed {
+  @apply p-4;
+}
+.vue-pdf-embed > div {
+  @apply mb-4;
+  /* margin-bottom: 8px;
+    box-shadow: 0 2px 8px 4px rgba(0, 0, 0, 0.1); */
+}
+</style>

package/templates/nuxt/components/simpleApp/SimpleAppInput.vue.eta

@@ -134,6 +134,23 @@
       @change="onChange"
     />
 
+
+    <MultiSelect
+      v-model="modelValue"
+      :pt="pt"
+      v-else-if="SimpleAppInputType.selectmultiple == inputType"
+      :inputId="slotprops.uuid"
+      :path="setting.instancepath"
+      :readonly="isReadonly"
+      class="w w-full lg:w-full"
+      :disabled="isReadonly"
+      :options="getListOptions()"
+      optionLabel="label"
+      optionValue="value"
+      :placeholder="placeholder"
+      v-bind="componentProps"
+      @change="onChange"
+    />
     <!-- radio component -->
     <div v-else-if="inputType == SimpleAppInputType.radio">
       <div v-for="(item, index) in getListOptions()">
@@ -236,7 +253,6 @@
       :class="!pt ? 'w-full flex flex-col' : ''"
       :inputId="slotprops.uuid"
       @update:modelValue="onChange"
-      
       :path="setting.instancepath"
       v-bind="componentProps as InputNumber"
       :placeholder="placeholder"
@@ -288,6 +304,8 @@
       v-bind="componentProps as InputTextProps"
     />
     <!-- component require special treatment -->
+
+    <slot name="footer"></slot>
   </SimpleAppFieldContainer>
 </template>
 
@@ -443,10 +461,16 @@ const setFocus = (ev: any) => {
 };
 
 const getListOptions = () => {
-  const options = [];
-  if (props.setting.fieldsetting.enum) {
-    for (let i = 0; i < props.setting.fieldsetting.enum.length; i++) {
-      const v = props.setting.fieldsetting.enum[i];
+  const options = [];  
+  const enumlist = props.setting.fieldsetting.type == 'array' 
+      ? props.setting.fieldsetting.items.enum 
+      : props.setting.fieldsetting.enum 
+
+  
+
+  if (enumlist) {
+    for (let i = 0; i < enumlist.length; i++) {
+      const v = enumlist[i];
       if (typeof v == "string") {
         options.push({ value: v, label: t(v) });
       } else {
@@ -523,7 +547,6 @@ onMounted(() => {
 });
 
 const onChange = () => {
-  console.log("On change ", props.inputType)
   pt.value = undefined;
   resetcount.value++;
   emits("change", modelValue.value);

package/templates/nuxt/components/text/TextBold.vue._eta

@@ -0,0 +1,13 @@
+<template>
+  <div class="text-base font font-bold">
+    <slot name="default"></slot>
+  </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--
+ * last change 2024-04-24
+ * author: Ks Tan
+ */
+</script>

package/templates/nuxt/components/user/UserButtonCreateTenant.vue._eta

@@ -33,8 +33,15 @@
  */
 import { ref } from "vue";
 import { AxiosResponse } from "axios";
+import {EventType,NotificationStatus} from "~/types"
 const visible = ref(false);
-const data = ref({ tenantName: "" });
+const data = ref({
+  tenantName: "",
+  timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+  utcOffset: new Date().getTimezoneOffset()
+});
+
+
 
 const createtitle = ref("Create My Company");
 const errCreateTenant = ref();
@@ -55,7 +62,16 @@ const createTenant = async () => {
     })
     .catch((err) => {
       errCreateTenant.value = err["message"];
-      console.error("errCreateTenant", err);
+      console.error("errCreateTenant", err.response.data.data);
+
+      useNuxtApp().$event('Notification',{
+        documentName:'tenant',
+        status: NotificationStatus.error,
+        summary:t('createError'),
+        data:err.response?.data?.data
+
+      })
+
     })
     .finally(() => {
       onhold.value = false;

package/templates/nuxt/composables/getUserStore.generate.ts.eta

@@ -1,9 +1,11 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
+ * last change 2024-04-06
  * Author: Ks Tan
  */
+let orgLogo = ""
+
 export const getUserStore = ()=>{
     const {$userstore} = useNuxtApp()
     return $userstore
@@ -12,7 +14,7 @@ export const reloadUserStore = async () =>{
     const {$userstore} = useNuxtApp()
     await $userstore.loadRemoteUserInfo()
 }
-
+export const getCurrency = () =>getUserStore()?.currency ?? '$$'
 export const getUserProfile =  () =>{    
     const userstore = getUserStore()
     
@@ -36,4 +38,11 @@ export const canPerform = (resource:string,action:string):boolean =>{
 }
 
 export const getProfileEmail = () => getUserProfile()?.email
-export const getProfileFullName = () => getUserProfile()?.fullName
+export const getProfileFullName = () => getUserProfile()?.fullName
+
+export const refreshOrgLogo = async () => {
+  const logodata = await useNuxtApp().$OrganizationDoc().getApi().runGetlogo()
+  orgLogo = logodata.data
+}
+export const getOrgLogo = ()=> orgLogo
+export const setOrgLogo = (str:string) => orgLogo = str

package/templates/nuxt/composables/hotvalue.generate.ts.eta

@@ -0,0 +1,30 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-04-20
+ * Author: Ks Tan
+ */
+
+import { Channel } from "pusher-js"
+
+let channels: {[key:string]:Channel} = {}
+
+export const subscribeHotValueText=(eventName:string,callback:Function )=>{
+    const channelname = `[${getUserProfile()?.tenantId??0}]${eventName}`
+    channels[channelname]= useNuxtApp().$pusher.subscribe('text')
+    channels[channelname].bind(channelname,(msg:string)=>{
+        callback(msg)
+    })    
+}
+
+export const subsribeHotValueJson=(eventName:string,callback:Function )=>{
+    const channelname = `[${getUserProfile()?.tenantId??0}]${eventName}`
+    channels[channelname]= useNuxtApp().$pusher.subscribe('json')
+    channels[channelname].bind(channelname,(jsondata:any)=>{
+        callback(jsondata)
+    })    
+}
+
+export const clearChannel = () =>{
+    channels = {}
+}

package/templates/nuxt/composables/pusher.ts._eta

@@ -0,0 +1,13 @@
+/**
+ * This file was automatically generated by simpleapp generator.
+ * --remove-this-line-to-prevent-override--
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
+
+export const activatePusher =()=>{
+  clearChannel()
+  subscribeHotValueText(`messages:${getUserProfile()?.uid}`,async (msg:string)=>{
+      refreshDocumentList('systemmessage')      
+    })
+}

package/templates/nuxt/composables/stringHelper.generate.ts.eta

@@ -6,9 +6,9 @@
  */
 import _ from 'lodash'
 import {Md5} from 'ts-md5'
-import moment from "moment";
 import { v4 as uuidv4 } from 'uuid';
 
+let orgLogo = ""
 export const camelCaseToWords = (s: string) =>{
     const result = s.replace(/([A-Z])/g, ' $1');
     return result.charAt(0).toUpperCase() + result.slice(1);
@@ -18,8 +18,7 @@ export const randomUUID = ()=> uuidv4()
 export const md5=(s:string)=>  new Md5().appendStr(s).end()
 
 export const getAvatarLink = (email:string, size:number):string=>{
-  return `https://api.simbiz.cloud/cloudapi/avatar/${md5(email)}?size=${size}`
-  
+  return `https://api.simbiz.cloud/cloudapi/avatar/${md5(email)}?size=${size}`  
 }
 
 export const t = (txt:string,options?:any):string => !txt || txt.trim()=='' ? '' : useNuxtApp().$i18n.t(txt,options)

package/templates/nuxt/composables/sysmessage.generate.ts.eta

@@ -0,0 +1,20 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-03-24
+ * Author: Ks Tan
+ */
+import { Systemmessage } from "~/simpleapp/generate/openapi";
+
+let messages = ref<Systemmessage[]>([])
+export const systemMsgQty = computed(()=>messages.value.filter(item=>!item.read).length)
+export const sysMessage ={
+    download: async ()=> {
+        messages.value = await useNuxtApp().$SystemmessageDoc().search({})
+        console.log("Download messages",messages)
+        return messages.value
+    },
+    getMessages: () => messages.value
+}
+
+

package/templates/nuxt/composables/workflow.generate.ts.eta

@@ -1,13 +1,18 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
+ * last change 2024-03-24
  * Author: Ks Tan
  */
-import {UserTaskType} from '../types'
+// import {UserTaskApiSchema} from 
+// import {UserTaskType} from '../types'
+
+import { UserTaskApiSchema } from "~/simpleapp/generate/openapi"
+let taskslist:UserTaskApiSchema[] =[]
+
 export const getTaskList = async ()=>{
-    const tasks = await getWorkflowApi().getMyUserTask()
-    return tasks.data as UserTaskType[]
+    const tmp = await getWorkflowApi().getMyUserTask()
+    return taskslist
 }
 
 export const getTaskForm =  async (workflowName:string,elementId:string)=>{

package/templates/nuxt/layouts/mobile.vue._eta

@@ -1,72 +1,61 @@
 <template>
-    <div class="h-screen flex flex-col">
+    <div class="h-screen flex flex-col ">
         
         <div class="flex flex-col grow overflow-y-auto">
             <div class="flex flex-col mb-14 w-full">
-            <slot></slot>                          
-            </div>
-                        
-              
+                <ListMessages v-model="messagesVisible"/>
+                <UserInvitation/>
+                <slot></slot>                          
+            </div>                                      
         </div> 
         <!-- fixed -->
         <div v-if="getCurrentXorg()" class="flex h-16  border-t-2 dark:border-t-gray-700  text-3xl  flex-row   left-0 w-full  justify justify-between bottom-0 fixed z-50 bg-white dark:bg-slate-900 opacity opacity-95 " > 
-                <div v-for="item in menus">
-                    <NuxtLink v-if="item.path !== undefined"
-                        :class="`pi ${item.iconClass} p-4 cursor-pointer inline-block align-middle`"
-                        :to="getDocumentUrl(item.path)"
-                        >
-                            
-                    </NuxtLink>         
-                    <div v-else-if="item.command" :class="`pi ${item.iconClass} p-4 cursor-pointer inline-block align-middle`" @click="item.command">
-                    </div>       
+                <div v-if="getUserProfile()?.currentGroup=='teacher'" class="flex flex-row">
+                    <NuxtLink  :class="`pi pi-home p-4 cursor-pointer inline-block align-middle`" :to="getDocumentUrl('')" />
+                    <ButtonText  class="cursor-pointer inline-block align-middle" @click="openMessages">
+                        <i class="pi pi-envelope p-1" ></i>
+                        <Badge v-if="systemMsgQty" class="-ml-4" :value="systemMsgQty"></Badge>
+                    </ButtonText>
+                    <ButtonText  :class="`pi pi-user p-4 cursor-pointer inline-block align-middle`" @click="openProfile"/>
+                </div>
+                <div v-else  class="flex flex-row">
+                    <NuxtLink  :class="`pi pi-home p-4 cursor-pointer inline-block align-middle`" :to="getDocumentUrl('')" />
+                    
+                    <ButtonText  :class="`pi pi-bars p-4 cursor-pointer inline-block align-middle`" @click="openMenu"/>
+                    <ButtonText  class="cursor-pointer inline-block align-middle" @click="openMessages">
+                        <i class="pi pi-envelope p-1" ></i>
+                        <Badge v-if="systemMsgQty" class="-ml-4" :value="systemMsgQty"></Badge>
+                    </ButtonText>
+                    <ButtonText  :class="`pi pi-user p-4 cursor-pointer inline-block align-middle`" @click="openProfile"/>                    
                 </div>
                 
                 <HeaderButtonMenuPicker v-model="showMenu"></HeaderButtonMenuPicker>
                 <HeaderButtonProfile v-model="showProfile"/>
                 
         </div> 
-        <UserInvitation/>
+        
+        
         <!-- <HeaderBar class="border flex flex-row h-10 fixed left-0 w-full  justify justify-between top-0 z-50 bg-white  dark:bg-gray-800"/> -->
      
     </div>
+
 </template>
 <script setup lang="ts">
 /**
  * This file was automatically generated by simpleapp generator during initialization. It is changable.
- * last change 2024-02-22
+ * last change 2024-04-10
  * author: Ks Tan
  */
 const showMenu =ref(false)
 const showProfile =ref(false)
-
+const messagesVisible = ref(false)
 const openMenu = ()=>showMenu.value=true
 const openProfile = ()=>showProfile.value=true
+const openMessages=() => messagesVisible.value = true
+
+
 type MenuType = {iconClass:string,path?:string,command?:Function}
-type AllMenus = {[key:string]:MenuType[]}
-const menus=ref<MenuType[]>([])
-    // {iconClass:'pi-bars',path:'managestudents/profile'},
-const allmenus:AllMenus = {
-    admin:[
-            {iconClass:'pi-home dark:text-white',path:''},
-            //{iconClass:'pi-users  dark:text-white',path:'managestudents'},
-            //{iconClass:'pi-calendar dark:text-white',path:`manageclasses`},
-            {iconClass:'pi-bars dark:text-white',command: openMenu},    
-            {iconClass:'pi-user  dark:text-white',command: openProfile},            
-        ],
-    teacher: [{iconClass:'pi-home dark:text-white',path:''},
-            {iconClass:'pi-user  dark:text-white',command: openProfile},],
-    unknown:[]
-}
 
-const readGroup=()=>{    
-    if(getUserProfile()?.currentGroup) {
-        menus.value = allmenus[getUserProfile()?.currentGroup ?? 'unknown']
-    }
-}
 
-onMounted(()=>{    
-    readGroup()    
-    useNuxtApp().$listen('pickGroup',()=>readGroup())    
-})
 
-</script>
+</script>

package/templates/nuxt/nuxt.config.ts._eta

@@ -1,6 +1,6 @@
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator. 
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */