@simitgroup/simpleapp-generator 1.0.63 → 1.0.64

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

@@ -0,0 +1,145 @@
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp everytime regenerate code.
+ * delete file "delete-me-for-avoid-override" if you want to modify this file and
+ * prevent regenerate code override it.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+import ConfirmPopup from "primevue/confirmpopup";
+import { useConfirm } from "primevue/useconfirm";
+const confirm = useConfirm();
+
+const { $BranchDoc, $OrganizationDoc, $event } = useNuxtApp();
+const orgdoc = $OrganizationDoc();
+const doc = $BranchDoc();
+const data = doc.getReactiveData();
+const bid = ref(String(useRoute().params.bid ?? ""));
+const isReadOnly=ref(true)
+const fetchRecord = async (id: string) => {
+  await doc.getById(id);
+};
+
+const disabled = computed(() => {
+  return false;
+});
+
+const createData = async () => {
+  doc
+    .create()
+    .then((res) => {
+      refresh();
+      goBranch(res.data._id);
+    })
+    .catch((err) => {
+      console.error(err);
+    });
+};
+const updateData = async () => {
+  doc
+    .update()
+    .then(() => {
+      // visible.value=false
+      refresh();
+    })
+    .catch((err) => {
+      console.error(err);
+    });
+};
+const deleteData = (event: Event) => {
+  confirm.require({
+    target: event.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) => {
+        refresh();
+        
+        goTo(doc.getDocName());
+      });
+    },
+    reject: () => {
+      console.log("Cancel delete");
+    },
+  });
+};
+
+const refresh = () => {
+  $event("RefreshDocumentList", { documentName: doc.getDocName() });
+  isReadOnly.value=true
+};
+
+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
+  data.value.tenantId = getUserProfile().tenantId;
+  data.value.orgId = getUserProfile().orgId;
+  data.value.organization._id = getUserProfile().orgRecordId;
+  data.value.organization.label = getUserProfile().orgName;
+  data.value.organization.orgId = getUserProfile().orgId;
+  data.value.organization.code = getUserProfile().orgCode;
+}
+</script>
+<template>
+  <div class="grid grid-cols2">
+    <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"
+          :isReadOnly="isReadOnly"
+          @click="createData"
+          type="button"
+          v-if="canPerform(doc.getDocName(), 'create') && doc.isNew()"
+          >Create</Button
+        >
+        <Button
+          class="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-danger-600 hover:bg-danger-400 text-white"            
+          @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
+              > 
+      </div>
+
+      <SimpleAppText
+        v-model="data.branchCode"
+        :setting="o.getField('#/properties/branchCode')"
+      />
+      <SimpleAppText
+        v-model="data.branchName"
+        :setting="o.getField('#/properties/branchName')"
+      />
+      <SimpleAppCheckbox
+        v-model="data.active"
+        :setting="o.getField('#/properties/active')"
+      />
+      <SimpleAppTextarea
+        v-model="data.description"
+        :setting="o.getField('#/properties/description')"
+      />
+    </SimpleAppForm>
+    <DebugDocumentData v-model="data" label="branch" />
+  </div>
+</template>

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

@@ -0,0 +1,130 @@
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp everytime regenerate code.
+ * delete file "delete-me-for-avoid-override" if you want to modify this file and
+ * prevent regenerate code override it.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+import ConfirmPopup from "primevue/confirmpopup";
+import { useConfirm } from "primevue/useconfirm";
+const confirm = useConfirm();
+
+const { $OrganizationDoc, $BranchDoc, $event, $listen } = useNuxtApp();
+const doc = $OrganizationDoc();
+const brancdoc = $BranchDoc();
+const data = doc.getReactiveData();
+const branchlist = ref([]);
+const isReadOnly=ref(true)
+const getCurrentOrg = async () => {
+  await doc.getById(getUserProfile().orgRecordId);
+};
+const fetchRecord = async (id: string) => {
+  await doc.getById(id);
+  branchlist.value = await brancdoc.search({
+    filter: { orgId: data.value.orgId },
+  });
+};
+
+const id = computed((): string => String(useRoute().params.id ?? ""));
+const updateData = async () => {
+  doc
+    .update()
+    .then(() => {
+      refresh();
+      isReadOnly.value=true
+    })
+    .catch((err) => {
+      console.error(err);
+    });
+};
+
+const refresh = () => {
+  $event("RefreshDocumentList", { documentName: doc.getDocName() });
+};
+
+//branch record update then reload
+$listen("RefreshDocumentList", (data) => {
+  console.log("refresh from branch", data.documentName, "==", doc.getDocName());
+  if (data.documentName == "branch") {
+    fetchRecord(id.value);
+  }
+});
+
+if (id) {
+  fetchRecord(id.value);
+}
+
+getCurrentOrg();
+</script>
+<template>
+  <div class="grid grid-cols-3">
+    <div class="">
+      <Card>
+        <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
+              >              
+              <ConfirmPopup></ConfirmPopup>
+            </div>
+            <div class="flex flex-col">
+              <div class="flex flex-row gap-4">
+                <SimpleAppText
+                  autofocus                  
+                  v-model="data.orgCode"
+                  :setting="o.getField('#/properties/orgCode')"
+                  
+                />
+                <SimpleAppText
+                  v-model="data.orgName"
+                  class=""
+                  :setting="o.getField('#/properties/orgName')"
+                />
+                <SimpleAppCheckbox
+                  v-model="data.active"
+                  :setting="o.getField('#/properties/active')"
+                />
+              </div>
+              <div>
+                <SimpleAppTextarea
+                  :setting="o.getField('#/properties/description')"
+                  v-model="data.description"
+                />
+              </div>
+            </div>
+            <DebugDocumentData v-model="data" label="organization" />
+          </SimpleAppForm>
+        </template>
+      </Card>
+    </div>
+    <div>
+      <Card>
+        <template #header>
+          <!-- <h1 class="text-2xl font-bold">{{ data.orgName }}</h1> -->
+        </template>
+        <template #content>
+          <div class="">
+            <h1>Branches</h1>
+            <Button @click="goBranch('new')">New</Button>
+            <ListView
+              :list="branchlist"
+              title-field="branchName"
+              sub-title-field="branchCode"
+              :url="getDocumentUrl('organization', id)"
+            >
+            </ListView>
+          </div>
+        </template>
+      </Card>
+    </div>
+    <div>
+      <NuxtPage></NuxtPage>
+    </div>
+  </div>
+</template>

package/templates/nuxt/pages/[xorg]/user/index.vue.eta

@@ -9,8 +9,8 @@
           <div class="flex flex-col gap-2">
             <SimpleAppText
               autofocus
-              :setting="o.getField('#/properties/fullname')"
-              v-model="userdata.fullname"
+              :setting="o.getField('#/properties/fullName')"
+              v-model="userdata.fullName"
             />
 
             <SimpleAppText
@@ -64,36 +64,31 @@
           </div> -->
 
           <div class="">
-            <Card v-for="o in orglist" class="m-2">
+            <Card v-if="currentpermissions.length>0" v-for="o in orglist" class="m-2">
               <template #title>{{ o.orgName }}</template>
-              <template #content>
-                <table class="w w-full">
-                  <!-- <thead class="">
-                    <tr>
-                      <th class="text-center font-normal">Branch</th>
-                      <th class="text-left font-normal">Access Right</th>
+              <template #content>                
+                  <table class="w w-full">                  
+                    <tr v-for="(b, index) in branchlist">
+                      <td v-if="checkBranchInOrg(o, b)" class="text-center">
+                        {{ b.branchCode }}
+                      </td>
+                      <td
+                        v-if="checkBranchInOrg(o, b)"
+                        class="text-center flex flex-row"
+                      >
+                        <div>
+                           
+                          <SelectButton
+                            v-model="currentpermissions[index]['group']"  
+                            :options="grouplist"
+                            option-label="label"
+                            option-value="value"
+                            @change="applyPermission(currentpermissions[index])"
+                          ></SelectButton>
+                        </div>
+                      </td>
                     </tr>
-                  </thead> -->
-                  <tr v-for="(b, index) in branchlist">
-                    <td v-if="checkBranchInOrg(o, b)" class="text-center">
-                      {{ b.branchCode }}
-                    </td>
-                    <td
-                      v-if="checkBranchInOrg(o, b)"
-                      class="text-center flex flex-row"
-                    >
-                      <div>
-                        <SelectButton
-                          v-model="currentpermissions[index]['group']"
-                          :options="grouplist"
-                          option-label="label"
-                          option-value="value"
-                          @change="applyPermission(currentpermissions[index])"
-                        ></SelectButton>
-                      </div>
-                    </td>
-                  </tr>
-                </table>
+                  </table>                
               </template>
             </Card>
           </div>
@@ -103,7 +98,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import Card from "primevue/card";
+// import Card from "primevue/card";
 import { Permission, User } from "../../../simpleapp/generate/openapi/api";
 import _ from "lodash";
 import SelectButton from "primevue/selectbutton";
@@ -207,7 +202,7 @@ const saveUser = async () => {
 };
 
 const onSelectUser = async (userId: string) => {
-  console.log('onSelectUser',userId)
+  console.log("onSelectUser", userId);
   // .addRoute()
   // const user: UserListItem = { ...menuitem };
   const orgsearchbody: SearchBody = {
@@ -296,7 +291,7 @@ const getPermssionData = (userId: string, branchId: number) => {
 
 onMounted(() => {
   const id = String(useRoute().params.id);
-  console.log("id",id)
+  console.log("id", id);
   onSelectUser(id);
 });
 </script>

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

@@ -72,7 +72,7 @@ const refreshList = async (resetpage: boolean = true) => {
       "uid",
       "email",
       "created",
-      "fullname",
+      "fullName",
       "active",
       "lastActivity",
       "description",
@@ -111,7 +111,7 @@ const invite = async () => {
   inviteuserdoc.setNew();
   const newuserdata = inviteuserdoc.getReactiveData();
   newuserdata.value.email = inviteemail.value;
-  newuserdata.value.fullname = inviteemail.value.split("@")[0];
+  newuserdata.value.fullName = inviteemail.value.split("@")[0];
   newuserdata.value.active = true;
   newuserdata.value.tenantId = currentuser.tenantId;
   newuserdata.value.orgId = currentuser.orgId;
@@ -126,7 +126,7 @@ const invite = async () => {
 $listen("RefreshUser", () => {
   refreshList();
 });
-onMounted(() => {  
+onMounted(() => {
   refreshList();
 });
 </script>

package/templates/nuxt/plugins/20.simpleapp-userstore.ts.eta

@@ -19,8 +19,10 @@ export default defineNuxtPlugin( async(nuxtApp) => {
           tenantId:ref(0),
           orgId:ref(0),
           branchId:ref(0),
+          branchRecordId:ref(''),
           branchCode:ref(''),
           branchName:ref(''),
+          orgRecordId:ref(''),
           orgCode:ref(''),
           orgName:ref(''),
           uid: ref(''),
@@ -55,7 +57,9 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               this.sessionId = res.data.sessionId
               this.tenantId = res.data.tenantId              
               this.orgId = res.data.orgId
+              this.orgRecordId = res.data.orgRecordId
               this.branchId = res.data.branchId
+              this.branchRecordId = res.data.branchRecordId
               this.branchCode = res.data.branchCode
               this.branchName = res.data.branchName
               this.orgCode = res.data.orgCode
@@ -140,6 +144,8 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               tenantId : this.tenantId,
               orgId : this.orgId,
               branchId : this.branchId,
+              orgRecordId: this.orgRecordId,
+              branchRecordId: this.branchRecordId,
               uid : this.uid,
               email : this.email,
               branchCode: this.branchCode,

package/templates/nuxt/simpleapp/generate/clients/SimpleAppClient.ts.eta

@@ -186,7 +186,7 @@ export class SimpleAppClient<
   }
   
   hook(type: string, data: TData) {
-    console.log('internal save hook');
+    //console.log('internal save hook');
     return true;
   }
   validateFailed() {

package/templates/nuxt/types/documentlist.ts.eta

@@ -3,7 +3,7 @@ export type CellSetting  = {
     field: string
     cssClass?:string
     moreFields: string[]
-    component ?: any
-    componentSetting ?:any
+    rendererName ?: string
+    rendererSetting ?:any
  } | string 
 

package/templates/project/jsonschemas/category.json._eta

@@ -12,8 +12,8 @@
     "_id": { "type": "string" },
     "created": { "type": "string" },
     "updated": { "type": "string" },
-    "createdby": { "type": "string" },
-    "updatedby": { "type": "string" },
+    "createdBy": { "type": "string" },
+    "updatedBy": { "type": "string" },
     "tenantId": { "type": "integer", "default": 1, "minimum": 1 },
     "orgId": { "type": "integer", "default": 1, "minimum": 1 },
     "branchId": { "type": "integer", "default": 1, "minimum": 1 },

package/templates/project/jsonschemas/customer.json._eta

@@ -13,8 +13,8 @@
     "_id": { "type": "string" },
     "created": { "type": "string" },
     "updated": { "type": "string" },
-    "createdby": { "type": "string" },
-    "updatedby": { "type": "string" },
+    "createdBy": { "type": "string" },
+    "updatedBy": { "type": "string" },
     "tenantId": { "type": "integer", "default": 1, "minimum": 1 },
     "orgId": { "type": "integer", "default": 1, "minimum": 1 },
     "branchId": { "type": "integer", "default": 1, "minimum": 1 },

package/templates/project/jsonschemas/invoice.json._eta

@@ -10,9 +10,9 @@
     "generateDocumentNumber": true,
     "pageType": "crud",
     "formulas": [
-      { "jsonpath": "$.details[*]", "formula": "sharelibs.getSubtotal(value)" },
+      { "jsonPath": "$.details[*]", "formula": "sharelibs.getSubtotal(value)" },
       {
-        "jsonpath": "$.invoiceTotal",
+        "jsonPath": "$.invoiceTotal",
         "formula": "sharelibs.getTotal(data.details)"
       }
     ]
@@ -21,8 +21,8 @@
     "_id": { "type": "string" },
     "created": { "type": "string" },
     "updated": { "type": "string" },
-    "createdby": { "type": "string" },
-    "updatedby": { "type": "string" },
+    "createdBy": { "type": "string" },
+    "updatedBy": { "type": "string" },
     "tenantId": { "type": "integer", "default": 1, "minimum": 1 },
     "orgId": { "type": "integer", "default": 1, "minimum": 1 },
     "branchId": { "type": "integer", "default": 1, "minimum": 1 },

package/templates/project/jsonschemas/product.json._eta

@@ -13,8 +13,8 @@
     "_id": { "type": "string" },
     "created": { "type": "string" },
     "updated": { "type": "string" },
-    "createdby": { "type": "string" },
-    "updatedby": { "type": "string" },
+    "createdBy": { "type": "string" },
+    "updatedBy": { "type": "string" },
     "tenantId": { "type": "integer", "default": 1, "minimum": 1 },
     "orgId": { "type": "integer", "default": 1, "minimum": 1 },
     "branchId": { "type": "integer", "default": 1, "minimum": 1 },