@simitgroup/simpleapp-generator 1.6.3-alpha → 1.6.4-alpha

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

@@ -0,0 +1,33 @@
+<template>
+  <Button
+    v-if="isMobile()"
+    severity="info"
+    :class="`w-full rounded-full text-center block ${
+      animate ? 'animate-bounce' : ''
+    }`"
+    @click="onActivate"
+  >
+    <slot></slot>
+  </Button>
+  <Button
+    v-else
+    severity="info"
+    :class="`${animate ? 'animate-bounce' : ''}`"
+    @click="onActivate"
+  >
+    <slot></slot>
+  </Button>
+</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
+ * author: Ks Tan
+ */
+const emits = defineEmits(["click"]);
+const props = defineProps<{ animate?: boolean }>();
+const onActivate = (e: Event) => {
+  emits("click", e);
+};
+</script>

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

@@ -2,17 +2,21 @@
   <Button
     v-if="isMobile()"
     @click="onActivate"
-    :class="`border-none dark:text-white active:text-primary-600 click:bg-gray-600 ${animate ? 'animate-bounce' :'' }`"
+    :class="`border-none dark:text-white active:text-primary-600 click:bg-gray-600 ${
+      animate ? 'animate-bounce' : ''
+    }`"
   >
     <slot></slot>
   </Button>
-  <Button
+  <div
     v-else
     @click="onActivate"
-    :class="`border-none dark:text-white active:text-primary-600 click:bg-gray-600 ${animate ? 'animate-bounce' :'' }`"
+    :class="`cursor-pointer p-3 border-none text-center dark:text-white active:text-primary-600 click:bg-gray-600 ${
+      animate ? 'animate-bounce' : ''
+    }`"
   >
     <slot></slot>
-  </Button>
+  </div>
 </template>
 <script setup lang="ts">
 /**
@@ -22,7 +26,7 @@
  * author: Ks Tan
  */
 const emits = defineEmits(["click"]);
-const props = defineProps<{animate?:boolean}>()
+const props = defineProps<{ animate?: boolean }>();
 let stopawhile = false;
 const onActivate = (e: Event) => {
   emits("click", e);

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

@@ -1,12 +1,20 @@
 <template>
   <Button
     v-if="isMobile()"
-    :class="`w-full rounded-full text-center block dark:bg-warning-600 bg-warning-600 active:bg-warning-400 text-white ${animate ? 'animate-bounce' :'' }`"
+    severity="warning"
+    :class="`w-full rounded-full text-center block ${
+      animate ? 'animate-bounce' : ''
+    }`"
     @click="onActivate"
   >
     <slot></slot>
   </Button>
-  <Button v-else :class="`btn-warn ${animate ? 'animate-bounce' :'' }`" @click="onActivate">
+  <Button
+    v-else
+    severity="warning"
+    :class="`${animate ? 'animate-bounce' : ''}`"
+    @click="onActivate"
+  >
     <slot></slot>
   </Button>
 </template>
@@ -18,7 +26,7 @@
  * author: Ks Tan
  */
 const emits = defineEmits(["click"]);
-const props = defineProps<{animate?:boolean}>()
+const props = defineProps<{ animate?: boolean }>();
 const onActivate = (e: Event) => {
   emits("click", e);
 };

package/templates/nuxt/components/calendar/CalendarInput.vue.eta

@@ -6,8 +6,9 @@
       class="w-full"
       :inputid="inputid"
       :date-format="getPrimevueCalendarDateFormat()"
-      @update:modelValue="emits('change',modelValue)"
-    />
+      @update:modelValue="emits('change', modelValue)"
+      showButtonBar
+    />    
   </div>
 </template>
 <script setup lang="ts">
@@ -19,7 +20,7 @@
  */
 const modelValue = defineModel<Date>({ required: true });
 const inputid = randomUUID();
-const emits = defineEmits(['change'])
+const emits = defineEmits(["change"]);
 const props = defineProps<{
   label?: string;
 }>();

package/templates/nuxt/components/calendar/CalendarSmall.vue.eta

@@ -1,4 +1,5 @@
 <template>
+<ClientOnly>
   <VueCal
     :id="id"
     class="w-full"
@@ -13,25 +14,24 @@
     @view-change="viewChange"
     :events="allevents"
     @cell-focus="chooseDate"
-
     xsmall
   >
     <template #today-button>
       <!-- Using Vuetify (but we prefer Wave UI 🤘) -->
-      <div      
-       @click="chooseDate(new Date(), true)">{{ t("today") }}</div>
+      <div @click="chooseDate(new Date(), true)">{{ t("today") }}</div>
     </template>
     <template #cell-content="{ cell, events }">
       <div>
         <div>
-          <s
-            v-if="dateExists(new Date(cell.formattedDate), alloffdays)"
-            v-tooltip="getHolidayName(new Date(cell.formattedDate))"
-            class="text text-red-400 font-bold"
-            >{{ cell.content }}</s
-          >
+          <s v-if="isHoliday(cell.formattedDate)"  v-tooltip="getHolidayName(new Date(cell.formattedDate))"
+            class="text text-red-400 dark:text-red-400 font-bold"
+            >{{ cell.content }}</s>
+          <div v-else-if="isOffDay(cell)" class="text-gray-400">
+            <s v-tooltip="t('offDay')">{{ cell.content }}</s>
+          </div>          
           <span v-else>{{ cell.content }} </span>
         </div>
+
         <div>
           <slot name="default" :cell="cell" :events="events">
             <Badge
@@ -45,6 +45,7 @@
       </div>
     </template>
   </VueCal>
+</ClientOnly>
 </template>
 <script lang="ts" setup generic="T">
 /**
@@ -66,24 +67,25 @@ const viewStatus = ref<CalViewChange>();
 const props = defineProps<{
   id: string;
   items: CalEventType<T>[];
-  offdays: OffDay[];
+  holidays: OffDay[];
 }>();
+const offdays = ref<string[]>([]);
 const emits = defineEmits(["chooseDate", "rightClick"]);
-const alloffdays = computed(() => props.offdays.map((item) => item.date));
+// const allholidays = computed(() => props.holidays.map((item) => item.date));
 const selectedDate = defineModel<Date>({ required: true });
 const getHolidayName = (date: Date) =>
-  props.offdays.find((item) => item.date.getTime() == date.getTime())?.title;
+  props.holidays.find((item) => item.date.getTime() == date.getTime())?.title;
 const allevents = computed(() => {
   const list = props.items.map((item) => {
     if (item.start instanceof Date)
       item.start = item.start.format("YYYY-MM-DD HH:mm");
-    else if (typeof item.start == 'string' ){
-      item.start = item.start.substring(0,16).replace('T',' ');
+    else if (typeof item.start == "string") {
+      item.start = item.start.substring(0, 16).replace("T", " ");
     }
     if (item.end instanceof Date)
       item.end = item.end.format("YYYY-MM-DD HH:mm");
-    else if (typeof item.end == 'string' ){
-      item.end = item.end.substring(0,16).replace('T',' ');
+    else if (typeof item.end == "string") {
+      item.end = item.end.substring(0, 16).replace("T", " ");
     }
     return item;
   });
@@ -93,6 +95,17 @@ const viewChange = (event: CalViewChange) => {
   viewStatus.value = event;
 };
 
+const isHoliday = (datestr: string) => {
+  return props.holidays.find(
+    (item) => item.date.format("YYYY-MM-DD") == datestr,
+  );
+};
+const isOffDay = (cell: any) => {
+  
+  const dayname: string = new Date(cell.formattedDate) .toLocaleString("en", { weekday: "short" }).toLowerCase();
+  if (offdays.value.includes(dayname)) return true;
+  else return false;
+};
 const chooseDate = (date1: Date, force?: boolean) => {
   if (force || !viewStatus.value || viewStatus.value.view == "month") {
     selectedDate.value = date1;
@@ -102,4 +115,8 @@ const chooseDate = (date1: Date, force?: boolean) => {
 const onRightClickDate = (e: MouseEvent, cell: CalRightClickEvent) => {
   emits("rightClick", e, cell);
 };
+
+onMounted(() => {
+  offdays.value = getCurrentBranch()?.branch.offdays ?? [];
+});
 </script>

package/templates/nuxt/components/chart/card.vue._eta

@@ -1,5 +1,5 @@
 <template >
-    <div class="rounded-lg  h-20 p-2" @click="showCartDialog">
+    <div class="rounded-lg  p-2" @click="showCartDialog">
         <div class="line-clamp-1 text-sm md:text-base">{{ title }}</div>
         <div class="text text-2xl md:text-3xl text-right">
             <slot name="default"></slot>

package/templates/nuxt/components/debug/DebugDocumentData.vue.eta

@@ -1,41 +1,51 @@
 <template>
-    <div :class="`p-0 absolute bg-yellow-200 bottom-100 right-0`" v-if="isdebug=='1'">
-        <button @click="visible=true"  class=" text-white text-xs bg-warning-800 p-0 m-0">
-            <i class="pi pi-code"></i>{{ label }}</button>      
-        <Sidebar v-model:visible="visible" class="text-red-100">
-            
-            <template #header >
-                <h1 class="text-gray-700 text-lg font-bold content-center">{{ label }} Data</h1>    
-            </template>
-            <template #default>                
-                <pre class="border rounder-lg m-0 p-0 dark:bg-gray-500">{{ modelValue }}
-                </pre>                
-            </template>
-                
-        </Sidebar>
-
+  <div :class="`p-0  bg-yellow-200 dark:bg-yellow-700 rounded-lg border`" v-if="isdebug == '1'">
+    <div
+      @click="visible = true"
+      class="cursor-pointer text-xs p-0 m-0 flex flex-col p-2 text-center"
+    >
+      <i class="pi pi-code"></i>
+      <span>{{ label }}</span>
     </div>
-        
+    <Sidebar
+      v-model:visible="visible"
+      :pt="{ root: { class: 'w-5/6' } }"
+      class="text-red-100"
+    >
+      <template #header>
+        <h1 class="text-gray-700 text-lg font-bold content-center">
+          {{ label }} Data
+        </h1>
+      </template>
+      <template #default>
+        <pre class="border rounder-lg m-0 p-0 bg-gray-500 text-white"
+          >{{ modelValue }}
+                </pre
+        >
+      </template>
+    </Sidebar>
+  </div>
 </template>
 
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator during initialization. 
+ * This file was automatically generated by simpleapp generator during initialization.
  * IT IS NOT CHANGABLE
  * last change 2024-02-22
  * author: Ks Tan
  */
 // import Panel from 'primevue/panel';
 // import ScrollPanel from 'primevue/scrollpanel';
-import Dialog from 'primevue/dialog';
-import Sidebar from 'primevue/sidebar';
+import Dialog from "primevue/dialog";
+import Sidebar from "primevue/sidebar";
 
-import {ref} from 'vue'
-const modelValue = defineModel()
-const isdebug = ref(useRuntimeConfig().public.DEBUGDATA)
-const visible = ref(false)
-const props = withDefaults(defineProps<{label?:string}>(),{label:'label'})
-const buttonlabel = computed(()=>props.label??'debug')
+import { ref } from "vue";
+const modelValue = defineModel();
+const isdebug = ref(useRuntimeConfig().public.DEBUGDATA);
+const visible = ref(false);
+const props = withDefaults(defineProps<{ label?: string }>(), {
+  label: "label",
+});
+const buttonlabel = computed(() => props.label ?? "debug");
 const op = ref();
-
 </script>

package/templates/nuxt/components/event/EventDocumentViewer.vue._eta

@@ -35,14 +35,12 @@
 <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
  */
 import { onKeyStroke } from "@vueuse/core";
 import { useDialog } from "primevue/usedialog";
 import { defineAsyncComponent } from "vue";
-
 import { ViewRecord, FormCrudEvent } from "~/types";
 // import TabView from 'primevue/tabview';
 import Chip from "primevue/chip";
@@ -57,6 +55,7 @@ const lastDocumentName = computed(() => {
 });
 const { $listen } = useNuxtApp();
 const visible = ref(false);
+const autodeletetab = ref(true);
 const allview = ref<{ [key: string]: ViewRecord }>({});
 const after = (
   v: ViewRecord,
@@ -65,10 +64,12 @@ const after = (
   result: any,
 ) => {
   if (v.after) {
-    v.after(eventType, data);
-
+    v.after(eventType, data, visible);
+    console.log("eventTypeeventType",eventType,"setting['autoclose'] ",autodeletetab.value)
     //only after mount consider no remove tab
-    if (eventType != "mount") deleteTab();
+    if (eventType == "mount") return
+    
+    deleteTab();
   }
 };
 
@@ -80,18 +81,30 @@ onKeyStroke("Escape", (e) => {
 const deleteTab = () => {
   const keys = Object.keys(allview.value);
   const lastkey = keys[keys.length - 1];
-  delete allview.value[lastkey];
+  console.log("Trigger delete tab")
+  if (keys.length == 1) {
+    const callback = allview.value[lastkey]?.after;
+    if (typeof callback == "function") {
+      callback(FormCrudEvent.exit, undefined, visible);
+    }
 
-  // updateprops.value++
-  if (Object.keys(allview.value).length == 0) {
-    visible.value = false;
-    useNuxtApp().$event("CloseDialog", "viewer");
-    return;
+    if(autodeletetab.value){
+      delete allview.value[lastkey];
+      visible.value = false;
+      useNuxtApp().$event("CloseDialog", "viewer");  
+    }
+    
+  }else{
+    console.log("Trigger delete tab2")
+    delete allview.value[lastkey];
   }
 };
 
 $listen("ViewRecord", (setting) => {
   visible.value = true;
+  if (setting["autoclose"] != undefined) {
+    autodeletetab.value = setting["autoclose"] ==0 ? false : true;
+  }
   allview.value[setting.eventId] = setting;
 });
 
@@ -113,11 +126,21 @@ $listen("CloseDialog", (documentName: string) => {
 // });
 //
 const clearView = () => {
+  const firstId = Object.keys(allview.value)[0];
+  console.log("clear view", allview.value);
+  const callback = allview.value[firstId]?.after;
+  if (typeof callback == "function") {
+    callback(FormCrudEvent.exit, undefined, visible);
+  }
   allview.value = {};
 };
-
+// watch(visible,()=>{
+//       if(visible.value==false){
+//         v.after(FormCrudEvent.exit, data,visible);
+//       }
+//     })
 watch(visible, () => {
-  if (visible.value == false) {
+  if (!visible.value) {
     clearView();
   }
 });

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

@@ -7,9 +7,7 @@
         :document="doc"
         @on="actionListener"
       ></SimpleAppFormToolBar>
-      <div
-        class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4 p-2"
-      >
+      <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 p-2">
         <SimpleAppInput
           :input-type="SimpleAppInputType.text"
           :setting="o.getField('#/properties/branchName')"
@@ -27,7 +25,53 @@
           :setting="o.getField('#/properties/active')"
           v-model="data.active"
         />
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.selectmultiple"
+          :setting="o.getField('#/properties/offdays')"
+          v-model="data.offdays"
+        />
+
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.text"
+          :setting="o.getField('#/properties/street1')"
+          v-model="data.street1"
+        />
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.text"
+          :setting="o.getField('#/properties/street2')"
+          v-model="data.street2"
+        />
 
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.text"
+          :setting="o.getField('#/properties/postcode')"
+          v-model="data.postcode"
+        />
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.text"
+          :setting="o.getField('#/properties/city')"
+          v-model="data.city"
+        />
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.text"
+          :setting="o.getField('#/properties/region')"
+          v-model="data.region"
+        />
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.text"
+          :setting="o.getField('#/properties/country')"
+          v-model="data.country"
+        />
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.text"
+          :setting="o.getField('#/properties/tel')"
+          v-model="data.tel"
+        />
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.text"
+          :setting="o.getField('#/properties/email')"
+          v-model="data.email"
+        />
         <SimpleAppInput
           :input-type="SimpleAppInputType.textarea"
           :setting="o.getField('#/properties/description')"
@@ -41,8 +85,7 @@
 
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator during initialization. 
- * --remove-this-line-to-prevent-override--
+ * This file was automatically generated by simpleapp generator during initialization.
  * last change 2024-02-22
  * author: Ks Tan
  */
@@ -69,6 +112,10 @@ const getRecord = async () => {
     await doc.getById(id.value);
   } else {
     newData();
+    data.value.organization={
+      _id:getUserProfile()?.orgRecordId,
+      label:getUserProfile()?.orgName
+    }
   }
 };
 

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

@@ -8,13 +8,21 @@
         @on="actionListener"
       ></SimpleAppFormToolBar>
       <div
-        class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4 p-2"
+        class="grid grid-cols-1 lg:grid-cols-2 gap-4 p-2"
       >
         <SimpleAppInput
           :input-type="SimpleAppInputType.autocomplete"
           :setting="o.getField('#/properties/branch')"
           v-model="data.branch"
         />
+        <SimpleAppInput
+          :readonly="!doc.isNew()"
+          :input-type="SimpleAppInputType.select"
+          :setting="o.getField('#/properties/docNoType')"
+          :options="getAllDocFormats().map((item) => item.docType)"
+          v-model="data.docNoType"
+        />
+
 
         <SimpleAppInput
           :input-type="SimpleAppInputType.text"
@@ -39,14 +47,7 @@
           v-model="data.default"
         />
 
-        <SimpleAppInput
-          :readonly="!doc.isNew()"
-          :input-type="SimpleAppInputType.select"
-          :setting="o.getField('#/properties/docNoType')"
-          :options="getAllDocFormats().map((item) => item.docType)"
-          v-model="data.docNoType"
-        />
-
+        
         <SimpleAppInput
           :input-type="SimpleAppInputType.text"
           :setting="o.getField('#/properties/docNoPattern')"
@@ -91,7 +92,10 @@ const id = computed(() => props._id ?? "");
 
 /************ start default methods ****************/
 
-const newData = () => doc.setNew();
+const newData = () => {
+  doc.setNew()
+  delete data.value.branch
+}
 
 const getRecord = async () => {
   if (id.value && id.value != "new") {

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

@@ -8,7 +8,7 @@
     <TabView lazy>
       <TabPanel :header="t('profile')">
         <div
-          class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4 p-2"
+          class="grid grid-cols-1 lg:grid-cols-2 gap-4 p-2"
         >
           <SimpleAppInput
             :input-type="SimpleAppInputType.text"