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

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

@@ -22,14 +22,15 @@
       </slot>
     </ListView>
 
-    <Dialog v-model:visible="showDialog" modal :header="t('editDetails')">
+    <Dialog v-model:visible="showDialog"
+       modal :header="t('editDetails')" :pt="{root:{class:'w-1/2'}}">
       <div class="flex flex-col p-2 gap-4">
         <slot name="popupbody" :index="rowIndex" :item="list[rowIndex]">
           row {{ rowIndex }} define SimpleAppInputs here
         </slot>
       </div>
       <template #footer>
-        <div v-if="!readOnly" class="flex flex-row gap-2 w-full">
+        <div v-if="!readonly" class="flex flex-row gap-2 w-full">
           <ButtonDanger @click="deleteItem">{{ t("delete") }}</ButtonDanger>
           <ButtonPrimary @click="updateItem">{{ t("ok") }}</ButtonPrimary>
         </div>
@@ -38,6 +39,7 @@
   </div>
 </template>
 <script setup lang="ts" generic="T extends { [key: string]: any }">
+import { SimpleAppClient } from "~/simpleapp/generate/clients/SimpleAppClient";
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
@@ -46,13 +48,20 @@
  */
 const showDialog = ref(false);
 const rowIndex = ref(0);
+
 const emits = defineEmits(["addrow", "deleteitem", "itemupdated"]);
-const props = defineProps<{ 
-  list: T[]; 
-  title?: string; 
-  addNew?: boolean 
+const props = defineProps<{
+  list: T[];
+  title?: string;
+  addNew?: boolean;
+  readonly?: boolean;
+  doc: SimpleAppClient<any, any>;
 }>();
-
+const readonly = computed(() => {
+  if (props.readonly) return true;
+  else if (props.doc.isReadOnly()) return true;
+  else return false;
+});
 const showRow = (index: number, item: T) => {
   showDialog.value = true;
   rowIndex.value = index;
@@ -70,6 +79,5 @@ const addRow = (event: MouseEvent) => {
   emits("addrow", MouseEvent);
   const lineno = props.list.length - 1;
   showRow(lineno, props.list[lineno]);
-  
 };
 </script>

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

@@ -9,28 +9,28 @@
       :class="
         !pt
           ? 'flex-1 w-full rounded-lg  ' +
-            (props.readonly ? '' : 'rounded-tr-none rounded-br-none')
+            (props.readonly || !props.setting.document.isNew() ? '' : 'rounded-tr-none rounded-br-none')
           : ''
       "
     />
-    <span class="" v-if="!readonly">
-      <button v-ripple
+    <span class="" v-if="!readonly && props.setting.document.isNew()">
+      <button
+        v-ripple
         type="button"
         @click="toggle"
         tabindex="-1"
-        class="'btn btn-primary p-3 dark:border-blue-900/40 rounded-lg rounded-tl-none rounded-bl-none"
+        class="'btn bg-primary-500 dark:text-black text-white p-3 dark:border-blue-900/40 rounded-lg rounded-tl-none rounded-bl-none"
       >
         <i class="pi pi-angle-down"></i>
       </button>
-      <OverlayPanel ref="op" class="p-4">
+      <OverlayPanel ref="op">
         <div class="m-4">
           <ul>
             <li v-for="docno in docFormatlist" class="hover-list-primary p-2">
-              <a class="" @click="chooseFormat(docno)">
-                <span class="pi pi-hashtag mr-2"></span>
+              <div class="flex flex-row gap-2 cursor-pointer" @click="chooseFormat(docno)">                
                 <span class="">{{ docno.docNoFormatName }}</span>
                 <span class="text text-green-600">{{ docno.sample }}</span>
-              </a>
+              </div>
             </li>
           </ul>
         </div>

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

@@ -75,7 +75,7 @@ let schema: any;
 const getLayoutClass = () =>
   `simpleapp-input-container flex  ${
     props.inputType == "checkbox"
-      ? " flex-row gap-4 mt-1 ml-1 "
+      ? " flex flex-col "
       : "flex flex-col "
   }`;
 

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

@@ -35,18 +35,26 @@
     </MobileToolbar>
   </div>
   <div v-else class="simpleapp-tool-bar">
-   <!--  <div class="flex flex-row justify-end p-2">
+    <!--  <div class="flex flex-row justify-end p-2">
       <TextTitle class="dark:text-white line-clamp-2 flex-1">{{
         title
       }}</TextTitle>
       <ButtonText @click="callClose"><i class="pi pi-times" /></ButtonText>
     </div> -->
-    <div class="flex flex-row gap-2 p-0 justify-between">
+    <div class="flex flex-row gap-2 mb-2 p-0 justify-between">
       <!-- left -->
-      <div class="flex flex-row">
+      <div class="flex flex-row gap-2">
         <div v-for="(menu, index) in menus" :key="index">
           <div v-if="menu.label && menu.type == 'crud'">
             <ButtonAction
+              v-if="menu.action == 'print'"
+              :disabled="!canPerform(doc.getDocName(true), 'access')"
+              @click="emitEvent(menu, $event)"
+              :action-name="menu.action"
+              >{{ menu.label }}</ButtonAction>
+            <ButtonAction
+              v-else
+              :disabled="!canPerform(doc.getDocName(true), menu.action)"
               @click="emitEvent(menu, $event)"
               :action-name="menu.action"
               >{{ menu.label }}</ButtonAction
@@ -56,12 +64,17 @@
       </div>
 
       <!-- center -->
-      <div class="flex flex-row "></div>
+      <div class="flex flex-row"></div>
       <!-- right -->
-      <div class="flex flex-row">
+      <div class="flex flex-row gap-2">
+        <DebugDocumentData v-model="data" :label="t(doc.getDocName())" />
+        <div v-if="data.documentStatus">
+          <RendererDocHistories :data="data" />
+        </div>
         <div v-for="(menu, index) in menus" :key="index">
           <div v-if="menu.label && menu.type == 'docstatus'">
             <ButtonAction
+              :disabled="!canPerform(doc.getDocName(true), menu.action)"
               @click="emitEvent(menu, $event)"
               :action-name="menu.action"
               >{{ menu.label }}</ButtonAction
@@ -70,22 +83,8 @@
         </div>
       </div>
     </div>
-    <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>{{ t(item.formatName) }}</TextBold>
-          <TextSubtitle>{{ item.description }}</TextSubtitle>
-        </div>
-      </ListView>
-    </div>
-  </Dialog>
+
   <OverlayPanelWithToolBar
     v-if="visiblePrintPreview"
     v-model="visiblePrintPreview"
@@ -96,11 +95,23 @@
         ><i class="pi pi-times"
       /></ButtonText>
     </template>
-    <template #headerCenter>{{ t("printPreview") }}</template>
+    <template #headerCenter>
+      <div class="flex flex-row gap-2 justify-center">
+        <Dropdown
+          :options="printformats"
+          option-label="formatName"
+          option-value="formatId"
+          v-model="currentprintformat"
+          @change="printPdf"
+        ></Dropdown>
+        <ButtonPrimary @click="showPrintFormats"
+          ><i class="pi pi-refresh"
+        /></ButtonPrimary>
+      </div>
+    </template>
     <template #headerRight>
-
       <div v-if="isMobile()">
-        <ButtonText class="text-xl" @click="sendToPrint" >
+        <ButtonText class="text-xl" @click="sendToPrint">
           <i class="pi pi-print"></i>
         </ButtonText>
         <ButtonText class="text-xl" v-if="sharable" @click="togglePdfMenu">
@@ -111,6 +122,14 @@
     </template>
     <!-- :header="t('printPreview')"
     position="bottom" -->
+    <!-- {{pdfReady}} -->
+
+    <!-- <div v-if="!pdfReady">
+      <div class="flex flex-col justify-center">
+        <div class="pi pi-spin pi-spinner" style="font-size: 8rem"></div>
+        <div>{{ t("loading") + "..." }}</div>
+      </div>
+    </div>     -->
     <TextDanger v-if="printservererror || !printstr">
       {{ t("printServerError") }}
     </TextDanger>
@@ -142,9 +161,16 @@ import VuePdfEmbed from "vue-pdf-embed";
 
 import { SimpleAppClient } from "~/simpleapp/generate/clients/SimpleAppClient";
 import { useConfirm } from "primevue/useconfirm";
-import { FormActions, FormCrudEvent, FormMenu } from "~/types";
+import {
+  FormActions,
+  FormCrudEvent,
+  FormMenu,
+  SchemaPrintFormat,
+} from "~/types";
+import { DropdownChangeEvent } from "primevue/dropdown";
 import { MenuItem } from "primevue/menuitem";
 import { MenuItemCommandEvent } from "primevue/menuitem";
+const currentprintformat = ref();
 const pdfrenderer = ref();
 const confirm = useConfirm();
 const emits = defineEmits(["on", "close"]);
@@ -152,13 +178,22 @@ const visiblePrintFormats = ref(false);
 const visiblePrintPreview = ref(false);
 const printstr = ref();
 const printservererror = ref(false);
+const pdfReady = ref(false);
 const props = defineProps<{
   document: SimpleAppClient<any, any>;
   disableaction?: string[];
 }>();
+const doc = props.document;
+const data = doc.getReactiveData();
 
 const createData = async () => {
   try {
+    setRecentDocument(data.value._id, {
+      docName: doc.getDocName(),
+      label: title.value,
+      branchId: data.value.branchId,
+      time: new Date().toISOString(),
+    });
     return await doc.create();
   } catch (e) {
     console.debug("validation error:", e);
@@ -166,6 +201,12 @@ const createData = async () => {
 };
 const updateData = async () => {
   try {
+    setRecentDocument(data.value._id, {
+      docName: doc.getDocName(),
+      label: title.value,
+      branchId: data.value.branchId,
+      time: new Date().toISOString(),
+    });
     return await doc.update();
   } catch (e) {
     console.debug("validation error:", e);
@@ -173,23 +214,36 @@ const updateData = async () => {
 };
 const deleteData = async () => {
   try {
+    getRecently().delete(data.value._id);
     return await doc.delete();
   } catch (e) {
     console.debug("validation error:", e);
   }
 };
 
-const doc = props.document;
-const data = doc.getReactiveData();
 type Datatype = keyof typeof data.value;
 const config = doc.getSchema()["x-simpleapp-config"];
-const titlefield = (config.documentTitle ?? config.uniqueKey) as Datatype;
+const titlefield = (
+  config.allStatus && config.allStatus.length > 0
+    ? config.uniqueKey
+    : config.documentTitle
+) 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 printformats = computed(() => {
+  const formats = doc.getSchema()["x-simpleapp-config"]?.printFormats;
+  if (Array.isArray(formats)) {
+    return formats.map((item) => {
+      item.formatName = t(item.formatName);
+      return item;
+    });
+  } else {
+    return [];
+  }
+});
 const menu = ref();
 const menus = computed(() =>
   [...getActions(), ...getDocActions()].filter((item) => showMenuButton(item)),
@@ -214,26 +268,43 @@ const emitMobileEvent = (itemevent: MenuItemCommandEvent) => {
   emitEvent(itemevent.item, event);
 };
 
-const printPdf = async (index: number, format: any) => {
-  console.log("printPdf");
+const printPdf = async (dropdown?: DropdownChangeEvent) => {
+  let index = 0;
+  setRecentDocument(data.value._id, {
+    docName: doc.getDocName(),
+    label: title.value,
+    branchId: data.value.branchId,
+    time: new Date().toISOString(),
+  });
+  if (printformats && printformats.value.length > 0 && dropdown !== undefined) {
+    index = printformats.value.findIndex(
+      (item) => item.formatId == dropdown.value,
+    );
+  }
+  let format: SchemaPrintFormat = printformats.value[index];
   printservererror.value = false;
   const formatid: string = format.formatId;
+  currentprintformat.value = formatid;
   visiblePrintPreview.value = true;
   // console.log("formatidformatid", format);
+  // pdfReady.value=false
   try {
     const tmp: any = await doc
       .getApi()
       .runPrint(data.value._id ?? "", formatid);
+    // pdfReady.value=true
     printstr.value = "data:application/pdf;base64," + tmp.data;
   } catch (e) {
+    pdfReady.value = true;
     printservererror.value = true;
-    printstr.value = "";
+    // printstr.value = "";
     console.error("error from print server", e);
   }
 };
 const getActions = () => {
   const actions = doc.getActions();
-  const printformats = doc.getSchema()["x-simpleapp-config"]?.printFormats;
+  // const printformats = doc.getSchema()["x-simpleapp-config"]?.printFormats;
+
   const crudmenus: any[] = [];
 
   // Object.keys(actions).forEach((key)=>{ //crud, api, docstatus
@@ -250,7 +321,7 @@ const getActions = () => {
       });
     }
   });
-  if (printformats && printformats.length > 0) {
+  if (printformats && printformats.value.length > 0) {
     crudmenus.push({
       action: "print",
       label: t("preview"),
@@ -259,15 +330,14 @@ const getActions = () => {
       command: showPrintFormats,
     });
   }
-  console.log("crudmenus", crudmenus);
+  // console.log("crudmenus", crudmenus);
 
   // })
   return crudmenus;
 };
 
-const showPrintFormats = () => {
-  visiblePrintFormats.value = true;
-  // console.log("showPrintFormatContext",itemEvent)
+const showPrintFormats = async () => {
+  await printPdf();
 };
 const emitEvent = async (menu: FormMenu, clickEvent: Event | MouseEvent) => {
   if (menu.action == "delete") {
@@ -290,6 +360,12 @@ const emitEvent = async (menu: FormMenu, clickEvent: Event | MouseEvent) => {
     } else if (menu.action == "update") {
       if (await updateData()) emits("on", FormCrudEvent.update);
     } else if (menu.type == "docstatus") {
+      setRecentDocument(data.value._id, {
+        docName: doc.getDocName(),
+        label: title.value,
+        branchId: data.value.branchId,
+        time: new Date().toISOString(),
+      });
       emits("on", FormCrudEvent.setDocStatus, menu.action);
     } else if (menu.action == FormCrudEvent.exit)
       emits("on", FormCrudEvent.exit);
@@ -321,7 +397,7 @@ const getDocActions = () => {
 const showMenuButton = (menu: FormMenu) => {
   if (menu.separator) return true;
 
-  if (menu.action == "print") return true;
+  if (menu.action == "print" && !doc.isNew()) return true;
   //all document status cannot direct apply regardless new or draft
   if (menu.type == "docstatus") return true;