@simitgroup/simpleapp-generator 1.0.63 → 1.0.64

package/templates/nuxt/components/{SimpleAppNumber.vue.eta → simpleApp/SimpleAppNumber.vue.eta}

@@ -6,13 +6,14 @@
             v-model="modelValue"    
             :path="setting.instancepath"
             :pt="{input:{class:'text-right w-full'}}"                          
+            :readonly="isReadonly"
          ></InputNumber>
     </FieldContainer>
 </template>
 <script lang="ts" setup>
 import {computed,watch,ref} from 'vue'
 import InputNumber from 'primevue/inputnumber';
-import FieldContainer from './SimpleFieldContainer.vue'
+import FieldContainer from './SimpleAppFieldContainer.vue'
 const props = withDefaults(defineProps<{
     label?:string,
     description?:string,
@@ -20,11 +21,21 @@ const props = withDefaults(defineProps<{
     error?:string,
     instancepath?:string,
     hidelabel?:boolean
+    readonly?:boolean
 }>(),{
     hidelabel:false
 })
 const emit = defineEmits(['change'])
 const modelValue =defineModel()
+const isReadonly = computed(()=>{
+    if(props.readonly){
+        return props.readonly
+    }else if(props.setting.readonly){
+        return props.setting.readonly
+    }else{
+        return false
+    }
+})
 watch(modelValue,()=>{
     // props.setting.document.validateFailed()
     emit('change',modelValue)

package/templates/nuxt/components/{SimpleAppPassword.vue.eta → simpleApp/SimpleAppPassword.vue.eta}

@@ -13,7 +13,7 @@
 <script lang="ts" setup>
 import {computed,watch,ref} from 'vue'
 import Password from 'primevue/password';
-import FieldContainer from './SimpleFieldContainer.vue'
+import FieldContainer from './SimpleAppFieldContainer.vue'
 const modelValue = defineModel()
 const props = defineProps<{
     label?:string,

package/templates/nuxt/components/{SimpleAppRadio.vue.eta → simpleApp/SimpleAppRadio.vue.eta}

@@ -21,7 +21,7 @@
 </template>
 <script lang="ts" setup>
 import RadioButton from 'primevue/radiobutton';
-import FieldContainer from './SimpleFieldContainer.vue'
+import FieldContainer from './SimpleAppFieldContainer.vue'
 import {prepareList,simpleArrayToObject} from './helper'
 import type {ListOptionType} from './type'
 const modelValue = defineModel()

package/templates/nuxt/components/{SimpleAppRating.vue.eta → simpleApp/SimpleAppRating.vue.eta}

@@ -14,7 +14,7 @@
 import {computed,watch,ref} from 'vue'
 import Rating from 'primevue/rating';
 
-import FieldContainer from './SimpleFieldContainer.vue'
+import FieldContainer from './SimpleAppFieldContainer.vue'
 const modelValue = defineModel()
 const props = defineProps<{
     label?:string,

package/templates/nuxt/components/{SimpleAppSelect.vue.eta → simpleApp/SimpleAppSelect.vue.eta}

@@ -9,13 +9,14 @@
         optionLabel="label"
         :path="setting.instancepath"
         :options="options"
+        :readonly="isReadonly"
           />        
     </FieldContainer>
 </template>
 <script lang="ts" setup>
 import {computed,watch,ref} from 'vue'
 import Dropdown from 'primevue/dropdown';
-import FieldContainer from './SimpleFieldContainer.vue'
+import FieldContainer from './SimpleAppFieldContainer.vue'
 import {prepareList,simpleArrayToObject} from './helper'
 import type {ListOptionType} from './type'
 import type { JSONSchema7 } from 'json-schema';
@@ -29,10 +30,19 @@ const props = defineProps<{
     optionValue?:string,
     instancepath?:string,
     options?:any[]
+    readonly?:boolean
 }>()
 
 const optionValue = props.optionValue ?? 'value' 
 const optionLabel  = props.optionLabel ?? 'label' 
 const options = prepareList('oneOf',props.setting.fieldsetting,optionLabel,optionValue,props.options,)
-
+const isReadonly = computed(()=>{
+    if(props.readonly){
+        return props.readonly
+    }else if(props.setting.readonly){
+        return props.setting.readonly
+    }else{
+        return false
+    }
+})
 </script>

package/templates/nuxt/components/{SimpleAppSelectmulti.vue.eta → simpleApp/SimpleAppSelectmulti.vue.eta}

@@ -16,7 +16,7 @@
 <script lang="ts" setup>
 import {computed,watch,ref} from 'vue'
 import MultiSelect from 'primevue/multiselect';
-import FieldContainer from './SimpleFieldContainer.vue'
+import FieldContainer from './SimpleAppFieldContainer.vue'
 import {prepareList,simpleArrayToObject} from './helper'
 import type {SimpleAppFieldSetting} from './type'
 import type { JSONSchema7 } from 'json-schema';

package/templates/nuxt/components/{SimpleAppSlider.vue.eta → simpleApp/SimpleAppSlider.vue.eta}

@@ -15,7 +15,7 @@ import {computed,watch,ref} from 'vue'
 import Slider from 'primevue/slider';
 
 
-import FieldContainer from './SimpleFieldContainer.vue'
+import FieldContainer from './SimpleAppFieldContainer.vue'
 const modelValue = defineModel()
 const props = defineProps<{
     label?:string,

package/templates/nuxt/components/{SimpleAppSwitch.vue.eta → simpleApp/SimpleAppSwitch.vue.eta}

@@ -15,7 +15,7 @@
 <script lang="ts" setup>
 // import {Ref} from 'vue'
 import InputSwitch from 'primevue/inputswitch';
-import FieldContainer from './SimpleFieldContainer.vue'
+import FieldContainer from './SimpleAppFieldContainer.vue'
 
 const modelValue = defineModel<boolean>()
 const props = defineProps<{

package/templates/nuxt/components/{SimpleAppText.vue.eta → simpleApp/SimpleAppText.vue.eta}

@@ -9,6 +9,7 @@
             v-model="modelValue"
             :path="setting.instancepath"
             :type="type"
+            :readonly="isReadonly"
          ></InputText>         
          <InputText v-else
             class="simpleapp-inputfield"
@@ -16,13 +17,14 @@
             v-model="modelValue"
             :path="setting.instancepath"
             :type="type"
+            :readonly="isReadonly"
          ></InputText>  
     </FieldContainer>
 </template>
 <script lang="ts" setup>
 import {computed,watch,ref} from 'vue'
 import InputText from 'primevue/inputtext';
-import FieldContainer from './SimpleFieldContainer.vue'
+import FieldContainer from './SimpleAppFieldContainer.vue'
 const modelValue = defineModel()
 const props = withDefaults( defineProps<{
     label?:string,
@@ -32,11 +34,20 @@ const props = withDefaults( defineProps<{
     type?:string,
     instancepath?:string,
     hidelabel?: boolean
+    readonly?: boolean
 }>(),{type:'text'})
 
 // const modelValue = defineModel<{modelValue?:string}>()
 // console.log(modelValue.value)
-
+const isReadonly = computed(()=>{
+    if(props.readonly){
+        return props.readonly
+    }else if(props.setting.readonly){
+        return props.setting.readonly
+    }else{
+        return false
+    }
+})
 const emits = defineEmits(['change'])
 // const onchange=(e:any)=>{    
 //     emits('update:modelValue',e.target.value)

package/templates/nuxt/components/{SimpleAppTextarea.vue.eta → simpleApp/SimpleAppTextarea.vue.eta}

@@ -8,6 +8,7 @@
             v-bind="$attrs"
             :autoResize="autoResize"
             :path="setting.instancepath"
+            :readonly="isReadonly"
          ></Textarea>         
     </FieldContainer>
 </template>
@@ -15,7 +16,7 @@
 import {computed,watch,ref} from 'vue'
 import Textarea from 'primevue/textarea';
 
-import FieldContainer from './SimpleFieldContainer.vue'
+import FieldContainer from './SimpleAppFieldContainer.vue'
 const modelValue = defineModel()
 const props = defineProps<{
     label?:string,
@@ -25,6 +26,16 @@ const props = defineProps<{
     setting:any,
     autoResize?:boolean,
     instancepath?:string,
-}>()
+    readonly?:boolean
 
+}>()
+const isReadonly = computed(()=>{
+    if(props.readonly){
+        return props.readonly
+    }else if(props.setting.readonly){
+        return props.setting.readonly
+    }else{
+        return false
+    }
+})
 </script>

package/templates/nuxt/composables/getMenus.generate.ts.eta

@@ -10,6 +10,9 @@ import {getAllDocuments} from '../simpleapp/generate/commons/documents'
 export const getDocTypes = ()=>{
   return getAllDocuments().filter(item=>item.page!='')
 }
+export const getAllDocFormats = ()=>{
+  return getAllDocuments().filter(item=>item.docNumber)
+}
 
 export const getPublicResource = (xorg:string) : MenuData[] => {
   // const xorg = getUserStore().getCurrentXorg()
@@ -44,7 +47,7 @@ export const getMenus =() :MenuData[]=>{
     // if(m.label)
    
     if(getUserStore().haveAccess(keyword)){
-      const m:MenuData = {label: keyword, url:`/${xorg}/${keyword}`, isolationType:allmenus[i].isolationType}
+      const m:MenuData = {label: t(keyword), url:`/${xorg}/${keyword}`, isolationType:allmenus[i].isolationType}
       allowmenus.push(m)
     }     
   }

package/templates/nuxt/composables/goTo.generate.ts.eta

@@ -13,3 +13,10 @@ export const getDocumentUrl = (document:string,id?:string,querystr?:string)=>{
 export const goTo = (document:string,id?:string,querystr?:string)=>{    
     navigateTo(getDocumentUrl(document,id,querystr))   
 }
+
+
+export const goBranch = (branchRecordId: string) => {
+    const parenturl = getDocumentUrl("organization");
+    const branchUrl = `${parenturl}/${branchRecordId}`;
+    navigateTo(branchUrl);
+  };

package/templates/nuxt/composables/notifications.generate.ts.eta

@@ -1,6 +1,6 @@
 import {NotificationStatus} from '~/types'
 export const getStatusColor = (status:NotificationStatus) => {
-    console.log("get status color",status)
+    //console.log("get status color",status)
     switch(status){
         case NotificationStatus.error:
             return 'bg bg-danger-600 text-white';

package/templates/nuxt/composables/stringHelper.generate.ts.eta

@@ -13,3 +13,4 @@ export const getAvatarLink = (email:string, size:number):string=>{
 }
 
 export const toLocalDate = (dateiso8601:string)=> new Date(String(dateiso8601)).toLocaleDateString()
+export const t = (txt:string):string=> camelCaseToWords(txt)

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

@@ -93,7 +93,7 @@ import {SearchBody,CellSetting} from '~/types'
         tablecolumns.value= !useRoute().meta.columns ? [] : useRoute().meta.columns as CellSetting[] 
         documentName.value = String(useRoute().meta.documentName)
         const searchbody: SearchBody = {
-            fields: tablecolumns.value.concat(['created']),
+            fields: getWantedFields(tablecolumns.value),
             sorts:  metas.sorts as string[][]
         }
         obj = getDocument(documentName.value)
@@ -118,6 +118,24 @@ import {SearchBody,CellSetting} from '~/types'
         // }
     }
 
+    const getWantedFields = (selectedCols:CellSetting[]) =>{
+        let cols:string[] = []
+        
+        selectedCols.forEach((item)=>{
+
+            if(typeof item=='string'){
+                cols.push(item)
+            }else if(typeof item =='object'){
+                if(item.field !='*'){
+                    cols.push(item.field)
+                }
+                if(item.moreFields && item.moreFields.length>0){
+                    cols = cols.concat(item.moreFields)
+                }                
+            }
+        })        
+        return cols
+    }
 watch(()=> useRoute().meta ,(newvalue,oldvalue)=>{
     refresh()
 })
@@ -131,7 +149,7 @@ watch(()=> useRoute().meta ,(newvalue,oldvalue)=>{
 
         <HeaderBar />
         <Invitation/>      
-         <SimpleAppDatatable :value="recordlist" :columns="tablecolumns" :title="String(useRoute().meta.name)"> 
+         <DocumentDatatable :value="recordlist" :columns="tablecolumns" :title="String(useRoute().meta.name)"> 
             <template #toolbar>
                 <div class="w-full text-left">
                     <slot>
@@ -143,13 +161,11 @@ watch(()=> useRoute().meta ,(newvalue,oldvalue)=>{
                 <Button class="bg-secondary-600 hover:bg-secondary-400 text-white" @click="refresh()" type="button" >Refresh</Button>                                                                            
             </template>
             <Column header=" ">
-                <template #body="{index,data}">
-                    <NuxtLink :to="getDocumentUrl(String(useRoute().meta.documentName),data._id)">
-                        <Button icon="pi pi-pencil" class="bg-primary-600 hover:bg-primary-400 text-white" >Edit</Button>
-                    </NuxtLink>            
+                <template #body="{index,data}">                    
+                        <Button @click="goTo(String(useRoute().meta.documentName),data._id)" icon="pi pi-pencil" class="bg-primary-600 hover:bg-primary-400 text-white" >Edit</Button>                    
                 </template>
             </Column>
-        </SimpleAppDatatable>  
+        </DocumentDatatable>  
         <!--      
         <DebugDocumentData v-model="data"/>
         -->

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

@@ -0,0 +1,68 @@
+<script lang="ts" setup>
+/**
+ * This file was automatically generated by simpleapp generator during initialization.
+ * You may modify it
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+
+import Menus from '~/components/Menus.vue'
+const {$listen,$event} = useNuxtApp()
+
+
+const documentName = ref(String(useRoute().meta.documentName))
+let obj = getDocument(documentName.value)
+
+const list = ref([])
+
+$listen("RefreshDocumentList", (data) => {  
+    if(data.documentName == documentName.value){
+        refresh()
+    }    
+});
+
+watch(()=>useRoute().fullPath,()=>{
+    refresh()
+})
+
+const refresh = async ()=>{
+    
+    
+    documentName.value = String(useRoute().meta.documentName)
+    obj = getDocument(documentName.value)
+    list.value = await obj?.search({})
+    console.log("refreshrefreshrefresh",documentName.value)
+}
+// // $listen('*',(type:any,data:any)=>{ //simple use case, use any to prevent error
+// $listen('listloaded',(newlist)=>{
+//     primarylist.value = newlist
+// })
+
+const selectItem=(item:any)=>{
+    // $event('',item)
+}
+
+refresh()
+
+</script>
+<template>
+    <div>
+        <HeaderBar />
+        <Invitation/>
+        <div class="grid grid-cols-3">
+            <div>
+                <ListView 
+                    :list="list"  :withFilter="true"
+                    :url="getDocumentUrl('organization')" 
+                    :titleField="String(useRoute().meta.titleField)"
+                    :subTitleField="String(useRoute().meta.subTitleField)" ></ListView>
+
+                </div>                        
+            <div class="col-span-2">
+                <slot></slot>
+            </div>
+            
+        </div>
+        
+    </div>
+</template>

package/templates/nuxt/pages/[xorg]/branch/index.vue.etax

@@ -20,8 +20,8 @@ const columns = [
   /* skip system columns doctype*/
   /* skip system columns created*/
   /* skip system columns updated*/
-  /* skip system columns createdby*/
-  /* skip system columns updatedby*/
+  /* skip system columns createdBy*/
+  /* skip system columns updatedBy*/
   /* skip system columns tenantId*/
   /* skip system columns orgId*/
 ];

package/templates/nuxt/pages/[xorg]/docnoformat/{[id].vue.eta → [doctype]/[id].vue.eta}

@@ -6,12 +6,9 @@
  * last change 2023-09-09
  * author: Ks Tan
  */
-import Index from "./index.vue";
-definePageMeta({
-  layout: 'sidelistcrud',
-});
+import Crud from "./new.vue";
 
 </script>
 <template>
-  <Index />
+  <Crud/>
 </template>

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

@@ -0,0 +1,216 @@
+<script setup lang="ts">
+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 updateSample = () => {
+    sample.value = "Example: " + previewDocNo();
+  };
+  const createData = async () => {
+  // disabled.value=true
+
+  doc
+    .create()
+    .then((res) => {
+      refresh()
+      newData()
+    })
+    .catch((err) => {
+      console.error(err);
+    });
+};
+const updateData = async () => {
+  doc
+    .update()
+    .then(() => {
+      // visible.value=false
+      refresh();
+    })
+    .catch((err) => {
+      console.error(err);
+    });
+};
+const deleteData = (el: any) => {
+  
+  confirm.require({
+    target: el.currentTarget as HTMLElement,
+    message: "Delete?",
+    icon: "pi pi-exclamation-triangle",
+    acceptClass: "p-button-danger",
+    accept: () => {
+      // disabled.value=true
+      doc.delete(data.value._id ?? "").then((res) => {        
+        newData()
+        refresh();
+      });
+    },
+    reject: () => {
+      console.log("Cancel delete");
+    },
+  });
+};
+const newData = () => {
+  doc.setNew()
+  goTo(doc.getDocName(),String(useRoute().params.doctype)+'/new');
+};
+
+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 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);
+
+      if (numberpattern && numberpattern.length > 0) {
+        const numberlength = numberpattern[0]
+          .replace("[", "")
+          .replace("]", "").length;
+
+        let nextnumber = (data.value.nextNumber ?? 0).toString();
+
+        const numberdiff = numberlength - nextnumber.length;
+
+        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);
+        }
+      }
+      return newvalue;
+    } else {
+      return "";
+    }
+  };
+
+  fetchRecord()
+</script>
+<template>
+  <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>
+    <div v-else class="simpleapp-tool-bar col-span-4 text-left gap-4">
+      <Button
+        class="btn-default"        
+        @click="newData"
+        type="button"
+        v-if="canPerform(doc.getDocName(), 'create')">New
+      </Button>
+      <Button
+        class="bg bg-primary-600 hover:bg-primary-400 text-white"        
+        @click="createData"
+        type="button"
+        v-if="canPerform(doc.getDocName(), 'create') && doc.isNew()"
+      >
+        Create
+      </Button>
+      <Button
+      class="bg bg-primary-600 hover:bg-primary-400 text-white"        
+        
+        @click="updateData"
+        type="button"
+        v-if="canPerform(doc.getDocName(), 'update') &&  !doc.isNew()"
+      >
+        Update
+      </Button>
+      <Button
+      class="bg bg-danger-600 hover:bg-danger-400 text-white"        
+        
+        @click="deleteData($el)"
+        type="button"
+        v-if="canPerform(doc.getDocName(), 'delete') && !doc.isNew()"
+      >
+        Delete
+      </Button>      
+      <ConfirmPopup></ConfirmPopup>
+    </div>
+    <SimpleAppForm :document="doc" #default="o" :readonly="isReadOnly">
+      <div class="grid grid-cols-4 gap-4">
+        <SimpleAppText
+          autofocus
+          :setting="o.getField('#/properties/docNoFormatNo')"
+          v-model="data.docNoFormatNo"
+        />
+        <SimpleAppText
+          autofocus
+          :setting="o.getField('#/properties/docNoFormatName')"
+          v-model="data.docNoFormatName"
+        />
+        <SimpleAppAutocomplete
+          v-model="data.branch"
+          :setting="o.getField('#/properties/branch')"
+          :remoteSrc="getAutocomplete('branch')"
+          optionLabel="label"
+        />
+        <SimpleAppCheckbox
+          autofocus
+          :setting="o.getField('#/properties/active')"
+          v-model="data.active"
+        />
+
+        <SimpleAppCheckbox
+          autofocus
+          :setting="o.getField('#/properties/default')"
+          v-model="data.default"
+        />
+
+        <SimpleAppText
+          autofocus
+          :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
+          :readonly="true"
+          :setting="o.getField('#/properties/docNoType')"
+          v-model="data.docNoType"          
+          description="Document Type"
+          
+        />
+        <SimpleAppNumber
+          autofocus
+          :setting="o.getField('#/properties/nextNumber')"
+          v-model="data.nextNumber"
+        />
+      </div>
+    </SimpleAppForm>
+  </div>
+</template>

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

@@ -0,0 +1,33 @@
+<script setup lang="ts">
+
+  const {$event,$listen, $DocnoformatDoc} = useNuxtApp()
+  const doc = $DocnoformatDoc()
+  const data = doc.getReactiveData()
+  const list = ref([])
+  const refresh = async ()=>{
+    list.value = await doc.search({
+      filter:{docNoType: useRoute().params.doctype}
+    })
+  }
+
+  refresh()
+
+  $listen('RefreshDocumentList',(data)=>{
+    if(data.documentName=="docnoformat"){
+      refresh()
+    }    
+  })
+</script>
+<template>
+  <div class="grid grid-cols-3 p-4">
+  <div>    
+    <ListView :list="list"       
+      titleField="docNoFormatName" 
+      subTitleField="docNoFormatNo"
+      :url="`${getDocumentUrl('docnoformat')}/${useRoute().params.doctype}`"></ListView>
+    </div>
+    <div class="col-span-2">
+        <NuxtPage></NuxtPage>
+    </div>
+  </div>
+</template>