@simitgroup/simpleapp-generator 1.3.4-alpha → 1.4.0-alpha

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

@@ -10,6 +10,7 @@
     :instancepath="instancepath"
     :error="error"
     #default="slotprops"
+    :resetcount="resetcount"
   >
     <Checkbox
       v-if="inputType == SimpleAppInputType.checkbox"
@@ -82,6 +83,22 @@
       v-bind="componentProps as CalendarProps"
     />
 
+    <Calendar
+      :pt="pt"
+      v-else-if="inputType == SimpleAppInputType.datetime"
+      :inputId="slotprops.uuid"
+      :path="setting.instancepath"
+      v-model="datetimevalue"
+      @update:modelValue="updateDateTime"
+      :touchUI="isMobile()"
+      showButtonBar
+      :readonly="isReadonly"
+      :placeholder="placeholder"
+      :date-format="getDateFormat()"
+      showTime 
+      hourFormat="12"
+      v-bind="componentProps as CalendarProps"
+    />
     <!-- select/list component -->
     <Listbox
       v-model="modelValue"
@@ -299,13 +316,14 @@ import Rating, { RatingProps } from "primevue/rating";
 import Slider, { SliderProps } from "primevue/slider";
 import Textarea, { TextareaProps } from "primevue/textarea";
 import { SimpleAppInputType } from "~/types";
-
+const resetcount = ref(0);
 const instancepath = ref("");
 const modelValue = defineModel({ required: true });
 
 const datevalue = ref<Date>();
+const datetimevalue = ref<Date>();
 const timevalue = ref<Date>();
-let watchOnChange=0
+let watchOnChange = 0;
 const props = withDefaults(
   defineProps<{
     inputType: SimpleAppInputType;
@@ -340,6 +358,11 @@ if (props.inputType == SimpleAppInputType.date && modelValue.value) {
 } else {
   datevalue.value = undefined;
 }
+if (props.inputType == SimpleAppInputType.datetime && modelValue.value) {
+  datetimevalue.value = stringToDate(<string>modelValue.value); 
+} else {
+  datetimevalue.value = undefined;
+}
 
 if (props.inputType == SimpleAppInputType.time) {
   if (modelValue.value) {
@@ -367,7 +390,7 @@ watch(props.setting.errors, (newvalue, oldvalue) => {
     errmsg = "";
   }
   if (errmsg != "") {
-    const errorstyle = { style: "border-color: lightcoral; color:white " };
+    const errorstyle = { style: "border-color: lightcoral; color:lightcoral " };
     if (!pt.value) pt.value = {};
 
     if (props.inputType == SimpleAppInputType.text)
@@ -394,7 +417,7 @@ const isReadonly = computed(() => {
 const updateTime = (value: Date) => {
   value.setSeconds(0);
   modelValue.value = dateToTimeString(value);
-  onChange()
+  onChange();
 };
 const updateDate = (value: any) => {
   if (value) {
@@ -402,8 +425,16 @@ const updateDate = (value: any) => {
   } else {
     modelValue.value = "";
   }
-  onChange()
+  onChange();
 };
+const updateDateTime = (value:any)=>{
+  if (value) {
+    modelValue.value = dateToISOString(value);
+  } else {
+    modelValue.value = "";
+  }
+  onChange();
+}
 
 const setFocus = (ev: any) => {
   if (!isMobile()) ev.target.select();
@@ -445,7 +476,15 @@ watch(modelValue, (newvalue: any) => {
     } else {
       timevalue.value = undefined;
     }
-  } else if (props.inputType == SimpleAppInputType.time) {
+  
+  } else if (props.inputType == SimpleAppInputType.datetime) {
+    if (modelValue.value) {
+      datetimevalue.value = stringToDate(modelValue.value as string);
+    } else {
+      timevalue.value = undefined;
+    }
+  }
+   else if (props.inputType == SimpleAppInputType.time) {
     if (modelValue.value) {
       timevalue.value = stringToDate(
         (today() + "T" + modelValue.value) as string,
@@ -454,8 +493,6 @@ watch(modelValue, (newvalue: any) => {
       timevalue.value = undefined;
     }
   }
- 
-  
 });
 onMounted(() => {
   if (
@@ -468,6 +505,12 @@ onMounted(() => {
     } else {
       datevalue.value = undefined;
     }
+  } else  if (props.inputType == SimpleAppInputType.datetime) {
+    if (modelValue.value) {
+      datetimevalue.value = stringToDate(modelValue.value as string);
+    } else {
+      datetimevalue.value = undefined;
+    }
   } else if (props.inputType == SimpleAppInputType.time) {
     if (modelValue.value) {
       timevalue.value = stringToDate(
@@ -477,12 +520,13 @@ onMounted(() => {
       timevalue.value = undefined;
     }
   }
-  
 });
 
-const onChange=()=>{
-  emits("change",  modelValue.value); 
-}
+const onChange = () => {
+  pt.value = undefined;
+  resetcount.value++;
+  emits("change", modelValue.value);
+};
 
 /************ start autocomplete only ***************/
 

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

@@ -2,11 +2,11 @@
   <div>
     <div class="mt-8 md:flex justify-start md:gap-4">
       <form @submit.prevent="true" class="w-full">
-        <div>{{ t('createNewCompany') }}</div>
+        <div>{{ t("createNewCompany") }}</div>
         <div class="p-inputgroup flex flex-row">
           <InputText
             class="flex-1"
-            :placeholder="t('yourCompanyName')"
+            :placeholder="t('enterYourCompanyName')"
             v-model:model-value="data.tenantName"
           />
           <div class="p-inputgroup-addon p p-0">
@@ -21,10 +21,7 @@
           </div>
         </div>
       </form>
-
     </div>
-
-  
   </div>
 </template>
 <script setup lang="ts">
@@ -46,7 +43,6 @@ const onhold = ref(false);
 const createTenant = async () => {
   onhold.value = true;
 
-
   getPorfileApi()
     .createTenant(data.value)
     .then((res: AxiosResponse) => {

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

@@ -1,7 +1,7 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
+ * last change 2024-03-08
  * Author: Ks Tan
  */
 export const setDateLocale = (localename:string) =>  useDayjs().locale(localename)
@@ -15,11 +15,13 @@ export const getDayJs = ()=>useDayjs()
 export const lastDateOfMonth = (datestr:string) =>  useDayjs()(datestr).endOf('month').format('YYYY-MM-DD');
 export const today = () => useDayjs()().format('YYYY-MM-DD')
 export const dateToString = (date:Date) => useDayjs()(date).format('YYYY-MM-DD')
+export const dateToISOString = (date:Date) => useDayjs()(date).toISOString()
 export const dateToTimeString = (date:Date) => useDayjs()(date).format('HH:mm:ss')
 export const stringToDate = (datestr:string) => new Date(datestr)
 export const dateToDateTimeString = (date:Date)=> useDayjs()(date).format('YYYY-MM-DD HH:mm:ss')
 export const toLocalDate = (date:string | Date)=> useDayjs()(date).format(getDateFormat())
 export const getDateFormat = ():string=> 'DD-MM-YYYY'
+export const calculateHourDifferent = (date1:Date, date2:Date) => (date1.getTime() - date2.getTime())/60/60/1000
 export const getPrimevueCalendarDateFormat = () => {
   const country = <string>getUserProfile()?.country
   return 'dd/mm/yy'

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

@@ -5,7 +5,10 @@
  * Author: Ks Tan
  */
 export const getDocumentUrl = (document:string,id?:string,querystr?:string)=>{
-    let path = `/${getCurrentXorg()}/${document}`
+    
+    let path = useRoute().path.includes('/mobile/') || isMobile() ? 
+            `/${getCurrentXorg()}/mobile/${document}`
+                : `/${getCurrentXorg()}/${document}`
     if(id){
         path = path + '/'+id
     }

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

@@ -1,8 +1,19 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
+ * last change 2024-03-07
  * Author: Ks Tan
  */
 export const refreshDocumentList = (docName:string)=>useNuxtApp().$event('RefreshDocumentList',{documentName:docName})
-export const refreshDocument = (docName:string)=>useNuxtApp().$event('RefreshDocument',docName)
+export const refreshDocument = (docName:string)=>useNuxtApp().$event('RefreshDocument',docName)
+
+export const listenDocument =  (docName:string,callback:Function) =>{
+    useNuxtApp().$listen('RefreshDocument',async (eventdocname:string)=>{
+        if(eventdocname==docName) await callback()
+    })
+}
+export const listenDocumentList =  (docName:string,callback:Function) =>{
+    useNuxtApp().$listen('RefreshDocumentList',async (eventdata)=>{
+        if(eventdata.documentName == docName) await callback()
+    })
+}

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

@@ -9,7 +9,7 @@
               
         </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-800 opacity opacity-95 " > 
+        <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`"
@@ -33,7 +33,6 @@
 <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
  * author: Ks Tan
  */
@@ -42,17 +41,32 @@ const showProfile =ref(false)
 
 const openMenu = ()=>showMenu.value=true
 const openProfile = ()=>showProfile.value=true
-const menus=[
+type MenuType = {iconClass:string,path?:string,command?:Function}
+type AllMenus = {[key:string]:MenuType[]}
+const menus=ref<MenuType[]>([])
     // {iconClass:'pi-bars',path:'managestudents/profile'},
-    {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-chart-pie dark:text-white',path:'reports'},
-    {iconClass:'pi-bars dark:text-white',command: openMenu},    
-    {iconClass:'pi-user  dark:text-white',command: openProfile},
-    // {iconClass:'pi-database',path:'managedata'},
-    
-]
+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>

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

@@ -1,8 +1,8 @@
 /**
- * This file was automatically generated by simpleapp generator during initialization. It is changable.
- * --remove-this-line-to-prevent-override--
- * last change 2024-02-22
- * author: Ks Tan
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
  */
 import path from 'path'
 export default defineNuxtConfig({
@@ -27,6 +27,15 @@ export default defineNuxtConfig({
         }
     }
 },
+app: {
+  // pageTransition: {
+    // name: 'slide-fade',
+    // mode: 'out-in',
+    // css: false,
+    
+  // },
+  // layoutTransition: { name: 'layout', mode: 'default' }
+},
 tailwindcss: {
     // Options
   },
@@ -36,7 +45,7 @@ devServer: {
   modules: [
     // "@hebilicious/authjs-nuxt",
     '@nuxtjs/color-mode',
-     '@nuxtjs/device',
+    '@nuxtjs/device',
     '@nuxtjs/i18n',
     'dayjs-nuxt',
     '@sidebase/nuxt-auth',
@@ -52,19 +61,18 @@ devServer: {
         ['defineStore', 'definePiniaStore'], // import { defineStore as definePiniaStore } from 'pinia'
       ],
     }],
-    
-    
-
-  ], 
+  ],  
+  dayjs:{
+    plugins: [ 'utc', 'duration']
+  },
   device: {
     refreshOnResize: true
-  }, 
+  },
   i18n: {
     lazy: true,
     langDir: "lang/",
     strategy: "no_prefix",
-    locales: [
-  
+    locales: [    
       {
         code: "en",
         iso: "en",
@@ -82,17 +90,18 @@ devServer: {
     defaultLocale: "en",    
   },
   primevue: {
+    
     options: {
-      //unstyled: true,
       ripple: true,
-      inputStyle: 'filled'
+      inputStyle: 'filled',
+    
     }, 
     components: {
       include: '*',      
-      exclude: ['chart']
+      // exclude: ['chart']
     }, 
     directives: {
-      include: ['Ripple', 'Tooltip','BadgeDirective','FocusTrap']
+      include: ['Ripple', 'Tooltip','Badge','FocusTrap']
     },
     cssLayerOrder: 'tailwind-base, primevue, tailwind-utilities',
     importPT: { as: 'SimpleAppPT', from:  path.resolve(__dirname,'./assets/primevue/passthrough.ts') },
@@ -105,9 +114,6 @@ devServer: {
   auth: {
     globalAppMiddleware: false
   },
-  dayjs:{
-    plugins: [ 'utc', 'duration']
-  },
   // security: {
     // corsHandler:{
       //  origin: '*' //| 'null' | (string | RegExp)[] | ((origin: string) => boolean);
@@ -136,10 +142,11 @@ devServer: {
   css: [ 
     'primeicons/primeicons.css',
     path.resolve(__dirname,'./assets/css/style.css'),
+    path.resolve(__dirname,'./assets/css/listview.css'),
     path.resolve(__dirname,'./assets/css/calendar.css'),
     ],        
   },
-
+  
   // devtools: { enabled: true },
   // build: {
   //               // transpile: ["primevue"]

package/templates/nuxt/pages/[xorg]/{user/index.vue.eta → docnoformat/[id].vue.eta}

@@ -1,21 +1,20 @@
 <template>
-  <Crud _id="" @after="after" />
+  <LazyFormDocnoformat :_id="_id" @after="after" />
 </template>
 
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
- * Author: Ks Tan
+ * This file was automatically generated by simpleapp generator.
+ * last change 2023-09-09
+ * author: Ks Tan
  */
-import Crud from "./form.vue";
-import { User } from "~/simpleapp/generate/types";
 
-const doc = useNuxtApp().$UserDoc();
+import { Docnoformat } from "~/simpleapp/generate/types";
+const doc = useNuxtApp().$DocnoformatDoc();
 
 const props = defineProps<{ _id: string }>();
-const after = (actionName: string, data: User, result: any) => {
+const after = (actionName: string, data: Docnoformat) => {
+  console.log("Docnoformat capture after emits ", actionName);
   switch (actionName) {
     case "new":
       goTo(doc.getDocName(), "new");
@@ -23,13 +22,16 @@ const after = (actionName: string, data: User, result: any) => {
     case "create":
       goTo(doc.getDocName(), data._id);
       refreshDocumentList(doc.getDocName());
+      useNuxtApp().$event("CloseDialog", doc.getDocName().toLowerCase());
       break;
     case "update":
       refreshDocumentList(doc.getDocName());
+      useNuxtApp().$event("CloseDialog", doc.getDocName().toLowerCase());
       break;
     case "delete":
       goTo(doc.getDocName(), "new");
       refreshDocumentList(doc.getDocName());
+      useNuxtApp().$event("CloseDialog", doc.getDocName().toLowerCase());
       break;
   }
 };

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

@@ -1,28 +1,59 @@
 <template>
-  <div class="grid grid-cols-5 p-4">
-    <title>{{ t('docnoformat')}} </title>
-    <ListView
-      :list="getAllDocFormats()"
-      idField="docType"
-      titleField="docName"
-      subTitleField="docType"
-      :withFilter="true"
-      :url="getDocumentUrl('docnoformat')"
-    ></ListView>
-    <div class="col-span-4">
-      <NuxtPage></NuxtPage>
-    </div>
-  </div>
+  <PageDocList
+    :document="doc"
+    :columns="columns"
+    :data="docdata"
+    :sorts="sorts"
+  >
+    <template #mobileList="{ item }">
+      <!-- <div class="flex flex-row justify justify-end"> -->
+        <div class="flex flex-col flex-1">
+          <text-primary>{{ item.docNoFormatName }}</text-primary>
+          <div class="flex flex-row gap-2">
+            <text-subtitle>{{ item.docNoPattern }}</text-subtitle>
+            <renderer-boolean v-model="item.active"/>
+          
+          </div>
+        </div>
+        <div class="flex flex-col text-right">
+          <text-subtitle>{{ item.docNoType }}</text-subtitle>
+          <text-subtitle>{{ item.nextNumber }}</text-subtitle>          
+          
+        </div>
+      <!-- </div> -->
+    </template>
+    <template #dataTableColumns>
+    </template>
+    <template #default
+      ><div><NuxtPage :_id="id ?? 'new'" /></div
+    ></template>
+  </PageDocList>
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
- * Author: Ks Tan
+ * This file was automatically generated by simpleapp generator.
+ * last change 2023-09-09
+ * author: Ks Tan
  */
+
+
+const doc = useNuxtApp().$DocnoformatDoc()
+const docdata = doc.getReactiveData();
+
 definePageMeta({
   menuPath: "setting/docnoformat",
-  })
-</script>
+});
 
+const columns = [
+  "docNoFormatNo",
+  "docNoFormatName",
+  "active",
+  "docNoType",
+  "docNoPattern",
+  "nextNumber",
+];
+
+const sorts: string[][] = [["docNoType", "asc"],["docNoFormatNo","asc"]];
+
+const id = computed(() => useRoute().params.id);
+</script>

package/templates/nuxt/pages/[xorg]/mobile/docnoformat/index.vue.eta

@@ -0,0 +1,59 @@
+<template>
+  <PageDocList
+    :document="doc"
+    :columns="columns"
+    :data="docdata"
+    :sorts="sorts"
+  >
+    <template #mobileList="{ item }">
+      <!-- <div class="flex flex-row justify justify-end"> -->
+        <div class="flex flex-col flex-1">
+          <text-primary>{{ item.docNoFormatName }}</text-primary>
+          <div class="flex flex-row gap-2">
+            <text-subtitle>{{ item.docNoPattern }}</text-subtitle>
+            <renderer-boolean v-model="item.active"/>
+          
+          </div>
+        </div>
+        <div class="flex flex-col text-right">
+          <text-subtitle>{{ item.docNoType }}</text-subtitle>
+          <text-subtitle>{{ item.nextNumber }}</text-subtitle>          
+          
+        </div>
+      <!-- </div> -->
+    </template>
+    <template #dataTableColumns>
+    </template>
+    <template #default
+      ><div><NuxtPage :_id="id ?? 'new'" /></div
+    ></template>
+  </PageDocList>
+</template>
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp generator.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+
+
+const doc = useNuxtApp().$DocnoformatDoc()
+const docdata = doc.getReactiveData();
+
+definePageMeta({
+  menuPath: "setting/docnoformat",
+});
+
+const columns = [
+  "docNoFormatNo",
+  "docNoFormatName",
+  "active",
+  "docNoType",
+  "docNoPattern",
+  "nextNumber",
+];
+
+const sorts: string[][] = [["docNoType", "asc"],["docNoFormatNo","asc"]];
+
+const id = computed(() => useRoute().params.id);
+</script>

package/templates/nuxt/pages/[xorg]/mobile/index.vue._eta

@@ -0,0 +1,19 @@
+<template>
+  <div class="frontpage-container">
+    <client-only>
+      <title>{{ getUserProfile()?.branchName }}</title>
+    </client-only>
+    <h1 class="border text-3xl text-center m-20 p-20">
+      {{ t("createYourContentHere") }}
+    </h1>
+  </div>
+</template>
+<script lang="ts" setup>
+/**
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
+ * last change 2024-02-22
+ * author: Ks Tan
+ */
+useNuxtApp().$event('SetTitle',t('home'))
+</script>