@simitgroup/simpleapp-generator 1.0.64 → 1.1.1

package/templates/nuxt/layouts/sidelist.vue.eta

@@ -48,7 +48,7 @@ refresh()
 <template>
     <div>
         <HeaderBar />
-        <Invitation/>
+        <UserInvitation/>
         <div class="grid grid-cols-3">
             <div>
                 <ListView 

package/templates/nuxt/layouts/sidelistcrud.vue.eta

@@ -26,7 +26,7 @@ const selectItem=(item:any)=>{
     <div>
 
         <HeaderBar />
-        <Invitation/>
+        <UserInvitation/>
         <div class="grid grid-cols-4">
             <div class="col col-span-1  ">
                 <ListView :list="primarylist" @clickitem="selectItem"></ListView>

package/templates/nuxt/nuxt.config.ts.eta

@@ -9,7 +9,6 @@ export default defineNuxtConfig({
   // colorMode: {}  ,  
   runtimeConfig:{    
     public:{
-      SIMPLEAPP_BACKEND_URL: process.env.SIMPLEAPP_BACKEND_URL,
       APP_URL: process.env.APP_URL,
       API_URL: process.env.API_URL,
       DEBUGDATA: process.env.DEBUGDATA,      

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

@@ -1,30 +1,31 @@
 <script setup lang="ts">
+import {SimpleAppInputType} from '~/types'
 import ConfirmPopup from "primevue/confirmpopup";
 import { useConfirm } from "primevue/useconfirm";
 import moment from "moment";
 const confirm = useConfirm();
-const isReadOnly = ref(true)
-const {$event,$listen, $DocnoformatDoc} = useNuxtApp()
-  const doc = $DocnoformatDoc()
-  const data = doc.getReactiveData()
-  const list = ref([])
-  const sample = ref("");
-  const refresh = async ()=>{
-    $event('RefreshDocumentList',{documentName:doc.getDocName()})
-    isReadOnly.value=true
-  }
+const isReadOnly = ref(true);
+const { $event, $listen, $DocnoformatDoc } = useNuxtApp();
+const doc = $DocnoformatDoc();
+const data = doc.getReactiveData();
+const list = ref([]);
+const sample = ref("");
+const refresh = async () => {
+  $event("RefreshDocumentList", { documentName: doc.getDocName() });
+  isReadOnly.value = true;
+};
 
-  const updateSample = () => {
-    sample.value = "Example: " + previewDocNo();
-  };
-  const createData = async () => {
+const updateSample = () => {
+  sample.value = "Example: " + previewDocNo();
+};
+const createData = async () => {
   // disabled.value=true
 
   doc
     .create()
     .then((res) => {
-      refresh()
-      newData()
+      refresh();
+      newData();
     })
     .catch((err) => {
       console.error(err);
@@ -42,7 +43,6 @@ const updateData = async () => {
     });
 };
 const deleteData = (el: any) => {
-  
   confirm.require({
     target: el.currentTarget as HTMLElement,
     message: "Delete?",
@@ -50,8 +50,8 @@ const deleteData = (el: any) => {
     acceptClass: "p-button-danger",
     accept: () => {
       // disabled.value=true
-      doc.delete(data.value._id ?? "").then((res) => {        
-        newData()
+      doc.delete(data.value._id ?? "").then((res) => {
+        newData();
         refresh();
       });
     },
@@ -61,79 +61,87 @@ const deleteData = (el: any) => {
   });
 };
 const newData = () => {
-  doc.setNew()
-  goTo(doc.getDocName(),String(useRoute().params.doctype)+'/new');
+  doc.setNew();
+  goTo(doc.getDocName(), String(useRoute().params.doctype) + "/new");
 };
 
-const id=computed(()=>String(useRoute().params.id??''))
+const id = computed(() => String(useRoute().params.id ?? ""));
 
-const fetchRecord =async ()=>{
-  if(id.value){
-    isReadOnly.value=true
-    await doc.getById(id.value)
-  }else{
-    isReadOnly.value=false
-    data.value.docNoType=String(useRoute().params.doctype)
+const fetchRecord = async () => {
+  if (id.value) {
+    isReadOnly.value = true;
+    await doc.getById(id.value);
+  } else {
+    isReadOnly.value = false;
+    data.value.docNoType = String(useRoute().params.doctype);
   }
-}
+};
 
 const previewDocNo = (): string => {
-    const pattern = data.value.docNoPattern;
-    if (pattern) {
-      const numberReg: RegExp = /\[(.*?)\]/g;
-      const dateReg: RegExp = /\{(.*?)\}/g;
-      let newvalue = pattern;
-      const numberpattern = pattern.match(numberReg);
-      const datepattern = pattern.match(dateReg);
+  const pattern = data.value.docNoPattern;
+  if (pattern) {
+    const numberReg: RegExp = /\[(.*?)\]/g;
+    const dateReg: RegExp = /\{(.*?)\}/g;
+    let newvalue = pattern;
+    const numberpattern = pattern.match(numberReg);
+    const datepattern = pattern.match(dateReg);
 
-      if (numberpattern && numberpattern.length > 0) {
-        const numberlength = numberpattern[0]
-          .replace("[", "")
-          .replace("]", "").length;
+    if (numberpattern && numberpattern.length > 0) {
+      const numberlength = numberpattern[0]
+        .replace("[", "")
+        .replace("]", "").length;
 
-        let nextnumber = (data.value.nextNumber ?? 0).toString();
+      let nextnumber = (data.value.nextNumber ?? 0).toString();
 
-        const numberdiff = numberlength - nextnumber.length;
+      const numberdiff = numberlength - nextnumber.length;
 
-        for (let n = 0; n < numberdiff; n++) {
-          nextnumber = "0" + nextnumber;
-        }
-        newvalue = newvalue.replace(numberpattern[0], nextnumber);
+      for (let n = 0; n < numberdiff; n++) {
+        nextnumber = "0" + nextnumber;
       }
+      newvalue = newvalue.replace(numberpattern[0], nextnumber);
+    }
 
-      if (datepattern && datepattern.length > 0) {
-        for (let d = 0; d < datepattern.length; d++) {
-          const dpattern = datepattern[d];
-          const date = new Date();
-          const formatteddate = moment().format(
-            dpattern.replace("{", "").replace("}", ""),
-          );
-          newvalue = newvalue.replace(dpattern, formatteddate);
-        }
+    if (datepattern && datepattern.length > 0) {
+      for (let d = 0; d < datepattern.length; d++) {
+        const dpattern = datepattern[d];
+        const date = new Date();
+        const formatteddate = moment().format(
+          dpattern.replace("{", "").replace("}", ""),
+        );
+        newvalue = newvalue.replace(dpattern, formatteddate);
       }
-      return newvalue;
-    } else {
-      return "";
     }
-  };
+    return newvalue;
+  } else {
+    return "";
+  }
+};
 
-  fetchRecord()
+fetchRecord();
 </script>
 <template>
-  <DebugDocumentData v-model="data" label="docnoformat"/>
+  <DebugDocumentData v-model="data" label="docnoformat" />
   <div class="p-4">
-    <div v-if="isReadOnly">
-      <Button class="bg-primary-600 hover:bg-primary-400 text-white" @click="isReadOnly=false">Edit</Button>
+    <div v-if="isReadOnly" class="col-span-4 ">
+        <Button
+          class="btn-default"
+          @click="newData"
+          type="button"
+          v-if="canPerform(doc.getDocName(), 'create')"
+          >New
+        </Button>
+      <Button class="btn btn-primary" @click="isReadOnly = false">Edit</Button>
     </div>
     <div v-else class="simpleapp-tool-bar col-span-4 text-left gap-4">
       <Button
-        class="btn-default"        
+        class="btn-default"
         @click="newData"
         type="button"
-        v-if="canPerform(doc.getDocName(), 'create')">New
+        v-if="canPerform(doc.getDocName(), 'create')"
+        >New
       </Button>
       <Button
-        class="bg bg-primary-600 hover:bg-primary-400 text-white"        
+        class="btn btn-primary"
         @click="createData"
         type="button"
         v-if="canPerform(doc.getDocName(), 'create') && doc.isNew()"
@@ -141,72 +149,70 @@ const previewDocNo = (): string => {
         Create
       </Button>
       <Button
-      class="bg bg-primary-600 hover:bg-primary-400 text-white"        
-        
+        class="btn btn-primary"
         @click="updateData"
         type="button"
-        v-if="canPerform(doc.getDocName(), 'update') &&  !doc.isNew()"
+        v-if="canPerform(doc.getDocName(), 'update') && !doc.isNew()"
       >
         Update
       </Button>
       <Button
-      class="bg bg-danger-600 hover:bg-danger-400 text-white"        
-        
+        class="btn btn-danger"
         @click="deleteData($el)"
         type="button"
         v-if="canPerform(doc.getDocName(), 'delete') && !doc.isNew()"
       >
         Delete
-      </Button>      
+      </Button>
       <ConfirmPopup></ConfirmPopup>
     </div>
     <SimpleAppForm :document="doc" #default="o" :readonly="isReadOnly">
       <div class="grid grid-cols-4 gap-4">
-        <SimpleAppText
+        <SimpleAppInput
           autofocus
+          :input-type="SimpleAppInputType.text"
           :setting="o.getField('#/properties/docNoFormatNo')"
           v-model="data.docNoFormatNo"
         />
-        <SimpleAppText
-          autofocus
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.text"
           :setting="o.getField('#/properties/docNoFormatName')"
           v-model="data.docNoFormatName"
         />
-        <SimpleAppAutocomplete
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.autocomplete"
           v-model="data.branch"
           :setting="o.getField('#/properties/branch')"
-          :remoteSrc="getAutocomplete('branch')"
-          optionLabel="label"
         />
-        <SimpleAppCheckbox
-          autofocus
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.checkbox"
           :setting="o.getField('#/properties/active')"
           v-model="data.active"
         />
 
-        <SimpleAppCheckbox
-          autofocus
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.checkbox"
           :setting="o.getField('#/properties/default')"
           v-model="data.default"
         />
 
-        <SimpleAppText
-          autofocus
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.text"
           :setting="o.getField('#/properties/docNoPattern')"
           v-model="data.docNoPattern"
           @change="updateSample"
           :description="sample"
           v-tooltip="'Examples: PO-<00000>, SI{YY}/<000>, SI{YYMM}/<000>'"
         />
-        <SimpleAppText
+        <SimpleAppInput
           :readonly="true"
+          :input-type="SimpleAppInputType.text"
           :setting="o.getField('#/properties/docNoType')"
-          v-model="data.docNoType"          
+          v-model="data.docNoType"
           description="Document Type"
-          
         />
-        <SimpleAppNumber
-          autofocus
+        <SimpleAppInput
+          :input-type="SimpleAppInputType.number"
           :setting="o.getField('#/properties/nextNumber')"
           v-model="data.nextNumber"
         />

package/templates/nuxt/pages/[xorg]/organization/[id]/branches/new.vue

@@ -97,7 +97,7 @@ if (bid.value) {
                 >New</Button
               > -->
         <Button
-          class="bg-primary-600 hover:bg-primary-400 text-white"
+          class="btn btn-primary"
           :disabled="disabled"
           @click="createData"
           type="button"
@@ -105,7 +105,7 @@ if (bid.value) {
           >Create</Button
         >
         <Button
-          class="bg-primary-600 hover:bg-primary-400 text-white"
+          class="btn btn-primary"
           :disabled="disabled"
           @click="updateData"
           type="button"
@@ -113,7 +113,7 @@ if (bid.value) {
           >Update</Button
         >
         <Button
-          class="bg-danger-600 hover:bg-danger-400 text-white"
+          class="btn btn-danger"
           :disabled="disabled"
           @click="deleteData($event)"
           type="button"

package/templates/nuxt/pages/[xorg]/organization/new.vue.eta

@@ -6,6 +6,7 @@
  * last change 2023-09-09
  * author: Ks Tan
  */
+ import { SimpleAppInputType } from "~/types";
 import ConfirmPopup from "primevue/confirmpopup";
 import { useConfirm } from "primevue/useconfirm";
 const confirm = useConfirm();
@@ -15,7 +16,7 @@ const orgdoc = $OrganizationDoc();
 const doc = $BranchDoc();
 const data = doc.getReactiveData();
 const bid = ref(String(useRoute().params.bid ?? ""));
-const isReadOnly=ref(true)
+const isReadOnly = ref(true);
 const fetchRecord = async (id: string) => {
   await doc.getById(id);
 };
@@ -56,7 +57,7 @@ const deleteData = (event: Event) => {
       // disabled.value=true
       doc.delete(data.value._id ?? "").then((res) => {
         refresh();
-        
+
         goTo(doc.getDocName());
       });
     },
@@ -68,16 +69,16 @@ const deleteData = (event: Event) => {
 
 const refresh = () => {
   $event("RefreshDocumentList", { documentName: doc.getDocName() });
-  isReadOnly.value=true
+  isReadOnly.value = true;
 };
 
-if (bid.value) {    
+if (bid.value) {
   fetchRecord(bid.value);
 } else {
   // const orgRecordid = ref(String(useRoute().params.id));
   // const orgdata = (await orgdoc.getById(orgRecordid.value)).data;
   doc.setNew();
-  isReadOnly.value=false
+  isReadOnly.value = false;
   data.value.tenantId = getUserProfile().tenantId;
   data.value.orgId = getUserProfile().orgId;
   data.value.organization._id = getUserProfile().orgRecordId;
@@ -91,7 +92,7 @@ if (bid.value) {
     <SimpleAppForm :document="doc" #default="o" :readonly="isReadOnly">
       <div v-if="!isReadOnly" class="col-span-4 text-left gap-4">
         <Button
-          class="bg-primary-600 hover:bg-primary-400 text-white"
+          class="btn btn-primary"
           :isReadOnly="isReadOnly"
           @click="createData"
           type="button"
@@ -99,43 +100,48 @@ if (bid.value) {
           >Create</Button
         >
         <Button
-          class="bg-primary-600 hover:bg-primary-400 text-white"
-          
+          class="btn btn-primary"
           @click="updateData"
           type="button"
           v-if="canPerform(doc.getDocName(), 'update') && !doc.isNew()"
           >Update</Button
         >
         <Button
-          class="bg-danger-600 hover:bg-danger-400 text-white"            
+          class="btn btn-danger"
           @click="deleteData($event)"
           type="button"
           v-if="canPerform(doc.getDocName(), 'delete') && !doc.isNew()"
           >Delete</Button
         >
-        
+
         <ConfirmPopup></ConfirmPopup>
       </div>
       <div v-else class="col-span-4 text-left gap-4">
-        <Button 
-                class="bg-primary-600 hover:bg-primary-400 text-white"
-                @click="isReadOnly=false" type="button" >Edit</Button
-              > 
+        <Button
+          class="btn btn-primary"
+          @click="isReadOnly = false"
+          type="button"
+          >Edit</Button
+        >
       </div>
 
-      <SimpleAppText
+      <SimpleAppInput
+        :input-type="SimpleAppInputType.text"
         v-model="data.branchCode"
         :setting="o.getField('#/properties/branchCode')"
       />
-      <SimpleAppText
+      <SimpleAppInput
+        :input-type="SimpleAppInputType.text"
         v-model="data.branchName"
         :setting="o.getField('#/properties/branchName')"
       />
-      <SimpleAppCheckbox
+      <SimpleAppInput
+        :input-type="SimpleAppInputType.checkbox"
         v-model="data.active"
         :setting="o.getField('#/properties/active')"
       />
-      <SimpleAppTextarea
+      <SimpleAppInput
+        :input-type="SimpleAppInputType.textarea"
         v-model="data.description"
         :setting="o.getField('#/properties/description')"
       />

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

@@ -6,6 +6,7 @@
  * last change 2023-09-09
  * author: Ks Tan
  */
+ import { SimpleAppInputType } from "~/types";
 import ConfirmPopup from "primevue/confirmpopup";
 import { useConfirm } from "primevue/useconfirm";
 const confirm = useConfirm();
@@ -15,7 +16,7 @@ const doc = $OrganizationDoc();
 const brancdoc = $BranchDoc();
 const data = doc.getReactiveData();
 const branchlist = ref([]);
-const isReadOnly=ref(true)
+const isReadOnly = ref(true);
 const getCurrentOrg = async () => {
   await doc.getById(getUserProfile().orgRecordId);
 };
@@ -32,7 +33,7 @@ const updateData = async () => {
     .update()
     .then(() => {
       refresh();
-      isReadOnly.value=true
+      isReadOnly.value = true;
     })
     .catch((err) => {
       console.error(err);
@@ -61,38 +62,52 @@ getCurrentOrg();
   <div class="grid grid-cols-3">
     <div class="">
       <Card>
+        <template #header><h1 class="text-2xl">Organization</h1></template>
         <template #content>
-          <SimpleAppForm #default="o" :document="doc"  :readonly="isReadOnly">
-            <div class="simpleapp-tool-bar col-span-4 text-left gap-4" v-if="canPerform(doc.getDocName(), 'update')">
-              <Button  v-if="isReadOnly"
-                class="bg-primary-600 hover:bg-primary-400 text-white"
-                @click="isReadOnly=false" type="button">Edit</Button>
-              <Button  v-else            
-                class="bg-primary-600 hover:bg-primary-400 text-white"
-                @click="updateData" type="button" >Update</Button
-              >              
+          <SimpleAppForm #default="o" :document="doc" :readonly="isReadOnly">
+            <div
+              class="simpleapp-tool-bar col-span-4 text-left gap-4"
+              v-if="canPerform(doc.getDocName(), 'update')"
+            >
+              <Button
+                v-if="isReadOnly"
+                class="btn btn-primary"
+                @click="isReadOnly = false"
+                type="button"
+                >Edit</Button
+              >
+              <Button
+                v-else
+                class="btn btn-primary"
+                @click="updateData"
+                type="button"
+                >Update</Button
+              >
               <ConfirmPopup></ConfirmPopup>
             </div>
             <div class="flex flex-col">
               <div class="flex flex-row gap-4">
-                <SimpleAppText
-                  autofocus                  
+                <SimpleAppInput
+                  :input-type="SimpleAppInputType.text"
+                  autofocus
                   v-model="data.orgCode"
                   :setting="o.getField('#/properties/orgCode')"
-                  
                 />
-                <SimpleAppText
+                <SimpleAppInput
+                  :input-type="SimpleAppInputType.text"
                   v-model="data.orgName"
                   class=""
                   :setting="o.getField('#/properties/orgName')"
                 />
-                <SimpleAppCheckbox
+                <SimpleAppInput
+                :input-type="SimpleAppInputType.checkbox"
                   v-model="data.active"
                   :setting="o.getField('#/properties/active')"
                 />
               </div>
               <div>
-                <SimpleAppTextarea
+                <SimpleAppInput
+                  :input-type="SimpleAppInputType.textarea"
                   :setting="o.getField('#/properties/description')"
                   v-model="data.description"
                 />