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

package/templates/nest/src/simpleapp/profile/profile.service.ts.eta

@@ -5,8 +5,8 @@
  * Author: Ks Tan
  */
 import { UserService, User } from './../services/user.service';
-import countrytimezone from 'countries-and-timezones'
-import countryToCurrency, { Currencies, Countries } from "country-to-currency";
+import countrytimezone from 'countries-and-timezones';
+import countryToCurrency, { Currencies, Countries } from 'country-to-currency';
 import {
   Injectable,
   Scope,
@@ -91,14 +91,14 @@ export class ProfileService {
     appuser: UserContext,
     tenantName: string,
     timeZone: string,
-    utcOffset: number
+    utcOffset: number,
   ) {
     // try{
-    const timezonedata = countrytimezone.getCountriesForTimezone(timeZone)[0]
-    const countryCode  = timezonedata['id']
-    const countryName  = timezonedata['name']
-    const currencyCode = countryToCurrency[countryCode]
-    
+    const timezonedata = countrytimezone.getCountriesForTimezone(timeZone)[0];
+    const countryCode = timezonedata['id'];
+    const countryName = timezonedata['name'];
+    const currencyCode = countryToCurrency[countryCode];
+
     appuser.getDBSession().startTransaction();
     const tenantdata: Tenant = {
       tenantId: 1,
@@ -245,4 +245,26 @@ export class ProfileService {
   async getSession(appuser: UserContext) {
     return 'OK';
   }
+
+  
+   async runTourComplete(appuser: UserContext, guideName: string) {
+    if (!guideName || guideName == '')
+      throw new BadRequestException('undefine guideName');
+
+    const user = await this.usersvc.findById(
+      appuser,
+      appuser.getId(),
+    );
+    if(!Array.isArray(user.completedTours)){
+        user.completedTours=[]
+      }
+
+    if (!user.completedTours.includes(guideName)) {
+      
+      user.completedTours.push(guideName);            
+      const res = await this.usersvc.findIdThenUpdate(appuser, user._id, user);
+    }
+
+    return 'ok';
+  }
 }

package/templates/nest/src/simpleapp/simpleapp.module.ts.eta

@@ -10,7 +10,7 @@ import {DocNumberFormatGenerator} from './generate/commons/docnogenerator.servic
 import { AuditTrail } from './generate/commons/audittrail.service';
 import { CloudapiModule } from 'src/cloudapi/cloudapi.module';
 import { PrintapiModule } from 'src/printapi/printapi.module';
-
+import { RunWebhookService } from 'src/simpleapp/generate/commons/runwebhook.service'
 import { UserResolverService } from './services/userresolver.service';
 // auto import modules
 <% for(let i=0;i<it.modules.length; i++){ %>
@@ -53,6 +53,7 @@ import { <%=capitalizeFirstLetter(bpmn)%>ListenerService } from 'src/simpleapp/w
   controllers: [<% for(let i=0;i<it.modules.length; i++){ %><%= it.modules[i].docname %>Controller,<%}%> ProfileController,WorkflowController],
   providers: [
     SimpleAppRobotUserService,
+    RunWebhookService,
     AuditTrail,DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %>
       <%= it.modules[i].docname %>Service,
       <%= it.modules[i].docname %>Resolver,

package/templates/nuxt/{app.vue._eta → app.vue.eta}

@@ -1,5 +1,7 @@
 <template>
-  <NuxtLayout :name="getLayout()">      
+  <NuxtLayout :name="getLayout()">     
+    <ConfirmDialog></ConfirmDialog>         
+    <DynamicDialog />
     <SessionBlock/>
     <OverlayHoldscreen/>
     <EventDocumentViewer></EventDocumentViewer>      

package/templates/nuxt/assets/css/calendar.css._eta

@@ -5,6 +5,9 @@
  * author: Ks Tan
  */
 /* calendar */
+.vuecal .p-button{
+  color: initial;
+}
 
 #monthviewcal .vuecal__cell--current,
 #monthviewcal .vuecal__cell--today {

package/templates/nuxt/assets/css/style.css._eta

@@ -9,7 +9,7 @@
    @apply bg-gray-100  dark:bg-slate-800 dark:text-gray-300
 }
 
-[disabled=true],input[disabled] ,input[readonly] ,textarea[readonly]{
+[disabled=true],input[disabled] ,input[readonly] ,textarea[readonly], .p-dropdown[readonly]{
     @apply bg-gray-300 dark:bg-gray-600
 }
 

package/templates/nuxt/assets/primevue/passthrough.ts._eta

@@ -24,7 +24,12 @@ const CustomTailwind = usePassThrough(
             root:{class:'bg-white dark:bg-gray-800  shadow p-2 rounded-2xl'},
             // title:{class:''},
             // header:{class:''}
-        },       
+        },     
+        fieldset:{
+            root:{class:'border p-2 mt-1'},
+            legend:{class:''},
+            content:{class:'p-2'}
+        },  
         // tabview:{
             // tabpanel:{
             //     headeraction:{class:'p-tabview-nav-link p-tabview-header-action items-center cursor-pointer flex overflow-hidden relative select-none text-decoration-none select-none border-b-2 p-5 font-bold rounded-t-md transition-shadow duration-200 m-0 transition-colors duration-200  bg-white border-blue-500 text-blue-500 dark:bg-gray-600 dark:border-blue-300 dark:text-blue-300'}

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

@@ -1,18 +1,34 @@
 <template>
-  <ButtonDefault v-if="!actionName" :animate="animate"
-    ><slot></slot>def</ButtonDefault
+  <ButtonDefault v-if="!actionName" :animate="animate">
+    <i :class="getIcon()" /><slot></slot>def</ButtonDefault
   >
   <ButtonPrimary
-    v-else-if="['create', 'update','print'].includes(actionName)"
+    v-else-if="['create', 'update', 'confirm'].includes(actionName)"
     :animate="animate"
-    ><slot></slot
+  >
+    <i :class="getIcon()" />
+    <slot></slot
   ></ButtonPrimary>
+
   <ButtonDanger
     v-else-if="['delete', 'void'].includes(actionName)"
     :animate="animate"
-    ><slot></slot
-  ></ButtonDanger>
-  <ButtonWarning v-else :animate="animate"><slot></slot></ButtonWarning>
+  >
+    <i :class="getIcon()" />
+    <slot></slot>
+  </ButtonDanger>
+  <ButtonWarning v-else-if="['draft'].includes(actionName)" :animate="animate">
+    <i :class="getIcon()" />
+    <slot></slot>
+  </ButtonWarning>
+  <ButtonSecondary v-else-if="actionName == 'print'">
+    <i :class="getIcon()" />
+    <slot></slot
+  ></ButtonSecondary>
+  <ButtonDefault v-else :animate="animate">
+    <i :class="getIcon()" />
+    <slot></slot
+  ></ButtonDefault>
 </template>
 <script setup lang="ts">
 /**
@@ -21,5 +37,31 @@
  * last change 2024-03-01
  * author: Ks Tan
  */
+
 const props = defineProps<{ actionName?: string; animate?: boolean }>();
+const getIcon = () => {
+  let cssname = "mr-1 pi ";
+  switch (props.actionName) {
+    case "create":
+    case "update":
+      cssname += "pi-save";
+      break;
+    case "delete":
+      cssname += "pi-trash";
+      break;
+    case "print":
+      cssname += "pi-file-pdf";
+      break;
+    case "confirm":
+      cssname += "pi-check";
+      break;
+    case "void":
+      cssname += "pi-file-excel";
+      break;
+    case "draft":
+      cssname += "pi-file-edit";
+      break;
+  }
+  return cssname;
+};
 </script>

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

@@ -1,12 +1,20 @@
 <template>
   <Button
     v-if="isMobile()"
-    :class="`w-full rounded-full text-center block dark:bg-danger-600 bg-danger-600 active:dark:bg-danger-400 text-white ${animate ? 'animate-bounce' :'' }`"
+    severity="danger"
+    :class="`w-full rounded-full text-center block  ${
+      animate ? 'animate-bounce' : ''
+    }`"
     @click="onActivate"
   >
     <slot></slot>
   </Button>
-  <Button v-else :class="`btn-danger ${animate ? 'animate-bounce' :'' }`" @click="onActivate">
+  <Button
+    v-else
+    severity="danger"
+    :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/button/ButtonDefault.vue._eta

@@ -1,12 +1,20 @@
 <template>
   <Button
     v-if="isMobile()"
-    :class="`w-full rounded-full text-center block dark:bg-gray-600 bg-gray-600 active:dark:bg-gray-400 text-white ${animate ? 'animate-bounce' :'' }`"
+    severity="secondary"
+    :class="`w-full rounded-full text-center block  ${
+      animate ? 'animate-bounce' : ''
+    }`"
     @click="onActivate"
   >
     <slot></slot>
   </Button>
-  <Button v-else :class="`btn-default ${animate ? 'animate-bounce' :'' }`" @click="onActivate">
+  <Button
+    v-else
+    severity="secondary"
+    :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/button/ButtonPrimary.vue._eta

@@ -1,12 +1,18 @@
 <template>
   <Button
     v-if="isMobile()"
-    :class="`w-full rounded-full text-center block dark:bg-primary-600 bg-primary-600 active:dark:bg-primary-400 text-white ${animate ? 'animate-bounce' :'' }`"
+    :class="`w-full rounded-full text-center block dark:bg-primary-600 bg-primary-600 active:dark:bg-primary-400 text-white ${
+      animate ? 'animate-bounce' : ''
+    }`"
     @click="onActivate"
   >
     <slot></slot>
   </Button>
-  <Button v-else :class="`btn-primary ${animate ? 'animate-bounce' :'' }`" @click="onActivate">
+  <Button
+    v-else
+    :class="`btn-primary ${animate ? 'animate-bounce' : ''}`"
+    @click="onActivate"
+  >
     <slot></slot>
   </Button>
 </template>
@@ -18,7 +24,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/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

@@ -1,13 +1,15 @@
 <template>
-    <div class="flex flex-col ">
-      <label v-if="label" :for="inputid">{{ label }}</label>
-      <Calendar 
-        v-model="modelValue" 
-        class="w-full" 
-        :inputid="inputid"
-        :date-format="getPrimevueCalendarDateFormat()"
-        />
-    </div>
+  <div class="flex flex-col">
+    <label v-if="label" :for="inputid">{{ label }}</label>
+    <Calendar
+      v-model="modelValue"
+      class="w-full"
+      :inputid="inputid"
+      :date-format="getPrimevueCalendarDateFormat()"
+      @update:modelValue="emits('change', modelValue)"
+      showButtonBar
+    />    
+  </div>
 </template>
 <script setup lang="ts">
 /**
@@ -16,9 +18,10 @@
  * last change 2024-04-16
  * author: Ks Tan
  */
-const modelValue = defineModel<Date>({required:true})
-const inputid=randomUUID()
+const modelValue = defineModel<Date>({ required: true });
+const inputid = randomUUID();
+const emits = defineEmits(["change"]);
 const props = defineProps<{
-    label?:string
-}>()
-</script>
+  label?: string;
+}>();
+</script>

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>