@simitgroup/simpleapp-generator 1.6.6-j-alpha → 1.6.6-k.1-alpha

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

@@ -8,8 +8,6 @@ import { Module } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import {DocNumberFormatGenerator} from './generate/commons/docnogenerator.service'
 import { AuditTrail } from './generate/commons/audittrail.service';
-import { CloudapiModule } from '../cloudapi/cloudapi.module';
-import { PrintapiModule } from '../printapi/printapi.module';
 import { RunWebhookService } from '../simpleapp/generate/commons/runwebhook.service'
 import { UserResolverService } from './services/userresolver.service';
 // auto import modules
@@ -34,24 +32,26 @@ import { <%=capitalizeFirstLetter(bpmn)%>ListenerService } from 'src/simpleapp/w
 <%}%>
 // import {ServiceModule} from  "../services/service.module"
 //import { <%= it.typename %>Service } from '../../generate/<%= it.doctype %>/<%= it.doctype %>.service';
-
+import additionalModule from './additional.module';
 
 //<%if(it.doctype != 'autoinc'){%>import {AutoincreamentModule} from '../autoinc/autoinc.module'<%}%>
 //encryption use for model (not class and cant inject, use singleton instead and init as early as possible)
 
 @Module({
   imports: [
-  CloudapiModule,
-  PrintapiModule,
-   MongooseModule.forFeature([
-        <% for(let i=0;i<it.modules.length; i++){ %>
-          <% let obj = it.modules[i]%>
-          { name: '<%= obj.docname %>', schema: <%= obj.docname %>MongoSchema },
-        <%}%>
-      ]),
+    ...additionalModule.imports,
+
+    MongooseModule.forFeature([
+      <% for(let i=0;i<it.modules.length; i++){ %>
+        <% let obj = it.modules[i]%>
+        { name: '<%= obj.docname %>', schema: <%= obj.docname %>MongoSchema },
+      <%}%>
+    ]),
   ],
-  controllers: [<% for(let i=0;i<it.modules.length; i++){ %><%= it.modules[i].docname %>Controller,<%}%> ProfileController,
-  //WorkflowController
+  controllers: [
+    <% for(let i=0;i<it.modules.length; i++){ %><%= it.modules[i].docname %>Controller,<%}%> ProfileController,
+    //WorkflowController
+    ...additionalModule.controllers,
   ],
   providers: [
     SimpleAppRobotUserService,
@@ -65,12 +65,16 @@ import { <%=capitalizeFirstLetter(bpmn)%>ListenerService } from 'src/simpleapp/w
         <%let bpmn = it.allbpmn[i]%>
         <%=capitalizeFirstLetter(bpmn)%>ListenerService,
     <%}%> UserResolverService,
+    ...additionalModule.providers,
   ],
-  exports:[SimpleAppRobotUserService,AuditTrail,DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %>
+  exports:[
+    SimpleAppRobotUserService,AuditTrail,DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %>
     <%= it.modules[i].docname %>Service,
     <%= it.modules[i].docname %>Resolver,
     <%}%> ProfileService,
     //WorkflowDelegate,WorkflowConfig,WorkflowService,WorkflowUserService,
-    UserResolverService,]
+    UserResolverService,
+    ...additionalModule.exports,
+  ]
 })
 export class GenerateModule {}

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

@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-row gap-2">
-    <div v-for="o in options" >
+    <div v-for="o in options">
       <ButtonPrimary v-if="value == o.value" @click="switchButton(o.value)">{{
         o.label
       }}</ButtonPrimary>

package/templates/nuxt/components/calendar/{CalendarByResource.vue.eta → CalendarByResource.vue._eta}

@@ -62,8 +62,8 @@
 </template>
 <script setup lang="ts" generic="T">
 /**
- * This file was automatically generated by simpleapp generator during initialization.
- * IT IS NOT CHANGABLE
+ * 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
  */

package/templates/nuxt/components/calendar/{CalendarInput.vue.eta → CalendarInput.vue._eta}

@@ -13,8 +13,8 @@
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator during initialization.
- * IT IS NOT CHANGABLE
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2024-04-16
  * author: Ks Tan
  */

package/templates/nuxt/components/calendar/{CalendarSmall.vue.eta → CalendarSmall.vue._eta}

@@ -36,6 +36,12 @@
   </DatePicker>
 </template>
 <script setup lang="ts" generic="T">
+/**
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
+ * last change 2024-04-16
+ * author: Ks Tan
+ */
 import { DatePickerDateSlotOptions, DatePickerMonthChangeEvent } from "primevue/datepicker";
 
 import {

package/templates/nuxt/components/debug/{DebugDocumentData.vue.eta → DebugDocumentData.vue._eta}

@@ -29,8 +29,8 @@
 
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator during initialization.
- * IT IS NOT CHANGABLE
+ * 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
  */

package/templates/nuxt/components/form/{FormDocnoformat.vue.eta → FormDocnoformat.vue._eta}

@@ -70,7 +70,8 @@
 
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator.
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2024-02-16
  * Author: Ks Tan
  */

package/templates/nuxt/components/form/user/{FormUserPermission.vue.eta → FormUserPermission.vue._eta}

@@ -17,6 +17,12 @@
   </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
+ */
 import {
   Branch,
   Permission,

package/templates/nuxt/components/header/{HeaderBreadcrumb.vue.eta → HeaderBreadcrumb.vue._eta}

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

package/templates/nuxt/components/header/button/{HeaderButtonProfile.vue.eta → HeaderButtonProfile.vue._eta}

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2024-07-11
  * Author: Ks Tan
  * Last Modified By: Yong Xiang

package/templates/nuxt/components/header/button/task/{HeaderButtonTaskList.vue.eta → HeaderButtonTaskList.vue._eta}

@@ -37,8 +37,8 @@
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

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

@@ -2,56 +2,55 @@
   <ImageToBase64Uploader
     v-if="changable"
     #default
-    :class="`w-${sizenumber} h-${sizenumber} place-content-center bg-white`"
+    :style="`width:${size}px; height:${size} px`"
+    :class="`place-content-center `"
     @image-uploaded="handleBase64"
+    :imagePath="imagepath"
   >
     <NuxtImg
-      class="w-full h-full"
-      :key="imageKey"     
+      class="w-full h-full border-4 rounded-full"
       :src="imagepath"
+      :key="imageKey"
     />
   </ImageToBase64Uploader>
   <div
     v-else
-    :class="`inline-block border rounded-lg w-${sizenumber} h-${sizenumber} bg-white text-black`"
+    class="inline-block text-black"
+    :style="`width:${size}px; height:${size} px`"
   >
-    <NuxtImg class="w-full h-full"  :src="imagepath" />
+    <NuxtImg
+      class="w-full h-full border rounded-full"
+      :key="refreshkey"
+      :src="imagepath"
+    />
   </div>
 </template>
 <script lang="ts" setup>
+import { updateAvatarVersion } from "~/composables/stringHelper.generate";
+
 // import {KeyValue} from ''
 const props = defineProps<{
   changable?: boolean;
+  size?: number;
   uid?: string;
-  size: number;
+  refreshkey?: number;
 }>();
+const size = computed(() => props.size ?? 36);
 const imageKey = ref(0);
-const uid = computed(
-  () => props.uid ?? getUserProfile()?.uid,
-);
+const uid = computed(() => props.uid ?? getUserProfile()?.uid);
 // const xorgpath = getCurrentXorg() ? `${getCurrentXorg()}/` : "MC0wLTA/";
 
-const sizenumber = props.size ?? 16;
-const imagepath = getAvatarByUid(uid.value, sizenumber) //`${xorgpath}images/organization/${orgRecordId.value}`;
-const imageData = ref("");
-watch(
-  uid,
-  () => imageKey.value++,
-);
+const imagepath = computed(() => getAvatarByUid(uid.value)); //`${xorgpath}images/organization/${orgRecordId.value}`;
+
 const handleBase64 = async (data: string) => {
-  // const keyvalue = {
-  //   key: "org-" + props.orgRecordId,
-  //   value: data,
-  // };
-  // console.log("upload logo ", data);
-  // const uploadok = await useNuxtApp()
-  //   .$OrganizationDoc()
-  //   .getApi()
-  //   .runUploadlogo(keyvalue);
-  // if (uploadok) {
-  //   const realpath = `/api/${imagepath}`;
-  //   await fetch(realpath, { cache: "reload", credentials: "include" });
-  //   imageKey.value++;
-  // }
+  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)
+  });
 };
 </script>

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

@@ -2,11 +2,13 @@
   <ImageToBase64Uploader
     v-if="changable"
     #default
-    :class="`w-${sizenumber} h-${sizenumber} place-content-center bg-white`"
+    :class="`w-${sizenumber} h-${sizenumber} place-content-center bg-white rounded-md`"
     @image-uploaded="handleBase64"
+    :imagePath="imagepath"
   >
+    <!-- {{console.log("imagepath",imagepath)}} -->
     <NuxtImg
-      class="w-full h-full"
+      class="w-full h-full rounded-md"
       :key="imageKey"
       provider="myProvider"
       :src="imagepath"
@@ -14,9 +16,15 @@
   </ImageToBase64Uploader>
   <div
     v-else
-    :class="`inline-block border rounded-lg w-${sizenumber} h-${sizenumber} bg-white`"
+    :class="`inline-block rounded-md w-${sizenumber} h-${sizenumber} bg-white text-black`"
   >
-    <NuxtImg class="w-full h-full" provider="myProvider" :src="imagepath" />
+    <!-- {{console.log("imagepath",imagepath)}} -->
+
+    <NuxtImg
+      class="rounded-md min-w-10 min-h-10"
+      provider="myProvider"
+      :src="imagepath"
+    />
   </div>
 </template>
 <script lang="ts" setup>
@@ -30,11 +38,9 @@ const imageKey = ref(0);
 const orgRecordId = computed(
   () => props.orgRecordId ?? getUserProfile()?.orgRecordId,
 );
-const xorgpath= getCurrentXorg() ? `${getCurrentXorg()}/` : 'MC0wLTA/'
+const xorgpath = getCurrentXorg() ? `${getCurrentXorg()}/` : "MC0wLTA/";
 
-const imagepath = `${xorgpath}images/organization/${
-  orgRecordId.value
-}`;
+const imagepath = `${xorgpath}images/organization/${orgRecordId.value}`;
 const sizenumber = props.size ?? 16;
 const imageData = ref("");
 watch(
@@ -46,7 +52,7 @@ const handleBase64 = async (data: string) => {
     key: "org-" + props.orgRecordId,
     value: data,
   };
-  console.log("upload logo ", data);
+  // console.log("upload logo ", data);
   const uploadok = await useNuxtApp()
     .$OrganizationDoc()
     .getApi()

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

@@ -11,30 +11,40 @@
       </slot>
 
       <Dialog
-        v-if="dialogVisible" modal
+        v-if="dialogVisible"
+        modal
         v-model:visible="dialogVisible"
         header="Image Upload"
         :pt="{ root: { class: 'w-11/12' } }"
       >
         <div class="w-full grid grid-cols-2 gap-2">
           <div class="w-7/8 border rounded p-4">
-            <TabView lazy>
-              <TabPanel :header="t('upload')">
-                <div class="upload-container">
-                  <input
-                    type="file"
-                    ref="fileInput"
-                    accept="image/*"
-                    @change="handleImageUpload"
-                  />
-                </div>
-              </TabPanel>
-              <TabPanel :header="t('webcam')">
-                <div class="webcam-container h h-1/6">
-                  <WebCamUI :fullscreenState="false" @photoTaken="photoTaken" />
-                </div>
-              </TabPanel>
-            </TabView>
+            <Tabs value="upload" lazy>
+              <TabList>
+                <Tab value="upload">{{ t("upload") }}</Tab>
+                <Tab value="webcam">{{ t("webcam") }}</Tab>
+              </TabList>
+              <TabPanels>
+                <TabPanel value="upload">
+                  <div class="upload-container">
+                    <input
+                      type="file"
+                      ref="fileInput"
+                      accept="image/*"
+                      @change="handleImageUpload"
+                    />
+                  </div>
+                </TabPanel>
+                <TabPanel value="webcam">
+                  <div class="webcam-container h h-1/6">
+                    <WebCamUI
+                      :fullscreenState="false"
+                      @photoTaken="photoTaken"
+                    />
+                  </div>
+                </TabPanel>
+              </TabPanels>
+            </Tabs>
           </div>
           <div id="preview" class="w-7/8 border rounded p-4">
             <Cropper

package/templates/nuxt/components/list/{ListDocumentTable.vue.eta → ListDocumentTable.vue._eta}

@@ -57,8 +57,8 @@
 </template>
 <script setup lang="ts" generic="T">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

package/templates/nuxt/components/list/{ListItem.vue.eta → ListItem.vue._eta}

@@ -12,8 +12,8 @@
 </template>
 <script lang="ts" setup>
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-04-24
  * Author: Ks Tan
  */

package/templates/nuxt/components/list/{ListMessages.vue.eta → ListMessages.vue._eta}

@@ -33,6 +33,12 @@
   </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-02-22
+ * author: Ks Tan
+ */
 // import { sysMessage } from "~/composables/messages.generate";
 import { Systemmessage } from "~/simpleapp/generate/openapi";
 import { useConfirm } from "primevue/useconfirm";

package/templates/nuxt/components/list/{ListView.vue.eta → ListView.vue._eta}

@@ -116,8 +116,8 @@
 </template>
 <script setup lang="ts" generic="T extends { [key: string]: any }">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

package/templates/nuxt/components/overlay/{OverlayPanelWithToolBar.vue.eta → OverlayPanelWithToolBar.vue._eta}

@@ -29,8 +29,8 @@
 </template>
 <script lang="ts" setup>
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

package/templates/nuxt/components/overlay/{OverlaySideBarCrud.vue.eta → OverlaySideBarCrud.vue._eta}

@@ -20,8 +20,8 @@
 </template>
 <script lang="ts" setup>
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

package/templates/nuxt/components/overlay/{OverlayViewer.vue.eta → OverlayViewer.vue._eta}

@@ -24,8 +24,8 @@
 </template>
 <script lang="ts" setup>
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

package/templates/nuxt/components/page/{PageDocList.vue.eta → PageDocList.vue._eta}

@@ -142,8 +142,8 @@
 
 <script setup lang="ts" generic="T extends { [key: string]: any }">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

package/templates/nuxt/components/renderer/{RendererDateTime.vue.eta → RendererDateTime.vue._eta}

@@ -9,8 +9,8 @@
 </template>
 <script lang="ts" setup>
 /**
- * This file was automatically generated by simpleapp generator during initialization.
- * DONT CHANGE THIS FILE CAUSE IT OVERRIDE
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2024-03-10
  * author: Ks Tan
  */

package/templates/nuxt/components/renderer/{RendererDocHistories.vue.eta → RendererDocHistories.vue._eta}

@@ -49,6 +49,12 @@
   </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
+ */
 import TextSubsubtitle from "../text/TextSubsubtitle.vue";
 import RendererDateTime from "./RendererDateTime.vue";
 import { Documentevent, User } from "~/simpleapp/generate/openapi";

package/templates/nuxt/components/renderer/{RendererForeignKey.vue.eta → RendererForeignKey.vue._eta}

@@ -12,8 +12,8 @@
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator during initialization.
- * DONT CHANGE THIS FILE CAUSE IT OVERRIDE
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2024-04-14
  * author: Ks Tan
  */

package/templates/nuxt/components/renderer/{RendererLink.vue.eta → RendererLink.vue._eta}

@@ -10,8 +10,8 @@
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator during initialization.
- * DONT CHANGE THIS FILE CAUSE IT OVERRIDE
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2024-02-04
  * author: Ks Tan
  */

package/templates/nuxt/components/renderer/{RendererTime.vue.eta → RendererTime.vue._eta}

@@ -9,8 +9,8 @@
 </template>
 <script lang="ts" setup>
 /**
- * This file was automatically generated by simpleapp generator during initialization.
- * DONT CHANGE THIS FILE CAUSE IT OVERRIDE
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2024-04-14
  * author: Ks Tan
  */

package/templates/nuxt/components/renderer/{RendererViewer.vue.eta → RendererViewer.vue._eta}

@@ -15,8 +15,8 @@
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator during initialization.
- * DONT CHANGE THIS FILE CAUSE IT OVERRIDE
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2024-02-04
  * author: Ks Tan
  */

package/templates/nuxt/components/select/{SelectTemplate.vue.eta → SelectTemplate.vue._eta}

@@ -64,8 +64,8 @@
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2024-02-26
  * Author: Ks Tan
  */

package/templates/nuxt/components/session/{SessionBlock.vue.eta → SessionBlock.vue._eta}

@@ -17,8 +17,8 @@
 </template>
 <script lang="ts" setup>
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */